commit: 654d66c27ec53c420fde3d4a25e1b5d3a9501ab6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 11:24:34 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 11:24:34 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=654d66c2
Port amd64 Admin CD to 23.0 (first try)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/amd64/hardened/admincd-stage1.spec | 6 +--
releases/specs/amd64/hardened/admincd-stage2.spec | 50 +++++++++++------------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/releases/specs/amd64/hardened/admincd-stage1.spec
b/releases/specs/amd64/hardened/admincd-stage1.spec
index bad551db..4ae26ad8 100644
--- a/releases/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/specs/amd64/hardened/admincd-stage1.spec
@@ -1,10 +1,10 @@
subarch: amd64
version_stamp: @TIMESTAMP@
target: livecd-stage1
-rel_type: hardened
-profile: default/linux/amd64/17.1/hardened
+rel_type: 23.0-hardened
+profile: default/linux/amd64/23.0/hardened
snapshot_treeish: @TREEISH@
-source_subpath: hardened/stage3-amd64-hardened-openrc-@TIMESTAMP@
+source_subpath: 23.0-hardened/stage3-amd64-hardened-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec
b/releases/specs/amd64/hardened/admincd-stage2.spec
index 6256e9e2..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
+rel_type: 23.0-hardened
+profile: default/linux/amd64/23.0/hardened
snapshot_treeish: @TREEISH@
-source_subpath: hardened/livecd-stage1-amd64-@TIMESTAMP@
+source_subpath: 23.0-hardened/livecd-stage1-amd64-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap
@@ -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
@@ -209,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*
