From a8f1c5971bbb00a07236ef2eb784a38699418bc5 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Sun, 30 Oct 2011 13:33:30 +0000 Subject: [PATCH] Change version_string on admincd specs. Sync specs for instalcd and admincd for both amd64 and x86. svn path=/trunk/; revision=821 --- .../specs/amd64/hardened/admincd-stage1.spec | 3 ++- releases/weekly/specs/amd64/installcd-stage1.spec | 9 ++++----- .../weekly/specs/x86/hardened/admincd-stage1.spec | 3 ++- releases/weekly/specs/x86/installcd-stage1.spec | 15 ++++++++------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec index 12d77cae..22dc6cf8 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec @@ -1,5 +1,5 @@ subarch: amd64 -version_stamp: hardened-2008.0 +version_stamp: 2008.0 target: livecd-stage1 rel_type: hardened profile: hardened/linux/amd64 @@ -183,6 +183,7 @@ livecd/packages: sys-fs/e2fsprogs sys-fs/ext3grep sys-fs/extundelete + sys-fs/hfsplusutils sys-fs/hfsutils sys-fs/jfsutils sys-fs/lsscsi diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec index d7990485..0a4e4bb1 100644 --- a/releases/weekly/specs/amd64/installcd-stage1.spec +++ b/releases/weekly/specs/amd64/installcd-stage1.spec @@ -57,7 +57,7 @@ livecd/packages: net-proxy/ntlmaps net-proxy/tsocks net-wireless/b43-fwcutter -### Masked (~amd64) +### Masked (~keywords) # net-wireless/bcm43xx-fwcutter net-wireless/ipw2100-firmware net-wireless/ipw2200-firmware @@ -71,7 +71,6 @@ livecd/packages: net-wireless/zd1201-firmware net-wireless/zd1211-firmware sys-apps/apmd - sys-block/eject sys-apps/dmidecode sys-apps/ethtool sys-apps/fxload @@ -80,16 +79,16 @@ livecd/packages: sys-apps/iproute2 sys-apps/memtester sys-apps/netplug - sys-block/parted sys-apps/sdparm + sys-block/eject + sys-block/parted sys-block/partimage sys-block/qla-fc-firmware sys-fs/cryptsetup sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs -### Masked (no keywords) -# sys-fs/hfsplusutils + sys-fs/hfsplusutils sys-fs/hfsutils sys-fs/jfsutils sys-fs/lsscsi diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec index ebe5b989..431f9347 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec @@ -1,5 +1,5 @@ subarch: x86 -version_stamp: hardened-2008.0 +version_stamp: 2008.0 target: livecd-stage1 rel_type: hardened profile: hardened/linux/x86 @@ -183,6 +183,7 @@ livecd/packages: sys-fs/e2fsprogs sys-fs/ext3grep sys-fs/extundelete + sys-fs/hfsplusutils sys-fs/hfsutils sys-fs/jfsutils sys-fs/lsscsi diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec index 88a768c3..18ffcdcd 100644 --- a/releases/weekly/specs/x86/installcd-stage1.spec +++ b/releases/weekly/specs/x86/installcd-stage1.spec @@ -55,6 +55,7 @@ livecd/packages: net-proxy/ntlmaps net-proxy/tsocks net-wireless/b43-fwcutter +### Masked (~keywords) # net-wireless/bcm43xx-fwcutter net-wireless/ipw2100-firmware net-wireless/ipw2200-firmware @@ -68,7 +69,6 @@ livecd/packages: net-wireless/zd1201-firmware net-wireless/zd1211-firmware sys-apps/apmd - sys-block/eject sys-apps/dmidecode sys-apps/ethtool sys-apps/fxload @@ -77,22 +77,23 @@ livecd/packages: sys-apps/iproute2 sys-apps/memtester sys-apps/netplug - sys-block/parted sys-apps/sdparm + sys-block/eject + sys-block/parted sys-block/partimage -# sys-block/qla-fc-firmware + sys-block/qla-fc-firmware sys-fs/cryptsetup sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs -# sys-fs/hfsplusutils -# sys-fs/hfsutils + sys-fs/hfsplusutils + sys-fs/hfsutils sys-fs/jfsutils sys-fs/lsscsi sys-fs/lvm2 -# sys-fs/mac-fdisk + sys-fs/mac-fdisk sys-fs/mdadm -# sys-fs/multipath-tools + sys-fs/multipath-tools sys-fs/ntfsprogs sys-fs/reiserfsprogs sys-fs/xfsprogs