diff --git a/releases/specs-qemu/alpha/installcd-stage2-minimal.spec b/releases/specs-qemu/alpha/installcd-stage2-minimal.spec index e0437a95..d5cf9e98 100644 --- a/releases/specs-qemu/alpha/installcd-stage2-minimal.spec +++ b/releases/specs-qemu/alpha/installcd-stage2-minimal.spec @@ -54,6 +54,7 @@ livecd/unmerge: app-admin/perl-cleaner app-admin/python-updater app-arch/cpio + dev-build/libtool dev-libs/gmp dev-libs/libxml2 dev-libs/mpfr @@ -85,7 +86,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 diff --git a/releases/specs-qemu/hppa/installcd-stage2-minimal.spec b/releases/specs-qemu/hppa/installcd-stage2-minimal.spec index 7b4404d8..d0389be0 100644 --- a/releases/specs-qemu/hppa/installcd-stage2-minimal.spec +++ b/releases/specs-qemu/hppa/installcd-stage2-minimal.spec @@ -74,6 +74,7 @@ livecd/unmerge: app-text/opensp app-text/po4a app-text/sgml-common + dev-build/libtool dev-libs/elfutils dev-libs/eventlog dev-libs/libassuan @@ -117,7 +118,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 @@ -126,7 +126,7 @@ livecd/unmerge: sys-libs/db sys-libs/gdbm sys-libs/cracklib - x11-misc/shared-mime-info + x11-misc/shared-mime-info livecd/empty: /boot diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec index e1db885d..da95f28c 100644 --- a/releases/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/specs/amd64/hardened/admincd-stage2.spec @@ -27,6 +27,7 @@ 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 @@ -56,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 diff --git a/releases/specs/amd64/installcd-stage2-minimal.spec b/releases/specs/amd64/installcd-stage2-minimal.spec index 8b6e54f6..b08f5927 100644 --- a/releases/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/specs/amd64/installcd-stage2-minimal.spec @@ -27,6 +27,7 @@ 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 @@ -57,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 diff --git a/releases/specs/arm64/installcd-stage2-minimal.spec b/releases/specs/arm64/installcd-stage2-minimal.spec index f55be2fe..9f295859 100644 --- a/releases/specs/arm64/installcd-stage2-minimal.spec +++ b/releases/specs/arm64/installcd-stage2-minimal.spec @@ -27,6 +27,7 @@ livecd/unmerge: app-admin/perl-cleaner app-admin/python-updater app-arch/cpio + dev-build/libtool dev-libs/gmp dev-libs/libxml2 dev-libs/mpfr @@ -55,7 +56,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 diff --git a/releases/specs/hppa/installcd-stage2-minimal.spec b/releases/specs/hppa/installcd-stage2-minimal.spec index 649b00df..46396d17 100644 --- a/releases/specs/hppa/installcd-stage2-minimal.spec +++ b/releases/specs/hppa/installcd-stage2-minimal.spec @@ -65,6 +65,7 @@ livecd/unmerge: app-crypt/gnupg app-crypt/pinentry app-portage/portage-utils + dev-build/libtool dev-libs/gmp app-text/build-docbook-catalog app-text/docbook-xml-dtd @@ -116,7 +117,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 diff --git a/releases/specs/ia64/installcd-stage2-minimal.spec b/releases/specs/ia64/installcd-stage2-minimal.spec index 4cc4d5fe..ca48cb36 100644 --- a/releases/specs/ia64/installcd-stage2-minimal.spec +++ b/releases/specs/ia64/installcd-stage2-minimal.spec @@ -36,6 +36,7 @@ livecd/unmerge: app-admin/perl-cleaner app-admin/python-updater app-arch/cpio + dev-build/libtool dev-libs/gmp dev-libs/libxml2 dev-libs/mpfr @@ -65,7 +66,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 diff --git a/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec index 9f8f591b..c25f551e 100644 --- a/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec +++ b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec @@ -8,7 +8,7 @@ source_subpath: 23.0-default/livecd-stage1-ppc-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/isos livecd/bootargs: scandelay=10 -livecd/fstype: squashfs +livecd/fstype: squashfs livecd/gk_mainargs: --makeopts=-j12 livecd/iso: /var/tmp/catalyst/builds/23.0-default/install-powerpc-minimal-@TIMESTAMP@.iso livecd/type: gentoo-release-minimal @@ -73,6 +73,7 @@ livecd/unmerge: app-admin/perl-cleaner app-admin/python-updater app-arch/cpio + dev-build/libtool dev-libs/gmp dev-libs/libxml2 dev-libs/mpfr @@ -102,7 +103,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 diff --git a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec index adef9670..748da0b3 100644 --- a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec +++ b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec @@ -8,7 +8,7 @@ source_subpath: 23.0-default/livecd-stage1-ppc64le-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/isos livecd/bootargs: dokeymap -livecd/fstype: squashfs +livecd/fstype: squashfs livecd/gk_mainargs: --makeopts=-j12 --all-ramdisk-modules livecd/iso: install-ppc64le-minimal-@TIMESTAMP@.iso livecd/type: gentoo-release-minimal @@ -36,6 +36,7 @@ livecd/unmerge: app-admin/perl-cleaner app-admin/python-updater app-arch/cpio + dev-build/libtool dev-libs/gmp dev-libs/libxml2 dev-libs/mpfr @@ -64,7 +65,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 diff --git a/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec index 9b2652a7..4d11d762 100644 --- a/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec +++ b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec @@ -27,6 +27,7 @@ livecd/unmerge: app-admin/perl-cleaner app-admin/python-updater app-arch/cpio + dev-build/libtool dev-libs/gmp dev-libs/libxml2 dev-libs/mpfr @@ -55,7 +56,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 diff --git a/releases/specs/x86/hardened/admincd-stage2-openrc.spec b/releases/specs/x86/hardened/admincd-stage2-openrc.spec index 487c2808..b91bc61e 100644 --- a/releases/specs/x86/hardened/admincd-stage2-openrc.spec +++ b/releases/specs/x86/hardened/admincd-stage2-openrc.spec @@ -27,6 +27,7 @@ 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 @@ -56,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 diff --git a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec index c2d15b4d..2e03a942 100644 --- a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec +++ b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec @@ -28,6 +28,7 @@ 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 @@ -57,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