Skip to content
Browse files

FL-306: do not merge outdated spl/zfs from flora-overlay into main tree

  • Loading branch information...
1 parent ef49bfc commit 06cfe07dd520576311e0d782596082044669b7b6 @angryvincent angryvincent committed Dec 29, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 funtoo/scripts/merge.py
View
2 funtoo/scripts/merge.py
@@ -35,7 +35,7 @@
InsertEbuilds(funtoo_overlay, select="all", skip=None, replace=True),
InsertEbuilds(foo_overlay, select="all", skip=["sys-fs/mdev-bb", "media-video/handbrake"], replace=["app-shells/rssh","net-misc/unison"]),
InsertEbuilds(bar_overlay, select="all", skip=["app-emulation/qemu"], replace=True),
- InsertEbuilds(flora_overlay, select="all", skip=None, replace=False),
+ InsertEbuilds(flora_overlay, select="all", skip=["sys-fs/spl", "sys-fs/zfs"], replace=False),
InsertEbuilds(mythtv_overlay, select='all', skip=["media-tv/miro", "media-tv/mythtv-bindings"], replace=True, merge=["dev-libs/libcec", "media-tv/mythtv", "www-apps/mythweb"], ebuildloc="Gentoo"),
SyncDir(mythtv_overlay.root, "eclass"),
SyncDir(progress_overlay.root, "eclass"),

0 comments on commit 06cfe07

Please sign in to comment.
Something went wrong with that request. Please try again.