diff options
65 files changed, 133 insertions, 452 deletions
diff --git a/config/amd64-auto.conf b/config/amd64-auto.conf index 6120a6ab..8481106f 100644 --- a/config/amd64-auto.conf +++ b/config/amd64-auto.conf @@ -1,10 +1,11 @@ distdir="/release/tmp/distfiles/" portdir="/release/trees/portage-auto" options="autoresume bindist pkgcache preserve_libs seedcache snapcache" -sharedir="/usr/lib64/catalyst/" +sharedir="/usr/share/catalyst/" storedir="/release/buildroot/amd64-dev" snapshot_cache="/release/tmp/snapshots" envscript="/etc/catalyst/local/host.env" hash_function="crc32" digests="sha512 whirlpool" contents="auto" +source_matching="loose" diff --git a/config/snapshot-auto.conf b/config/snapshot-auto.conf index 7b39cb8b..7c84d1b6 100644 --- a/config/snapshot-auto.conf +++ b/config/snapshot-auto.conf @@ -1,6 +1,6 @@ distdir="/usr/portage/distfiles" portdir="/release/trees/portage-auto" -sharedir="/usr/lib/catalyst" +sharedir="/usr/share/catalyst" storedir="/release" hash_function="crc32" digests="md5 sha1" diff --git a/config/stable.keywords b/config/stable.keywords new file mode 100644 index 00000000..50f772c5 --- /dev/null +++ b/config/stable.keywords @@ -0,0 +1,2 @@ +export ACCEPT_KEYWORDS="*" + diff --git a/config/unstable.keywords b/config/unstable.keywords new file mode 100644 index 00000000..8613ff7e --- /dev/null +++ b/config/unstable.keywords @@ -0,0 +1,2 @@ +export ACCEPT_KEYWORDS="~*" + diff --git a/config/x86-auto.conf b/config/x86-auto.conf index f4e934ff..655a83bd 100644 --- a/config/x86-auto.conf +++ b/config/x86-auto.conf @@ -1,10 +1,11 @@ distdir="/release/tmp/distfiles/" portdir="/release/trees/portage-auto" options="autoresume bindist pkgcache preserve_libs seedcache snapcache" -sharedir="/usr/lib64/catalyst/" +sharedir="/usr/share/catalyst/" storedir="/release/buildroot/x86-dev" snapshot_cache="/release/tmp/snapshots" envscript="/etc/catalyst/local/host.env" hash_function="crc32" digests="sha512 whirlpool" contents="auto" +source_matching="loose" diff --git a/old/specs/dolphin/dolphin-iso-stage1.spec b/old/specs/dolphin/dolphin-iso-stage1.spec deleted file mode 100644 index 541873b8..00000000 --- a/old/specs/dolphin/dolphin-iso-stage1.spec +++ /dev/null @@ -1,104 +0,0 @@ -subarch: i686 -version_stamp: dolphin-2005.0 -target: livecd-stage1 -rel_type: default -profile: default-linux/x86/2005.0 -snapshot: 20050331 -source_subpath: default/stage3-i686-2005.0 -livecd/use: - -* - ipv6 - socks5 - livecd - fbcon - minimal - ncurses - readline - samba - alsa - ssl - -livecd/packages: - baselayout - livecd-tools - module-init-tools - dhcpcd - udev - gentoo-sources - kudzu-knoppix - hotplug - coldplug - fxload -# tsocks - irssi - gpm - syslog-ng - parted - links - raidtools - nfs-utils - jfsutils - usbutils - pciutils - xfsprogs - e2fsprogs - reiserfsprogs - dosfstools - ext2resize -# cryptsetup - pwgen - popt - dialog - rp-pppoe - screen - mirrorselect - penggy - iputils - hwdata-knoppix - hwsetup - device-mapper - lvm2 - evms - vim - pptpclient - mdadm - ethtool - wireless-tools - ntfsprogs - dosfstools - prism54-firmware - wpa_supplicant - genkernel -# RESCUE_CD - zsh - samba - bacula - mc - dar - mutt - xfsdump - ide-smart - netcat - nmap - chkrootkit -# shfs - rkhunter - memdump - wireless-tools - x86info - tar - bzip2 - gzip - tct - partimage - ncftp - rdiff-backup - rsync - testdisk - dd-rescue - disktype - centericq - bind-tools - alsa-utils - mpg321 - diff --git a/old/specs/dolphin/dolphin-iso-stage2.spec b/old/specs/dolphin/dolphin-iso-stage2.spec deleted file mode 100644 index 256d2b79..00000000 --- a/old/specs/dolphin/dolphin-iso-stage2.spec +++ /dev/null @@ -1,300 +0,0 @@ -subarch: i686 -version_stamp: 2005.0 -target: livecd-stage2 -rel_type: default -profile: default-linux/x86/2005.0 -snapshot: 20050331 -source_subpath: default/livecd-stage1-i686-dolphin-2005.0 - -livecd/cdfstype: squashfs -livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh -livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2 -# This fsscript removes serial and is not necessary in catalyst > 1.1.7 -#livecd/fsscript: /home/beejay/2005.0/fsscript.sh -#livecd/iso: /home/beejay/2005.0/move/x86-installcd-2005.0-rc10.iso -livecd/iso: /home/beejay/dolphin-i686-2005.0.iso -livecd/splash_type: gensplash -livecd/splash_theme: livecd-2005.0 -livecd/gk_mainargs: --lvm2 --dmraid -livecd/type: gentoo-release-minimal -livecd/modblacklist: - 8139cp - -#livecd/overlay: /root/livecd/overlay-minimal -#livecd/overlay: /home/beejay/2005.0/overlay-minimal/ -livecd/devmanager: udev - -# Commented by Chris Gianelloni -#livecd/rcadd: -# syslog-ng:default -# gpm:default - -boot/kernel: gentoo -boot/kernel/gentoo/sources: gentoo-sources - -boot/kernel/gentoo/config: /home/beejay/2005.0/2.6.11-smp.config - -boot/kernel/gentoo/use: pcmcia usb -X - -boot/kernel/gentoo/postconf: - splashutils - splash-themes-livecd - -boot/kernel/gentoo/packages: - pcmcia-cs - speedtouch - slmodem - globespan-adsl - hostap-driver - hostap-utils - =ipw2100-1.0.5 - =ipw2200-1.0.1 - acpid - cryptsetup - #fcdsl - #fritzcapi - -livecd/unmerge: - acl -# attr -# autoconf -# automake -# bin86 -# binutils -# libtool -# m4 -# bison -# ld.so -# make -# perl -# patch - linux-headers -# man-pages - sash -# bison -# flex -# gettext -# texinfo - ccache -# distcc -# addpatches -# man -# groff -# lib-compat - miscfiles -# rsync - sysklogd - bc - lcms - libmng - genkernel - diffutils -# file -# libperl - gnuconfig -# gcc-config -# gcc -# bin86 -# cpio - cronbase -# ed - expat - grub -# help2man -# libtool - -livecd/empty: - /var/tmp - /var/cache - /var/db - /var/empty - /var/lock - /var/log - /var/run - /var/spool - /var/state - /tmp - /usr/portage -# /usr/share/man -# /usr/share/info - /usr/share/unimaps -# /usr/include - /usr/share/zoneinfo - /usr/share/dict - /usr/share/doc - /usr/share/ss - /usr/share/state -# /usr/share/texinfo - /usr/lib/python2.2 - /usr/lib/portage - /usr/share/gettext - /usr/share/i18n - /usr/share/rfc - /usr/X11R6/man - /usr/X11R6/include - /usr/X11R6/lib/X11/config - /usr/X11R6/lib/X11/etc - /usr/X11R6/lib/X11/doc - /usr/src - /usr/share/doc -# /usr/share/man - /root/.ccache -# Added by wolf31o2 - /etc/cron.daily - /etc/cron.hourly - /etc/cron.monthly - /etc/cron.weekly - /etc/logrotate.d - /etc/rsync - /usr/X11R6 -# /usr/include -# /usr/lib/awk - /usr/lib/ccache -# /usr/lib/gcc-config -# /usr/lib/nfs - /usr/local -# /usr/diet/include -# /usr/diet/man - /usr/share/consolefonts/partialfonts - /usr/share/consoletrans - /usr/share/emacs - /usr/share/gcc-data - /usr/share/genkernel - /etc/bootsplash/gentoo - /etc/bootsplash/gentoo-highquality - /etc/splash/gentoo - /etc/splash/emergence - /usr/share/gnuconfig - /usr/share/lcms - /usr/share/locale/af - /usr/share/locale/be - /usr/share/locale/bg - /usr/share/locale/bs - /usr/share/locale/ca - /usr/share/locale/cs - /usr/share/locale/da - /usr/share/locale/de - /usr/share/locale/el - /usr/share/locale/en - /usr/share/locale/en_GB - /usr/share/locale/eo - /usr/share/locale/es - /usr/share/locale/et - /usr/share/locale/et_EE - /usr/share/locale/eu - /usr/share/locale/eu_ES - /usr/share/locale/fi - /usr/share/locale/fr - /usr/share/locale/ga - /usr/share/locale/gl - /usr/share/locale/gr - /usr/share/locale/he - /usr/share/locale/hr - /usr/share/locale/hu - /usr/share/locale/id - /usr/share/locale/is - /usr/share/locale/it - /usr/share/locale/ja - /usr/share/locale/ja_JP.EUC - /usr/share/locale/ko - /usr/share/locale/lug - /usr/share/locale/ms - /usr/share/locale/nb - /usr/share/locale/nl - /usr/share/locale/nn - /usr/share/locale/no - /usr/share/locale/pl - /usr/share/locale/pt - /usr/share/locale/pt_BR - /usr/share/locale/ro - /usr/share/locale/ru - /usr/share/locale/sk - /usr/share/locale/sl - /usr/share/locale/sr - /usr/share/locale/sv - /usr/share/locale/tr - /usr/share/locale/uk - /usr/share/locale/vi - /usr/share/locale/wa - /usr/share/locale/zh_CN - /usr/share/locale/zh_TW - #/usr/share/misc/file - #/usr/share/vim/vim63/doc - #/usr/share/vim/vim63/syntax - /etc/skel - -livecd/rm: -# /lib/*.a -# /usr/lib/*.a -# /usr/lib/gcc-lib/*/*/libgcj* - /usr/X11R6/lib/*.a - /etc/dispatch-conf.conf - /etc/etc-update.conf - /etc/*- - /etc/issue* - /etc/make.conf -# /etc/man.conf - /etc/*.old - /root/.viminfo - /usr/sbin/bootsplash* - /usr/sbin/fb* -# /usr/sbin/fsck.cramfs -# /usr/sbin/fsck.minix -# /usr/sbin/mkfs.minix -# /usr/sbin/mkfs.bfs -# /usr/sbin/mkfs.cramfs - /lib/security/pam_access.so - /lib/security/pam_chroot.so - /lib/security/pam_debug.so - /lib/security/pam_ftp.so - /lib/security/pam_issue.so - /lib/security/pam_mail.so - /lib/security/pam_motd.so - /lib/security/pam_mkhomedir.so - /lib/security/pam_postgresok.so - /lib/security/pam_rhosts_auth.so - /lib/security/pam_userdb.so - /usr/share/consolefonts/1* - /usr/share/consolefonts/7* - /usr/share/consolefonts/8* - /usr/share/consolefonts/9* - /usr/share/consolefonts/A* - /usr/share/consolefonts/C* - /usr/share/consolefonts/E* - /usr/share/consolefonts/G* - /usr/share/consolefonts/L* - /usr/share/consolefonts/M* - /usr/share/consolefonts/R* - /usr/share/consolefonts/a* - /usr/share/consolefonts/c* - /usr/share/consolefonts/dr* - /usr/share/consolefonts/g* - /usr/share/consolefonts/i* - /usr/share/consolefonts/k* - /usr/share/consolefonts/l* - /usr/share/consolefonts/r* - /usr/share/consolefonts/s* - /usr/share/consolefonts/t* - /usr/share/consolefonts/v* - /etc/bootsplash/livecd-2005.0/images/bootsplash-12* - /etc/bootsplash/livecd-2005.0/images/bootsplash-16* - /etc/bootsplash/livecd-2005.0/images/bootsplash-8* - /etc/bootsplash/livecd-2005.0/images/silent-12* - /etc/bootsplash/livecd-2005.0/images/silent-16* - /etc/bootsplash/livecd-2005.0/images/silent-8* - /etc/splash/livecd-2005.0/16* - /etc/splash/livecd-2005.0/12* - /etc/splash/livecd-2005.0/6* - /etc/splash/livecd-2005.0/8* - /etc/splash/livecd-2005.0/images/silent-16* - /etc/splash/livecd-2005.0/images/silent-12* - /etc/splash/livecd-2005.0/images/silent-6* - /etc/splash/livecd-2005.0/images/silent-8* - /etc/splash/livecd-2005.0/images/verbose-16* - /etc/splash/livecd-2005.0/images/verbose-12* - /etc/splash/livecd-2005.0/images/verbose-6* - /etc/splash/livecd-2005.0/images/verbose-8* - /etc/make.conf.example - /etc/make.globals - /etc/resolv.conf diff --git a/releases/weekly/portage/stages/package.use/bindist b/releases/weekly/portage/stages/package.use/bindist new file mode 100644 index 00000000..f826a95d --- /dev/null +++ b/releases/weekly/portage/stages/package.use/bindist @@ -0,0 +1 @@ +dev-libs/openssl bindist diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec index 96c56cd7..0ed7fb42 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec @@ -5,6 +5,7 @@ rel_type: hardened profile: hardened/linux/amd64/selinux snapshot: latest source_subpath: hardened/stage3-amd64-hardened-selinux-latest +compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/use: diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec index f9e136a0..66fd5e19 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec @@ -5,6 +5,7 @@ rel_type: hardened profile: hardened/linux/amd64 snapshot: latest source_subpath: hardened/stage3-amd64-hardened-latest +compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/use: diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec index bcb99370..48da78b0 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-latest-selinux portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: admincd-amd64-latest.iso diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec index 4b66ae4e..442c6043 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-latest portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: admincd-amd64-latest.iso diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec index 15361fdb..1f1e6f60 100644 --- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec +++ b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec @@ -5,6 +5,8 @@ rel_type: hardened profile: hardened/linux/amd64/no-multilib snapshot: latest source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec index ea0466a7..6e232717 100644 --- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec +++ b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec @@ -5,6 +5,8 @@ rel_type: hardened profile: hardened/linux/amd64/no-multilib/selinux snapshot: latest source_subpath: hardened/stage3-amd64-hardened-selinux+nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec index 90ad40f6..b4829421 100644 --- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec @@ -5,6 +5,8 @@ rel_type: hardened profile: hardened/linux/amd64/selinux snapshot: latest source_subpath: hardened/stage3-amd64-hardened-selinux-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/weekly/specs/amd64/hardened/stage1.spec index a02e843b..669c798b 100644 --- a/releases/weekly/specs/amd64/hardened/stage1.spec +++ b/releases/weekly/specs/amd64/hardened/stage1.spec @@ -5,6 +5,8 @@ rel_type: hardened profile: hardened/linux/amd64 snapshot: latest source_subpath: hardened/stage3-amd64-hardened-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec index 2977a67d..4768ecc9 100644 --- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec +++ b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/amd64/no-multilib snapshot: latest source_subpath: hardened/stage1-amd64-hardened+nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec index c753eaa7..fa9614b9 100644 --- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec +++ b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/amd64/no-multilib/selinux snapshot: latest source_subpath: hardened/stage1-amd64-hardened-selinux+nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec index ee93a452..dd3d806d 100644 --- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/amd64/selinux snapshot: latest source_subpath: hardened/stage1-amd64-hardened-selinux-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/weekly/specs/amd64/hardened/stage2.spec index f81cfa56..9462e8c4 100644 --- a/releases/weekly/specs/amd64/hardened/stage2.spec +++ b/releases/weekly/specs/amd64/hardened/stage2.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/amd64 snapshot: latest source_subpath: hardened/stage1-amd64-hardened-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec index 82f38ff4..87f8e9f8 100644 --- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec +++ b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/amd64/no-multilib snapshot: latest source_subpath: hardened/stage2-amd64-hardened+nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec index 28a52a42..735e62b7 100644 --- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec +++ b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/amd64/no-multilib/selinux snapshot: latest source_subpath: hardened/stage2-amd64-hardened-selinux+nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec index 1615cf6b..2d6f876e 100644 --- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/amd64/selinux snapshot: latest source_subpath: hardened/stage2-amd64-hardened-selinux-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/weekly/specs/amd64/hardened/stage3.spec index 99e77223..eebf6b90 100644 --- a/releases/weekly/specs/amd64/hardened/stage3.spec +++ b/releases/weekly/specs/amd64/hardened/stage3.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/amd64 snapshot: latest source_subpath: hardened/stage2-amd64-hardened-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec index 1769ca33..d263d7c7 100644 --- a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec +++ b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec @@ -5,6 +5,8 @@ rel_type: hardened profile: hardened/linux/amd64 snapshot: latest source_subpath: hardened/stage3-amd64-hardened-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages stage4/use: diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec index a57f813d..09e7ddc6 100644 --- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec +++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec @@ -5,6 +5,8 @@ rel_type: hardened profile: hardened/linux/amd64/no-multilib snapshot: latest source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages stage4/use: diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec index 5deb350c..5ee6c258 100644 --- a/releases/weekly/specs/amd64/installcd-stage1.spec +++ b/releases/weekly/specs/amd64/installcd-stage1.spec @@ -5,6 +5,7 @@ rel_type: default profile: default/linux/amd64/13.0/no-multilib snapshot: latest source_subpath: default/stage3-amd64-latest +compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/use: diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec index 99525f12..7e15fbc0 100644 --- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec @@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-latest portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: install-amd64-minimal-latest.iso diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec index 5a22e60f..8ce5dd4a 100644 --- a/releases/weekly/specs/amd64/livecd-stage2.spec +++ b/releases/weekly/specs/amd64/livecd-stage2.spec @@ -7,7 +7,7 @@ snapshot: latest source_subpath: default/livecd-stage1-amd64-installer-latest livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec index 666ef200..1df8fecc 100644 --- a/releases/weekly/specs/amd64/livedvd-stage2.spec +++ b/releases/weekly/specs/amd64/livedvd-stage2.spec @@ -7,7 +7,7 @@ snapshot: latest source_subpath: default/livecd-stage1-amd64-installer-latest livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/weekly/specs/amd64/stage1-nomultilib.spec index b6f28ba0..7f4f7889 100644 --- a/releases/weekly/specs/amd64/stage1-nomultilib.spec +++ b/releases/weekly/specs/amd64/stage1-nomultilib.spec @@ -5,6 +5,8 @@ rel_type: default profile: default/linux/amd64/13.0/no-multilib snapshot: latest source_subpath: default/stage3-amd64-nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/weekly/specs/amd64/stage1-x32.spec index 55ebcc91..c90620bf 100644 --- a/releases/weekly/specs/amd64/stage1-x32.spec +++ b/releases/weekly/specs/amd64/stage1-x32.spec @@ -5,6 +5,8 @@ rel_type: default profile: default/linux/amd64/13.0/x32 snapshot: latest source_subpath: default/stage3-x32-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/weekly/specs/amd64/stage1.spec index 0a006e2c..02459a03 100644 --- a/releases/weekly/specs/amd64/stage1.spec +++ b/releases/weekly/specs/amd64/stage1.spec @@ -5,6 +5,8 @@ rel_type: default profile: default/linux/amd64/13.0 snapshot: latest source_subpath: default/stage3-amd64-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/weekly/specs/amd64/stage2-nomultilib.spec index c07365cd..e98da51b 100644 --- a/releases/weekly/specs/amd64/stage2-nomultilib.spec +++ b/releases/weekly/specs/amd64/stage2-nomultilib.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/amd64/13.0/no-multilib snapshot: latest source_subpath: default/stage1-amd64-nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/weekly/specs/amd64/stage2-x32.spec index aab5cdc9..6685dd7b 100644 --- a/releases/weekly/specs/amd64/stage2-x32.spec +++ b/releases/weekly/specs/amd64/stage2-x32.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/amd64/13.0/x32 snapshot: latest source_subpath: default/stage1-x32-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/weekly/specs/amd64/stage2.spec index 937539f1..9f26ee88 100644 --- a/releases/weekly/specs/amd64/stage2.spec +++ b/releases/weekly/specs/amd64/stage2.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/amd64/13.0 snapshot: latest source_subpath: default/stage1-amd64-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/weekly/specs/amd64/stage3-nomultilib.spec index 3eaaf0c2..89ab20d3 100644 --- a/releases/weekly/specs/amd64/stage3-nomultilib.spec +++ b/releases/weekly/specs/amd64/stage3-nomultilib.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/amd64/13.0/no-multilib snapshot: latest source_subpath: default/stage2-amd64-nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/weekly/specs/amd64/stage3-x32.spec index d2f6734f..9c295e22 100644 --- a/releases/weekly/specs/amd64/stage3-x32.spec +++ b/releases/weekly/specs/amd64/stage3-x32.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/amd64/13.0/x32 snapshot: latest source_subpath: default/stage2-x32-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/weekly/specs/amd64/stage3.spec index 3b1c6e00..07cf6de7 100644 --- a/releases/weekly/specs/amd64/stage3.spec +++ b/releases/weekly/specs/amd64/stage3.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/amd64/13.0 snapshot: latest source_subpath: default/stage2-amd64-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/amd64/stage4-cloud.spec b/releases/weekly/specs/amd64/stage4-cloud.spec index b25f8cde..999ee4e3 100644 --- a/releases/weekly/specs/amd64/stage4-cloud.spec +++ b/releases/weekly/specs/amd64/stage4-cloud.spec @@ -5,6 +5,8 @@ rel_type: default profile: default/linux/amd64/13.0 snapshot: latest source_subpath: default/stage3-amd64-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages stage4/use: diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec index 6043c1ed..86dfd6de 100644 --- a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec +++ b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec @@ -5,6 +5,8 @@ rel_type: default profile: default/linux/amd64/13.0/no-multilib snapshot: latest source_subpath: default/stage3-amd64-nomultilib-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages stage4/use: diff --git a/releases/weekly/specs/hppa/installcd-stage2-universal.spec b/releases/weekly/specs/hppa/installcd-stage2-universal.spec index fd88f959..6ccf098b 100644 --- a/releases/weekly/specs/hppa/installcd-stage2-universal.spec +++ b/releases/weekly/specs/hppa/installcd-stage2-universal.spec @@ -7,7 +7,7 @@ snapshot: 2008.0 source_subpath: default/livecd-stage1-hppa1.1-2008.0 livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-universal-2008.0.iso diff --git a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec index cabb3bd7..247506ed 100644 --- a/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/ppc/ppc64/installcd-stage2-minimal.spec @@ -6,7 +6,7 @@ version_stamp: 2008.0 profile: default/linux/powerpc/ppc64/13.0/32bit-userland source_subpath: default/livecd-stage1-ppc64-32ul-2008.0 -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --utils-arch=ppc --arch-override=ppc --makeopts=-j8 --lvm --dmraid --mdadm livecd/iso: /var/tmp/catalyst/builds/default/install-powerpc-minimal-2008.0.iso diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec index 97d1f63b..31c57752 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec @@ -5,6 +5,7 @@ rel_type: hardened profile: hardened/linux/x86 snapshot: latest source_subpath: hardened/stage3-i686-hardened-latest +compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/use: diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec index f2dfd206..db85f464 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-x86-latest portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: admincd-x86-latest.iso diff --git a/releases/weekly/specs/x86/hardened/installcd-stage1.spec b/releases/weekly/specs/x86/hardened/installcd-stage1.spec index 49c26cef..e8c5d4b1 100644 --- a/releases/weekly/specs/x86/hardened/installcd-stage1.spec +++ b/releases/weekly/specs/x86/hardened/installcd-stage1.spec @@ -5,6 +5,7 @@ rel_type: hardened profile: hardened/linux/x86 snapshot: latest source_subpath: hardened/stage3-x86-hardened-latest +compression_mode: pixz_x livecd/use: -* deprecated diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec index 8d8f312f..c03f99ec 100644 --- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec @@ -7,7 +7,7 @@ snapshot: latest source_subpath: hardened/livecd-stage1-x86-hardened-latest livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: install-x86-minimal-latest.iso diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/weekly/specs/x86/hardened/stage1.spec index 34cf3f6a..69d04974 100644 --- a/releases/weekly/specs/x86/hardened/stage1.spec +++ b/releases/weekly/specs/x86/hardened/stage1.spec @@ -5,6 +5,8 @@ rel_type: hardened profile: hardened/linux/x86 snapshot: latest source_subpath: hardened/stage3-i686-hardened-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/weekly/specs/x86/hardened/stage2.spec index 2142ad0d..df8b72a8 100644 --- a/releases/weekly/specs/x86/hardened/stage2.spec +++ b/releases/weekly/specs/x86/hardened/stage2.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/x86 snapshot: latest source_subpath: hardened/stage1-i686-hardened-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/weekly/specs/x86/hardened/stage3.spec index 6a7300e6..52b786f7 100644 --- a/releases/weekly/specs/x86/hardened/stage3.spec +++ b/releases/weekly/specs/x86/hardened/stage3.spec @@ -5,4 +5,6 @@ rel_type: hardened profile: hardened/linux/x86 snapshot: latest source_subpath: hardened/stage2-i686-hardened-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/x86/i686/livecd-stage2.spec b/releases/weekly/specs/x86/i686/livecd-stage2.spec index baa769ea..7f7742d9 100644 --- a/releases/weekly/specs/x86/i686/livecd-stage2.spec +++ b/releases/weekly/specs/x86/i686/livecd-stage2.spec @@ -7,7 +7,7 @@ snapshot: latest source_subpath: default/livecd-stage1-i686-installer-latest livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 diff --git a/releases/weekly/specs/x86/i686/livedvd-stage2.spec b/releases/weekly/specs/x86/i686/livedvd-stage2.spec index f906ce31..1e83c77e 100644 --- a/releases/weekly/specs/x86/i686/livedvd-stage2.spec +++ b/releases/weekly/specs/x86/i686/livedvd-stage2.spec @@ -7,7 +7,7 @@ snapshot: latest source_subpath: default/livecd-stage1-i686-installer-latest livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fsscript: @REPO_DIR@/releases/latest/scripts/livecd.sh livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 diff --git a/releases/weekly/specs/x86/i686/stage1.spec b/releases/weekly/specs/x86/i686/stage1.spec index dd4aa336..cd757316 100644 --- a/releases/weekly/specs/x86/i686/stage1.spec +++ b/releases/weekly/specs/x86/i686/stage1.spec @@ -5,6 +5,8 @@ rel_type: default profile: default/linux/x86/13.0 snapshot: latest source_subpath: default/stage3-i686-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/x86/i686/stage2.spec b/releases/weekly/specs/x86/i686/stage2.spec index 0feca2dc..a8dfddfe 100644 --- a/releases/weekly/specs/x86/i686/stage2.spec +++ b/releases/weekly/specs/x86/i686/stage2.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/x86/13.0 snapshot: latest source_subpath: default/stage1-i686-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/x86/i686/stage3.spec b/releases/weekly/specs/x86/i686/stage3.spec index e15ae511..43100aab 100644 --- a/releases/weekly/specs/x86/i686/stage3.spec +++ b/releases/weekly/specs/x86/i686/stage3.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/x86/13.0 snapshot: latest source_subpath: default/stage2-i686-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec index 1b4936be..42a967ed 100644 --- a/releases/weekly/specs/x86/installcd-stage1.spec +++ b/releases/weekly/specs/x86/installcd-stage1.spec @@ -5,6 +5,7 @@ rel_type: default profile: default/linux/x86/13.0 snapshot: latest source_subpath: default/stage3-i486-latest +compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/use: diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec index e2b81b74..3c16550e 100644 --- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec @@ -8,7 +8,7 @@ source_subpath: default/livecd-stage1-x86-latest portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/bootargs: dokeymap -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 livecd/iso: install-x86-minimal-latest.iso diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/weekly/specs/x86/stage1.spec index d060250e..a1f4c553 100644 --- a/releases/weekly/specs/x86/stage1.spec +++ b/releases/weekly/specs/x86/stage1.spec @@ -5,6 +5,8 @@ rel_type: default profile: default/linux/x86/13.0 snapshot: latest source_subpath: default/stage3-i486-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip update_seed: yes update_seed_command: --update --deep @world portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/x86/stage2.spec b/releases/weekly/specs/x86/stage2.spec index 99c94e74..67de4d98 100644 --- a/releases/weekly/specs/x86/stage2.spec +++ b/releases/weekly/specs/x86/stage2.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/x86/13.0 snapshot: latest source_subpath: default/stage1-i486-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/releases/weekly/specs/x86/stage3.spec b/releases/weekly/specs/x86/stage3.spec index dbb44c61..18eeb14a 100644 --- a/releases/weekly/specs/x86/stage3.spec +++ b/releases/weekly/specs/x86/stage3.spec @@ -5,4 +5,6 @@ rel_type: default profile: default/linux/x86/13.0 snapshot: latest source_subpath: default/stage2-i486-latest +compression_mode: pixz_x +decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip portage_confdir: @REPO_DIR@/releases/weekly/portage/stages diff --git a/scripts/update_experimental_tree b/scripts/update_experimental_tree new file mode 100755 index 00000000..cb880aa8 --- /dev/null +++ b/scripts/update_experimental_tree @@ -0,0 +1,14 @@ +#!/bin/bash +PORTDIR="/release/trees/portage-experimental/" +TMPREPO=$(mktemp) +trap "rm -f $TMPREPO" EXIT +cat >$f <<EOF +[DEFAULT] +main-repo = gentoo + +[gentoo] +location = $PORTDIR +sync-type = rsync +sync-uri = rsync://rsync.gentoo.org/gentoo-portage +EOF +PORTAGE_REPOSITORIES="$(cat $TMPREPO)" FEATURES="$FEATURES -news" emerge --sync -q diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf index 4dc879a6..674daddd 100644 --- a/tools/catalyst-auto-amd64-experimental.conf +++ b/tools/catalyst-auto-amd64-experimental.conf @@ -69,11 +69,10 @@ pre_build() { post_build() { pushd ${BUILD_SRCDIR_BASE}/default >/dev/null - - mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} fi done if [ -f *${DATESTAMP}*.iso ]; then @@ -82,19 +81,15 @@ post_build() { popd >/dev/null pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null - - mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} fi done - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} fi - - } # vim:ft=sh: diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index ea0a6cea..f8120551 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -9,7 +9,6 @@ source /etc/catalyst/release/build.env SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} -#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux" SETS=" multilib cloud_multilib minimal_multilib nomultilib cloud_nomultilib minimal_nomultilib @@ -81,26 +80,26 @@ pre_build() { post_build() { pushd ${BUILD_SRCDIR_BASE}/default >/dev/null - mkdir -p ${BUILD_DESTDIR_BASE} + mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE} + cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} fi done if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE} + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} fi popd >/dev/null pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null - mkdir -p ${BUILD_DESTDIR_BASE}/hardened + mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/hardened + cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} fi done if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} fi } diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf index 79f310dd..e0deeeef 100644 --- a/tools/catalyst-auto-x86-experimental.conf +++ b/tools/catalyst-auto-x86-experimental.conf @@ -56,30 +56,26 @@ pre_build() { post_build() { pushd ${BUILD_SRCDIR_BASE}/default >/dev/null - - mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} fi done - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP} + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} fi popd >/dev/null pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null - - mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} fi done - if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP} + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} fi } diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index 4d49b8b4..e7c971dc 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -56,26 +56,26 @@ pre_build() { post_build() { pushd ${BUILD_SRCDIR_BASE}/default >/dev/null - mkdir -p ${BUILD_DESTDIR_BASE} + mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE} + cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} fi done if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE} + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP} fi popd >/dev/null pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null - mkdir -p ${BUILD_DESTDIR_BASE}/hardened + mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do if [ -f $file ]; then - cp $file* ${BUILD_DESTDIR_BASE}/hardened + cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} fi done if [ -f *${DATESTAMP}*.iso ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP} fi } |