From cb8272648c157d4a70ba0f968e921d14f46f23f9 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Fri, 2 Dec 2011 18:04:56 +0000 Subject: [PATCH] Added app-crypt/bcwipe to the admin-cd specs per Christian's (idl0r) request. svn path=/trunk/; revision=839 --- releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 3 ++- releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 6 +++--- releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 4 ++-- releases/weekly/specs/x86/hardened/admincd-stage1.spec | 3 ++- releases/weekly/specs/x86/hardened/admincd-stage2.spec | 6 +++--- releases/weekly/specs/x86/installcd-stage2-minimal.spec | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec index f861ed43..7e36c50b 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec @@ -5,7 +5,7 @@ rel_type: hardened profile: hardened/linux/amd64 snapshot: 2008.0 source_subpath: hardened/stage3-amd64-hardened-latest -portage_confdir: /release/svn-releng/trunk/releases/weekly/portage/admincd +portage_confdir: /home/repositories/releng/trunk/releases/weekly/portage/admincd livecd/use: -* @@ -55,6 +55,7 @@ livecd/packages: app-benchmarks/piozone app-benchmarks/stress app-benchmarks/tiobench + app-crypt/bcwipe app-crypt/gnupg app-crypt/pinentry app-editors/emacs diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec index a80161c0..c47c2616 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec @@ -5,13 +5,13 @@ rel_type: hardened profile: hardened/linux/amd64 snapshot: 2008.0 source_subpath: hardened/livecd-stage1-amd64-2008.0 -portage_confdir: /release/svn-releng/trunk/releases/weekly/portage/admincd +portage_confdir: /home/repositories/releng/trunk/releases/weekly/portage/admincd livecd/bootargs: dokeymap livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 -livecd/iso: /release/buildroot/amd64-dev/builds/hardened/admincd-amd64-2008.0.iso +livecd/iso: /home/release/buildroot/amd64-dev/builds/hardened/admincd-amd64-2008.0.iso livecd/type: gentoo-release-minimal livecd/volid: Gentoo Linux Admin CD 2008.0 livecd/rcdel: keymaps|boot @@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot boot/kernel: gentoo boot/kernel/gentoo/sources: hardened-sources -boot/kernel/gentoo/config: /release/svn-releng/trunk/releases/weekly/kconfig/amd64/admincd-3.0.config +boot/kernel/gentoo/config: /home/repositories/releng/trunk/releases/weekly/kconfig/amd64/admincd-3.0.config boot/kernel/gentoo/use: -* alsa diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec index 7f3a2b2e..17a78b64 100644 --- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec @@ -10,7 +10,7 @@ livecd/bootargs: dokeymap livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 -livecd/iso: /release/buildroot/amd64-dev/builds/default/install-amd64-minimal-2008.0.iso +livecd/iso: /home/release/buildroot/amd64-dev/builds/default/install-amd64-minimal-2008.0.iso livecd/type: gentoo-release-minimal livecd/volid: Gentoo Linux amd64 2008.0 livecd/rcdel: keymaps|boot @@ -18,7 +18,7 @@ livecd/rcdel: keymaps|boot boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /release/svn-releng/trunk/releases/weekly/kconfig/amd64/installcd-2.6.38.config +boot/kernel/gentoo/config: /home/repositories/releng/trunk/releases/weekly/kconfig/amd64/installcd-2.6.38.config boot/kernel/gentoo/use: -* alsa diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec index 0b8fd5c9..0a06288b 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec @@ -5,7 +5,7 @@ rel_type: hardened profile: hardened/linux/x86 snapshot: 2008.0 source_subpath: hardened/stage3-i686-hardened-latest -portage_confdir: /release/svn-releng/trunk/releases/weekly/portage/admincd +portage_confdir: /home/repositories/releng/trunk/releases/weekly/portage/admincd livecd/use: -* deprecated @@ -54,6 +54,7 @@ livecd/packages: app-benchmarks/piozone app-benchmarks/stress app-benchmarks/tiobench + app-crypt/bcwipe app-crypt/gnupg app-crypt/pinentry app-editors/emacs diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec index 8efa6485..038c8c7a 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec @@ -5,13 +5,13 @@ rel_type: hardened profile: hardened/linux/x86 snapshot: 2008.0 source_subpath: hardened/livecd-stage1-x86-2008.0 -portage_confdir: /release/svn-releng/trunk/releases/weekly/portage/admincd +portage_confdir: /home/repositories/releng/trunk/releases/weekly/portage/admincd livecd/bootargs: dokeymap livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 -livecd/iso: /release/buildroot/x86-dev/builds/hardened/admincd-x86-2008.0.iso +livecd/iso: /home/release/buildroot/x86-dev/builds/hardened/admincd-x86-2008.0.iso livecd/type: gentoo-release-minimal livecd/volid: Gentoo Linux Admin CD 2008.0 livecd/rcdel: keymaps|boot @@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot boot/kernel: gentoo boot/kernel/gentoo/sources: hardened-sources -boot/kernel/gentoo/config: /release/svn-releng/trunk/releases/weekly/kconfig/x86/admincd-3.0.config +boot/kernel/gentoo/config: /home/repositories/releng/trunk/releases/weekly/kconfig/x86/admincd-3.0.config boot/kernel/gentoo/use: -* alsa diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec index 60983ee4..ba94f813 100644 --- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec @@ -10,7 +10,7 @@ livecd/bootargs: dokeymap livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 -livecd/iso: /release/buildroot/x86-dev/builds/default/install-x86-minimal-2008.0.iso +livecd/iso: /home/release/buildroot/x86-dev/builds/default/install-x86-minimal-2008.0.iso livecd/type: gentoo-release-minimal livecd/volid: Gentoo Linux x86 2008.0 livecd/rcdel: keymaps|boot @@ -18,7 +18,7 @@ livecd/rcdel: keymaps|boot boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /release/svn-releng/trunk/releases/weekly/kconfig/x86/installcd-2.6.38.config +boot/kernel/gentoo/config: /home/repositories/releng/trunk/releases/weekly/kconfig/x86/installcd-2.6.38.config boot/kernel/gentoo/use: -* alsa