commit:     ffa0eae5182160fbab4b66d7bb254de275441397
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 20:13:40 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 20:13:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=ffa0eae5

specs/{amd64,x86}/installcd-minimal-stage2.spec: comment out cdtar

As of catalyst-3.0.2, with USE=system-bootloader we can omit cdtar from
livecd-stage2 specs and catalyst will generate the required bootloader
files.  This gives us an updated isolinux & memtest86+, and also adds
UEFI grub for amd64.

 releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 2 +-
 releases/weekly/specs/x86/installcd-stage2-minimal.spec   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec 
b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index 86a00770..c9a5a3a9 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/share/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/iso: install-amd64-minimal-latest.iso
 livecd/type: gentoo-release-minimal

diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec 
b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
index add94bba..dce76d08 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/share/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/iso: install-x86-minimal-latest.iso
 livecd/type: gentoo-release-minimal

Reply via email to