aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'releases/specs/x86/hardened')
-rw-r--r--releases/specs/x86/hardened/admincd-stage1-openrc.spec8
-rw-r--r--releases/specs/x86/hardened/admincd-stage2-openrc.spec49
2 files changed, 30 insertions, 27 deletions
diff --git a/releases/specs/x86/hardened/admincd-stage1-openrc.spec b/releases/specs/x86/hardened/admincd-stage1-openrc.spec
index 8344b279..4b08a0ac 100644
--- a/releases/specs/x86/hardened/admincd-stage1-openrc.spec
+++ b/releases/specs/x86/hardened/admincd-stage1-openrc.spec
@@ -1,10 +1,10 @@
subarch: i686
version_stamp: hardened-openrc-@TIMESTAMP@
target: livecd-stage1
-rel_type: hardened
-profile: default/linux/x86/17.0/hardened
+rel_type: 23.0-hardened
+profile: default/linux/x86/23.0/i686/hardened
snapshot_treeish: @TREEISH@
-source_subpath: hardened/stage3-i686-hardened-openrc-@TIMESTAMP@
+source_subpath: 23.0-hardened/stage3-i686-hardened-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
@@ -149,6 +149,7 @@ livecd/packages:
sys-apps/netplug
sys-apps/pciutils
sys-apps/pcmciautils
+ sys-apps/pv
sys-apps/sdparm
sys-apps/usbutils
sys-apps/sed
@@ -190,6 +191,7 @@ livecd/packages:
sys-fs/ncdu
sys-fs/ntfs3g
sys-fs/reiserfsprogs
+ sys-fs/xfsdump
sys-fs/xfsprogs
sys-kernel/linux-firmware
sys-libs/gpm
diff --git a/releases/specs/x86/hardened/admincd-stage2-openrc.spec b/releases/specs/x86/hardened/admincd-stage2-openrc.spec
index 73aa8cbd..b91bc61e 100644
--- a/releases/specs/x86/hardened/admincd-stage2-openrc.spec
+++ b/releases/specs/x86/hardened/admincd-stage2-openrc.spec
@@ -1,10 +1,10 @@
subarch: i686
version_stamp: hardened-openrc-@TIMESTAMP@
target: livecd-stage2
-rel_type: hardened
-profile: default/linux/x86/17.0/hardened
+rel_type: 23.0-hardened
+profile: default/linux/x86/23.0/i686/hardened
snapshot_treeish: @TREEISH@
-source_subpath: hardened/livecd-stage1-i686-hardened-openrc-@TIMESTAMP@
+source_subpath: 23.0-hardened/livecd-stage1-i686-hardened-openrc-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap
@@ -27,6 +27,8 @@ livecd/unmerge:
app-admin/perl-cleaner
app-admin/python-updater
app-arch/cpio
+ dev-build/libtool
+ dev-lang/rust-bin
dev-libs/gmp
dev-libs/libxml2
dev-libs/mpfr
@@ -55,7 +57,6 @@ livecd/unmerge:
sys-devel/gcc-config
sys-devel/gettext
sys-devel/gnuconfig
- sys-devel/libtool
sys-devel/m4
sys-devel/make
sys-devel/patch
@@ -74,8 +75,8 @@ livecd/empty:
/etc/modules.autoload.d
/etc/runlevels/single
/etc/skel
- /lib/dev-state
- /lib/udev-state
+ /usr/lib/dev-state
+ /usr/lib/udev-state
/root/.ccache
/tmp
/usr/diet/include
@@ -147,17 +148,17 @@ livecd/rm:
/etc/make.profile
/etc/man.conf
/etc/resolv.conf
- /lib*/*.a
- /lib*/*.la
- /lib*/cpp
+ /usr/lib*/*.a
+ /usr/lib*/*.la
+ /usr/lib*/cpp
/root/.bash_history
/root/.viminfo
- /sbin/*.static
- /sbin/fsck.cramfs
- /sbin/fsck.minix
- /sbin/mkfs.bfs
- /sbin/mkfs.cramfs
- /sbin/mkfs.minix
+ /usr/bin/*.static
+ /usr/bin/fsck.cramfs
+ /usr/bin/fsck.minix
+ /usr/bin/mkfs.bfs
+ /usr/bin/mkfs.cramfs
+ /usr/bin/mkfs.minix
/usr/bin/addr2line
/usr/bin/ar
/usr/bin/as
@@ -200,15 +201,15 @@ livecd/rm:
/usr/lib*/*.la
/usr/lib*/perl5/site_perl
/usr/lib*/gcc-lib/*/*/libgcj*
- /usr/sbin/archive-conf
- /usr/sbin/dispatch-conf
- /usr/sbin/emaint
- /usr/sbin/env-update
- /usr/sbin/etc-update
- /usr/sbin/fb*
- /usr/sbin/fixpackages
- /usr/sbin/quickpkg
- /usr/sbin/regenworld
+ /usr/bin/archive-conf
+ /usr/bin/dispatch-conf
+ /usr/bin/emaint
+ /usr/bin/env-update
+ /usr/bin/etc-update
+ /usr/bin/fb*
+ /usr/bin/fixpackages
+ /usr/bin/quickpkg
+ /usr/bin/regenworld
/usr/share/consolefonts/1*
/usr/share/consolefonts/7*
/usr/share/consolefonts/8*