aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'releases/specs/amd64/hardened/admincd-stage2.spec')
-rw-r--r--releases/specs/amd64/hardened/admincd-stage2.spec59
1 files changed, 29 insertions, 30 deletions
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index a1f98997..360844b6 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -1,10 +1,10 @@
subarch: amd64
version_stamp: @TIMESTAMP@
target: livecd-stage2
-rel_type: hardened
-profile: default/linux/amd64/17.1/hardened
-snapshot: @TIMESTAMP@
-source_subpath: hardened/livecd-stage1-amd64-@TIMESTAMP@
+rel_type: 23.0-hardened
+profile: default/linux/amd64/23.0/hardened
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-hardened/livecd-stage1-amd64-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap
@@ -16,10 +16,9 @@ livecd/volid: Gentoo amd64 AdminCD @TIMESTAMP@
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-5.10.61.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-6.6.21.config
-boot/kernel/gentoo/packages:
- sys-fs/zfs
+boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod broadcom-sta
livecd/unmerge:
app-admin/eselect
@@ -40,6 +39,7 @@ livecd/unmerge:
sys-apps/groff
sys-apps/man-db
sys-apps/man-pages
+ sys-apps/memtest86+
sys-apps/miscfiles
sys-apps/sandbox
sys-apps/texinfo
@@ -74,10 +74,10 @@ livecd/empty:
/etc/modules.autoload.d
/etc/runlevels/single
/etc/skel
- /lib/dev-state
- /lib/udev-state
- /lib64/dev-state
- /lib64/udev-state
+ /usr/lib/dev-state
+ /usr/lib/udev-state
+ /usr/lib64/dev-state
+ /usr/lib64/udev-state
/root/.ccache
/tmp
/usr/diet/include
@@ -156,17 +156,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,7 +200,6 @@ livecd/rm:
/usr/bin/portageq
/usr/bin/ranlib
/usr/bin/readelf
- /usr/bin/repoman
/usr/bin/size
/usr/bin/strip
/usr/bin/tbz2tool
@@ -210,15 +209,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*