diff --git a/releases/specs/x86/hardened/admincd-stage1-openrc.spec b/releases/specs/x86/hardened/admincd-stage1-openrc.spec index 8344b279..52174cc0 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/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 diff --git a/releases/specs/x86/hardened/admincd-stage2-openrc.spec b/releases/specs/x86/hardened/admincd-stage2-openrc.spec index 73aa8cbd..b567108c 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/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 @@ -74,8 +74,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 +147,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 +200,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* diff --git a/releases/specs/x86/i486/installcd-stage1-openrc.spec b/releases/specs/x86/i486/installcd-stage1-openrc.spec index 45dc08c9..a7eb7ce7 100644 --- a/releases/specs/x86/i486/installcd-stage1-openrc.spec +++ b/releases/specs/x86/i486/installcd-stage1-openrc.spec @@ -1,10 +1,10 @@ subarch: i486 version_stamp: openrc-@TIMESTAMP@ target: livecd-stage1 -rel_type: default -profile: default/linux/x86/17.0 +rel_type: 23.0-default +profile: default/linux/x86/23.0/i486 snapshot_treeish: @TREEISH@ -source_subpath: default/stage3-i486-openrc-@TIMESTAMP@ +source_subpath: 23.0-default/stage3-i486-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/isos diff --git a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec index 787eaa2f..c2ab6e56 100644 --- a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec +++ b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec @@ -1,10 +1,10 @@ subarch: i486 version_stamp: openrc-@TIMESTAMP@ target: livecd-stage2 -rel_type: default -profile: default/linux/x86/17.0 +rel_type: 23.0-default +profile: default/linux/x86/23.0/i486 snapshot_treeish: @TREEISH@ -source_subpath: default/livecd-stage1-i486-openrc-@TIMESTAMP@ +source_subpath: 23.0-default/livecd-stage1-i486-openrc-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/isos livecd/bootargs: dokeymap @@ -76,8 +76,8 @@ livecd/empty: /etc/rsync /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 @@ -151,17 +151,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 @@ -204,15 +204,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* diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index fd16762a..1305eca7 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -23,9 +23,9 @@ SETS=" " SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage3-openrc.spec" -SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd-stage2-minimal-openrc.spec" SET_i486_openrc_23_SPECS="i486/stage1-openrc-23.spec i486/stage3-openrc-23.spec" +SET_i486_openrc_23_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd-stage2-minimal-openrc.spec" SET_i486_systemd_23_SPECS="i486/stage1-systemd-23.spec i486/stage3-systemd-23.spec" @@ -36,9 +36,9 @@ SET_i686_openrc_23_SPECS="i686/stage1-openrc-23.spec i686/stage3-openrc-23.spec" SET_i686_systemd_23_SPECS="i686/stage1-systemd-23.spec i686/stage3-systemd-23.spec" SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec" -SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec hardened/admincd-stage2-openrc.spec" SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec hardened/stage3-openrc-23.spec" +SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec hardened/admincd-stage2-openrc.spec" SET_musl_SPECS="musl/stage1.spec musl/stage3.spec" @@ -80,9 +80,6 @@ post_build() { i486/stage3-openrc.spec) upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i486" x86/17.0/i486 ;; - i486/installcd-stage2-minimal-openrc.spec) - upload install-x86-minimal-${TIMESTAMP}.iso* - ;; i686/stage3-openrc.spec) upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i686" x86/17.0/i686 ;; @@ -98,6 +95,9 @@ post_build() { upload stage3-i486-systemd-${TIMESTAMP}.tar.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i486" x86/23.0/i486 ;; + i486/installcd-stage2-minimal-openrc.spec) + upload install-x86-minimal-${TIMESTAMP}.iso* + ;; i686/stage3-openrc-23.spec) upload stage3-i686-openrc-${TIMESTAMP}.tar.xz* ;; @@ -113,9 +113,6 @@ post_build() { hardened/stage3-openrc.spec) upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-i686" x86/17.0/i686_hardened ;; - hardened/admincd-stage2-openrc.spec) - upload admincd-x86-${TIMESTAMP}.iso* - ;; esac popd >/dev/null || exit @@ -125,6 +122,9 @@ post_build() { upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-i686" x86/23.0/i686_hardened ;; + hardened/admincd-stage2-openrc.spec) + upload admincd-x86-${TIMESTAMP}.iso* + ;; esac popd >/dev/null || exit