diff options
author | Mike Frysinger <vapier@gentoo.org> | 2016-04-07 17:42:14 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2016-04-07 17:42:14 -0400 |
commit | c28038b0dcc07c9c8bca332f289b98f159387f47 (patch) | |
tree | c294e3b6c594792b7d0f394170e2ea754f34eba0 | |
parent | installcd: pull in a newer genkernel version (diff) | |
download | releng-c28038b0dcc07c9c8bca332f289b98f159387f47.tar.gz releng-c28038b0dcc07c9c8bca332f289b98f159387f47.tar.bz2 releng-c28038b0dcc07c9c8bca332f289b98f159387f47.zip |
admincd: sync settings w/installcd
Also drop some old package.keywords settings as those are now stable.
-rw-r--r-- | releases/weekly/portage/admincd/package.keywords/genkernel | 3 | ||||
-rw-r--r-- | releases/weekly/portage/admincd/package.keywords/livecd-tools | 1 | ||||
-rw-r--r-- | releases/weekly/portage/admincd/package.keywords/packages | 2 | ||||
-rw-r--r-- | releases/weekly/portage/admincd/package.mask/modutils (renamed from releases/weekly/portage/admincd/package.mask/packages) | 0 | ||||
-rw-r--r-- | releases/weekly/portage/admincd/package.mask/sysvinit | 1 | ||||
-rw-r--r-- | releases/weekly/portage/admincd/package.use/cifs-utils | 4 |
6 files changed, 7 insertions, 4 deletions
diff --git a/releases/weekly/portage/admincd/package.keywords/genkernel b/releases/weekly/portage/admincd/package.keywords/genkernel index e90901b1..3ca4af85 100644 --- a/releases/weekly/portage/admincd/package.keywords/genkernel +++ b/releases/weekly/portage/admincd/package.keywords/genkernel @@ -1 +1,2 @@ -=sys-kernel/genkernel-3.4.52.3 +# Pull in newer version for System.map fixes. +=sys-kernel/genkernel-3.4.52.4-r1 diff --git a/releases/weekly/portage/admincd/package.keywords/livecd-tools b/releases/weekly/portage/admincd/package.keywords/livecd-tools deleted file mode 100644 index dd9f6352..00000000 --- a/releases/weekly/portage/admincd/package.keywords/livecd-tools +++ /dev/null @@ -1 +0,0 @@ -=app-misc/livecd-tools-2.0.3 diff --git a/releases/weekly/portage/admincd/package.keywords/packages b/releases/weekly/portage/admincd/package.keywords/packages index b4f0f72e..e785b454 100644 --- a/releases/weekly/portage/admincd/package.keywords/packages +++ b/releases/weekly/portage/admincd/package.keywords/packages @@ -1,7 +1,5 @@ sys-apps/chname -=sys-block/fio-2.0.13 sys-block/lsiutil sys-block/megacli sys-block/megarc sys-fs/ext3grep -=sys-fs/extundelete-0.2.0-r1 diff --git a/releases/weekly/portage/admincd/package.mask/packages b/releases/weekly/portage/admincd/package.mask/modutils index 20af96e9..20af96e9 100644 --- a/releases/weekly/portage/admincd/package.mask/packages +++ b/releases/weekly/portage/admincd/package.mask/modutils diff --git a/releases/weekly/portage/admincd/package.mask/sysvinit b/releases/weekly/portage/admincd/package.mask/sysvinit new file mode 100644 index 00000000..b76cffef --- /dev/null +++ b/releases/weekly/portage/admincd/package.mask/sysvinit @@ -0,0 +1 @@ +<sys-apps/sysvinit-2.88-r7 diff --git a/releases/weekly/portage/admincd/package.use/cifs-utils b/releases/weekly/portage/admincd/package.use/cifs-utils new file mode 100644 index 00000000..b0de5d58 --- /dev/null +++ b/releases/weekly/portage/admincd/package.use/cifs-utils @@ -0,0 +1,4 @@ +net-fs/cifs-utils -acl -ads +sys-libs/ntdb python +sys-libs/tdb python +sys-libs/tevent python |