summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2016-04-21 02:00:11 +0000
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2016-04-21 02:00:11 +0000
commitbe29e670c41eeef7e97735674a6d0472049fe42c (patch)
treeef52cdbec0e35d9fb0e69e2b783852805970b93f
parentadd ipv6 nameserver to cloud-prep script (diff)
downloadreleng-be29e670c41eeef7e97735674a6d0472049fe42c.tar.gz
releng-be29e670c41eeef7e97735674a6d0472049fe42c.tar.bz2
releng-be29e670c41eeef7e97735674a6d0472049fe42c.zip
Merge admincd / installcd portage configuration.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
-rw-r--r--releases/weekly/portage/installcd/package.keywords/genkernel2
-rw-r--r--releases/weekly/portage/installcd/package.mask/libtool1
-rw-r--r--releases/weekly/portage/installcd/package.mask/modutils2
-rw-r--r--releases/weekly/portage/installcd/package.mask/openrc2
-rw-r--r--releases/weekly/portage/installcd/package.mask/perl1
-rw-r--r--releases/weekly/portage/installcd/package.mask/sysvinit1
-rw-r--r--releases/weekly/portage/installcd/package.use/cifs-utils4
-rw-r--r--releases/weekly/portage/isos/package.keywords/admincd-packages (renamed from releases/weekly/portage/admincd/package.keywords/packages)0
-rw-r--r--releases/weekly/portage/isos/package.keywords/genkernel (renamed from releases/weekly/portage/admincd/package.keywords/genkernel)0
-rw-r--r--releases/weekly/portage/isos/package.keywords/zfs (renamed from releases/weekly/portage/admincd/package.keywords/zfs)0
-rw-r--r--releases/weekly/portage/isos/package.mask/libtool (renamed from releases/weekly/portage/admincd/package.mask/libtool)0
-rw-r--r--releases/weekly/portage/isos/package.mask/modutils (renamed from releases/weekly/portage/admincd/package.mask/modutils)0
-rw-r--r--releases/weekly/portage/isos/package.mask/openrc (renamed from releases/weekly/portage/admincd/package.mask/openrc)0
-rw-r--r--releases/weekly/portage/isos/package.mask/perl (renamed from releases/weekly/portage/admincd/package.mask/perl)0
-rw-r--r--releases/weekly/portage/isos/package.mask/sysvinit (renamed from releases/weekly/portage/admincd/package.mask/sysvinit)0
-rw-r--r--releases/weekly/portage/isos/package.use/admincd-packages (renamed from releases/weekly/portage/admincd/package.use/packages)0
-rw-r--r--releases/weekly/portage/isos/package.use/cifs-utils (renamed from releases/weekly/portage/admincd/package.use/cifs-utils)0
17 files changed, 0 insertions, 13 deletions
diff --git a/releases/weekly/portage/installcd/package.keywords/genkernel b/releases/weekly/portage/installcd/package.keywords/genkernel
deleted file mode 100644
index 3ca4af85..00000000
--- a/releases/weekly/portage/installcd/package.keywords/genkernel
+++ /dev/null
@@ -1,2 +0,0 @@
-# Pull in newer version for System.map fixes.
-=sys-kernel/genkernel-3.4.52.4-r1
diff --git a/releases/weekly/portage/installcd/package.mask/libtool b/releases/weekly/portage/installcd/package.mask/libtool
deleted file mode 100644
index 9e600485..00000000
--- a/releases/weekly/portage/installcd/package.mask/libtool
+++ /dev/null
@@ -1 +0,0 @@
-<sys-devel/libtool-2.4.3-r2
diff --git a/releases/weekly/portage/installcd/package.mask/modutils b/releases/weekly/portage/installcd/package.mask/modutils
deleted file mode 100644
index 20af96e9..00000000
--- a/releases/weekly/portage/installcd/package.mask/modutils
+++ /dev/null
@@ -1,2 +0,0 @@
-sys-apps/module-init-tools
-sys-apps/modutils
diff --git a/releases/weekly/portage/installcd/package.mask/openrc b/releases/weekly/portage/installcd/package.mask/openrc
deleted file mode 100644
index 2185913f..00000000
--- a/releases/weekly/portage/installcd/package.mask/openrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<sys-apps/openrc-0.13.0
-<sys-process/procps-3.3.9-r2
diff --git a/releases/weekly/portage/installcd/package.mask/perl b/releases/weekly/portage/installcd/package.mask/perl
deleted file mode 100644
index e750717d..00000000
--- a/releases/weekly/portage/installcd/package.mask/perl
+++ /dev/null
@@ -1 +0,0 @@
-<dev-lang/perl-5.18.0
diff --git a/releases/weekly/portage/installcd/package.mask/sysvinit b/releases/weekly/portage/installcd/package.mask/sysvinit
deleted file mode 100644
index b76cffef..00000000
--- a/releases/weekly/portage/installcd/package.mask/sysvinit
+++ /dev/null
@@ -1 +0,0 @@
-<sys-apps/sysvinit-2.88-r7
diff --git a/releases/weekly/portage/installcd/package.use/cifs-utils b/releases/weekly/portage/installcd/package.use/cifs-utils
deleted file mode 100644
index b0de5d58..00000000
--- a/releases/weekly/portage/installcd/package.use/cifs-utils
+++ /dev/null
@@ -1,4 +0,0 @@
-net-fs/cifs-utils -acl -ads
-sys-libs/ntdb python
-sys-libs/tdb python
-sys-libs/tevent python
diff --git a/releases/weekly/portage/admincd/package.keywords/packages b/releases/weekly/portage/isos/package.keywords/admincd-packages
index e785b454..e785b454 100644
--- a/releases/weekly/portage/admincd/package.keywords/packages
+++ b/releases/weekly/portage/isos/package.keywords/admincd-packages
diff --git a/releases/weekly/portage/admincd/package.keywords/genkernel b/releases/weekly/portage/isos/package.keywords/genkernel
index 3ca4af85..3ca4af85 100644
--- a/releases/weekly/portage/admincd/package.keywords/genkernel
+++ b/releases/weekly/portage/isos/package.keywords/genkernel
diff --git a/releases/weekly/portage/admincd/package.keywords/zfs b/releases/weekly/portage/isos/package.keywords/zfs
index 492060f9..492060f9 100644
--- a/releases/weekly/portage/admincd/package.keywords/zfs
+++ b/releases/weekly/portage/isos/package.keywords/zfs
diff --git a/releases/weekly/portage/admincd/package.mask/libtool b/releases/weekly/portage/isos/package.mask/libtool
index 9e600485..9e600485 100644
--- a/releases/weekly/portage/admincd/package.mask/libtool
+++ b/releases/weekly/portage/isos/package.mask/libtool
diff --git a/releases/weekly/portage/admincd/package.mask/modutils b/releases/weekly/portage/isos/package.mask/modutils
index 20af96e9..20af96e9 100644
--- a/releases/weekly/portage/admincd/package.mask/modutils
+++ b/releases/weekly/portage/isos/package.mask/modutils
diff --git a/releases/weekly/portage/admincd/package.mask/openrc b/releases/weekly/portage/isos/package.mask/openrc
index 2185913f..2185913f 100644
--- a/releases/weekly/portage/admincd/package.mask/openrc
+++ b/releases/weekly/portage/isos/package.mask/openrc
diff --git a/releases/weekly/portage/admincd/package.mask/perl b/releases/weekly/portage/isos/package.mask/perl
index e750717d..e750717d 100644
--- a/releases/weekly/portage/admincd/package.mask/perl
+++ b/releases/weekly/portage/isos/package.mask/perl
diff --git a/releases/weekly/portage/admincd/package.mask/sysvinit b/releases/weekly/portage/isos/package.mask/sysvinit
index b76cffef..b76cffef 100644
--- a/releases/weekly/portage/admincd/package.mask/sysvinit
+++ b/releases/weekly/portage/isos/package.mask/sysvinit
diff --git a/releases/weekly/portage/admincd/package.use/packages b/releases/weekly/portage/isos/package.use/admincd-packages
index 1b5ad93f..1b5ad93f 100644
--- a/releases/weekly/portage/admincd/package.use/packages
+++ b/releases/weekly/portage/isos/package.use/admincd-packages
diff --git a/releases/weekly/portage/admincd/package.use/cifs-utils b/releases/weekly/portage/isos/package.use/cifs-utils
index b0de5d58..b0de5d58 100644
--- a/releases/weekly/portage/admincd/package.use/cifs-utils
+++ b/releases/weekly/portage/isos/package.use/cifs-utils