diff options
Diffstat (limited to 'releases/specs/x86')
18 files changed, 68 insertions, 199 deletions
diff --git a/releases/specs/x86/hardened/admincd-stage1-openrc.spec b/releases/specs/x86/hardened/admincd-stage1-openrc.spec index 8344b279..e356b279 100644 --- a/releases/specs/x86/hardened/admincd-stage1-openrc.spec +++ b/releases/specs/x86/hardened/admincd-stage1-openrc.spec @@ -1,12 +1,12 @@ 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 +portage_confdir: @REPO_DIR@/releases/portage/isos-x86 livecd/use: alsa @@ -76,6 +76,7 @@ livecd/packages: app-text/dos2unix app-text/wgetpaste app-vim/gentoo-syntax + dev-debug/strace dev-lang/perl dev-lang/python dev-vcs/git @@ -149,6 +150,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 +192,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..09a4f4dc 100644 --- a/releases/specs/x86/hardened/admincd-stage2-openrc.spec +++ b/releases/specs/x86/hardened/admincd-stage2-openrc.spec @@ -1,11 +1,11 @@ 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@ -portage_confdir: @REPO_DIR@/releases/portage/isos +source_subpath: 23.0-hardened/livecd-stage1-i686-hardened-openrc-@TIMESTAMP@ +portage_confdir: @REPO_DIR@/releases/portage/isos-x86 livecd/bootargs: dokeymap livecd/fstype: squashfs @@ -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* diff --git a/releases/specs/x86/hardened/stage1-openrc.spec b/releases/specs/x86/hardened/stage1-openrc.spec deleted file mode 100644 index fd0a33b0..00000000 --- a/releases/specs/x86/hardened/stage1-openrc.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: i686 -target: stage1 -version_stamp: hardened-openrc-@TIMESTAMP@ -rel_type: hardened -profile: default/linux/x86/17.0/hardened -snapshot_treeish: @TREEISH@ -source_subpath: hardened/stage3-i686-hardened-openrc-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/x86/hardened/stage3-openrc.spec b/releases/specs/x86/hardened/stage3-openrc.spec deleted file mode 100644 index 238fc9a3..00000000 --- a/releases/specs/x86/hardened/stage3-openrc.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: i686 -target: stage3 -version_stamp: hardened-openrc-@TIMESTAMP@ -rel_type: hardened -profile: default/linux/x86/17.0/hardened -snapshot_treeish: @TREEISH@ -source_subpath: hardened/stage1-i686-hardened-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -binrepo_path: x86/binpackages/17.0/i686_hardened diff --git a/releases/specs/x86/i486/installcd-stage1-openrc.spec b/releases/specs/x86/i486/installcd-stage1-openrc.spec index 45dc08c9..5e2a52d3 100644 --- a/releases/specs/x86/i486/installcd-stage1-openrc.spec +++ b/releases/specs/x86/i486/installcd-stage1-openrc.spec @@ -1,12 +1,12 @@ 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 +portage_confdir: @REPO_DIR@/releases/portage/isos-x86 livecd/use: alsa @@ -34,6 +34,7 @@ livecd/packages: app-portage/cpuid2cpuflags app-portage/mirrorselect app-text/wgetpaste + dev-debug/strace media-gfx/fbgrab media-sound/alsa-utils net-analyzer/traceroute @@ -70,6 +71,7 @@ livecd/packages: sys-apps/netplug sys-apps/pciutils sys-apps/pcmciautils + sys-apps/pv sys-apps/sdparm sys-apps/usbutils sys-auth/ssh-import-id @@ -94,6 +96,7 @@ livecd/packages: sys-fs/multipath-tools 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/i486/installcd-stage2-minimal-openrc.spec b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec index 787eaa2f..c7297618 100644 --- a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec +++ b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec @@ -1,11 +1,11 @@ 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@ -portage_confdir: @REPO_DIR@/releases/portage/isos +source_subpath: 23.0-default/livecd-stage1-i486-openrc-@TIMESTAMP@ +portage_confdir: @REPO_DIR@/releases/portage/isos-x86 livecd/bootargs: dokeymap #livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 @@ -28,6 +28,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 @@ -56,7 +58,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 @@ -76,8 +77,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 +152,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 +205,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/stage1-openrc.spec b/releases/specs/x86/i486/stage1-openrc.spec deleted file mode 100644 index cf165173..00000000 --- a/releases/specs/x86/i486/stage1-openrc.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: i486 -target: stage1 -version_stamp: openrc-@TIMESTAMP@ -rel_type: default -profile: default/linux/x86/17.0 -snapshot_treeish: @TREEISH@ -source_subpath: default/stage3-i486-openrc-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/x86/i486/stage1-systemd-mu.spec b/releases/specs/x86/i486/stage1-systemd-mu.spec deleted file mode 100644 index e5bb086a..00000000 --- a/releases/specs/x86/i486/stage1-systemd-mu.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: i486 -target: stage1 -version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: mergedusr -profile: default/linux/x86/17.0/systemd/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: mergedusr/stage3-i486-systemd-mergedusr-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/x86/i486/stage3-openrc.spec b/releases/specs/x86/i486/stage3-openrc.spec deleted file mode 100644 index 34f523d8..00000000 --- a/releases/specs/x86/i486/stage3-openrc.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: i486 -target: stage3 -version_stamp: openrc-@TIMESTAMP@ -rel_type: default -profile: default/linux/x86/17.0 -snapshot_treeish: @TREEISH@ -source_subpath: default/stage1-i486-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -binrepo_path: x86/binpackages/17.0/i486 diff --git a/releases/specs/x86/i486/stage3-systemd-mu.spec b/releases/specs/x86/i486/stage3-systemd-mu.spec deleted file mode 100644 index d63992c8..00000000 --- a/releases/specs/x86/i486/stage3-systemd-mu.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: i486 -target: stage3 -version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: mergedusr -profile: default/linux/x86/17.0/systemd/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: mergedusr/stage1-i486-systemd-mergedusr-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -binrepo_path: x86/binpackages/17.0/i486 diff --git a/releases/specs/x86/i686-ssemath/stage3-openrc-23.spec b/releases/specs/x86/i686-ssemath/stage3-openrc-23.spec index 14f2be7a..1575591a 100644 --- a/releases/specs/x86/i686-ssemath/stage3-openrc-23.spec +++ b/releases/specs/x86/i686-ssemath/stage3-openrc-23.spec @@ -2,7 +2,7 @@ subarch: i686-ssemath target: stage3 version_stamp: openrc-@TIMESTAMP@ rel_type: 23.0-default -profile: default/linux/x86/23.0/i686-ssemath +profile: default/linux/x86/23.0/i686 snapshot_treeish: @TREEISH@ source_subpath: 23.0-default/stage1-i686-ssemath-openrc-@TIMESTAMP@ compression_mode: pixz diff --git a/releases/specs/x86/i686-ssemath/stage3-systemd-23.spec b/releases/specs/x86/i686-ssemath/stage3-systemd-23.spec index ea2fb77a..b6bae37c 100644 --- a/releases/specs/x86/i686-ssemath/stage3-systemd-23.spec +++ b/releases/specs/x86/i686-ssemath/stage3-systemd-23.spec @@ -2,7 +2,7 @@ subarch: i686-ssemath target: stage3 version_stamp: systemd-@TIMESTAMP@ rel_type: 23.0-default -profile: default/linux/x86/23.0/i686-ssemath/systemd +profile: default/linux/x86/23.0/i686/systemd snapshot_treeish: @TREEISH@ source_subpath: 23.0-default/stage1-i686-ssemath-systemd-@TIMESTAMP@ compression_mode: pixz diff --git a/releases/specs/x86/i686/stage1-openrc.spec b/releases/specs/x86/i686/stage1-openrc.spec deleted file mode 100644 index 6922206d..00000000 --- a/releases/specs/x86/i686/stage1-openrc.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: i686 -target: stage1 -version_stamp: openrc-@TIMESTAMP@ -rel_type: default -profile: default/linux/x86/17.0 -snapshot_treeish: @TREEISH@ -source_subpath: default/stage3-i686-openrc-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/x86/i686/stage1-systemd-mu.spec b/releases/specs/x86/i686/stage1-systemd-mu.spec deleted file mode 100644 index d50fd9a0..00000000 --- a/releases/specs/x86/i686/stage1-systemd-mu.spec +++ /dev/null @@ -1,12 +0,0 @@ -subarch: i686 -target: stage1 -version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: mergedusr -profile: default/linux/x86/17.0/systemd/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: mergedusr/stage3-i686-systemd-mergedusr-latest -compression_mode: pixz -update_seed: yes -update_seed_command: --update --deep --newuse @world -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/x86/i686/stage3-openrc.spec b/releases/specs/x86/i686/stage3-openrc.spec deleted file mode 100644 index 2cac1c31..00000000 --- a/releases/specs/x86/i686/stage3-openrc.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: i686 -target: stage3 -version_stamp: openrc-@TIMESTAMP@ -rel_type: default -profile: default/linux/x86/17.0 -snapshot_treeish: @TREEISH@ -source_subpath: default/stage1-i686-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -binrepo_path: x86/binpackages/17.0/i686 diff --git a/releases/specs/x86/i686/stage3-systemd-mu.spec b/releases/specs/x86/i686/stage3-systemd-mu.spec deleted file mode 100644 index 8500c0f0..00000000 --- a/releases/specs/x86/i686/stage3-systemd-mu.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: i686 -target: stage3 -version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: mergedusr -profile: default/linux/x86/17.0/systemd/merged-usr -snapshot_treeish: @TREEISH@ -source_subpath: mergedusr/stage1-i686-systemd-mergedusr-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -binrepo_path: x86/binpackages/17.0/i686 diff --git a/releases/specs/x86/musl/stage1.spec b/releases/specs/x86/musl/stage1.spec deleted file mode 100644 index 0f158f21..00000000 --- a/releases/specs/x86/musl/stage1.spec +++ /dev/null @@ -1,13 +0,0 @@ -subarch: i686 -target: stage1 -version_stamp: musl-@TIMESTAMP@ -rel_type: musl -profile: default/linux/x86/17.0/musl -snapshot_treeish: @TREEISH@ -source_subpath: musl/stage3-i686-musl-latest -chost: i686-gentoo-linux-musl -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -update_seed: yes -update_seed_command: --update --deep --newuse @world -compression_mode: pixz diff --git a/releases/specs/x86/musl/stage3.spec b/releases/specs/x86/musl/stage3.spec deleted file mode 100644 index 1e83e1a3..00000000 --- a/releases/specs/x86/musl/stage3.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: i686 -target: stage3 -version_stamp: musl-@TIMESTAMP@ -rel_type: musl -profile: default/linux/x86/17.0/musl -snapshot_treeish: @TREEISH@ -source_subpath: musl/stage1-i686-musl-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -compression_mode: pixz -binrepo_path: x86/binpackages/17.0/i686_musl |