From 86dc6ae6998b7323c06e86b7ed95b5b1f0061090 Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Fri, 13 Jul 2018 14:37:51 -0500 Subject: [PATCH] specs: add sys-apps/sandbox to *cd*stage2* livecd/unmerge --- releases/weekly/specs/alpha/installcd-stage2-minimal.spec | 3 +-- .../weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 1 + releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 1 + releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 1 + releases/weekly/specs/hppa/installcd-stage2-minimal.spec | 1 - releases/weekly/specs/hppa/installcd-stage2-universal.spec | 3 +-- releases/weekly/specs/ia64/installcd-stage2-minimal.spec | 3 +-- .../weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec | 3 +-- .../specs/sparc/sparc64/installcd-stage2-minimal.spec | 1 + releases/weekly/specs/x86/hardened/admincd-stage2.spec | 1 + .../weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 6 ++---- releases/weekly/specs/x86/installcd-stage2-minimal.spec | 1 + 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec b/releases/weekly/specs/alpha/installcd-stage2-minimal.spec index fbaf9c34..46dfc8b0 100644 --- a/releases/weekly/specs/alpha/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/alpha/installcd-stage2-minimal.spec @@ -85,8 +85,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles -# sys-apps/portage -# sys-apps/sandbox + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec index f19ced45..31f54e65 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec @@ -101,6 +101,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec index 31ff712a..7148645a 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec @@ -101,6 +101,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec index d0ec7f76..01eae8f8 100644 --- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec @@ -97,6 +97,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper diff --git a/releases/weekly/specs/hppa/installcd-stage2-minimal.spec b/releases/weekly/specs/hppa/installcd-stage2-minimal.spec index b5f5ee8a..990ba6d7 100644 --- a/releases/weekly/specs/hppa/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/hppa/installcd-stage2-minimal.spec @@ -107,7 +107,6 @@ livecd/unmerge: sys-apps/groff sys-apps/help2man sys-apps/man-db - sys-apps/portage sys-apps/sandbox sys-apps/tcp-wrappers sys-apps/texinfo diff --git a/releases/weekly/specs/hppa/installcd-stage2-universal.spec b/releases/weekly/specs/hppa/installcd-stage2-universal.spec index 0378d857..be7849db 100644 --- a/releases/weekly/specs/hppa/installcd-stage2-universal.spec +++ b/releases/weekly/specs/hppa/installcd-stage2-universal.spec @@ -91,8 +91,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles -# sys-apps/portage -# sys-apps/sandbox + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper diff --git a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec index ddc362c3..30f4d1df 100644 --- a/releases/weekly/specs/ia64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/ia64/installcd-stage2-minimal.spec @@ -63,8 +63,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles -# sys-apps/portage -# sys-apps/sandbox + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec index 5d98e9dc..a61ec425 100644 --- a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec @@ -119,8 +119,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles -# sys-apps/portage -# sys-apps/sandbox + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper diff --git a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec index 37472246..b7dbadda 100644 --- a/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/sparc/sparc64/installcd-stage2-minimal.spec @@ -59,6 +59,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec index 8c53009b..c061ab47 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec @@ -97,6 +97,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec index cc10a1df..a7a610c1 100644 --- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec @@ -101,8 +101,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles -# sys-apps/portage -# sys-apps/sandbox + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper @@ -112,8 +111,7 @@ livecd/unmerge: sys-devel/binutils-config sys-devel/bison sys-devel/flex -# This might be needed for software speech. -# sys-devel/gcc + sys-devel/gcc sys-devel/gcc-config sys-devel/gettext sys-devel/gnuconfig diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec index 6e55c6fa..f763dc00 100644 --- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec @@ -98,6 +98,7 @@ livecd/unmerge: sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles + sys-apps/sandbox sys-apps/texinfo sys-devel/autoconf sys-devel/autoconf-wrapper