QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lorax: do not build boot.iso (#706)

Browse Source
This commit is contained in:
Marek Marczykowski 2013-02-25 01:01:37 +01:00
parent aa32ce9e70
commit 0d7c04bd53
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -139,8 +139,6 @@ iso:
mkdir -p work mkdir -p work
pushd work && pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg && popd pushd work && pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg && popd
./rpm_verify work/$(ISO_VERSION)/x86_64/os/Packages/*/*.rpm ./rpm_verify work/$(ISO_VERSION)/x86_64/os/Packages/*/*.rpm
# Currently netinstall not supported
rm work/$(ISO_VERSION)/x86_64/iso/*-netinst.iso
# Move result files to known-named directories # Move result files to known-named directories
mkdir -p build/ISO/qubes-x86_64/iso build/work mkdir -p build/ISO/qubes-x86_64/iso build/work
mv work/$(ISO_VERSION)/x86_64/iso/*-DVD.iso build/ISO/qubes-x86_64/iso/ mv work/$(ISO_VERSION)/x86_64/iso/*-DVD.iso build/ISO/qubes-x86_64/iso/

22
lorax-templates-qubes/templates/x86.tmpl
View File

@ -80,14 +80,14 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
<%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/> <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/>
%endif %endif
## make boot.iso ## ## make boot.iso
runcmd mkisofs -o ${outroot}/images/boot.iso \ ## runcmd mkisofs -o ${outroot}/images/boot.iso \
-b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \ ## -b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \
-boot-load-size 4 -boot-info-table -no-emul-boot \ ## -boot-load-size 4 -boot-info-table -no-emul-boot \
${efiargs} -R -J -V '${isolabel}' -T -graft-points \ ## ${efiargs} -R -J -V '${isolabel}' -T -graft-points \
${BOOTDIR}=${outroot}/${BOOTDIR} \ ## ${BOOTDIR}=${outroot}/${BOOTDIR} \
${KERNELDIR}=${outroot}/${KERNELDIR} \ ## ${KERNELDIR}=${outroot}/${KERNELDIR} \
${LIVEDIR}=${outroot}/${LIVEDIR} \ ## ${LIVEDIR}=${outroot}/${LIVEDIR} \
${efigraft} ## ${efigraft}
runcmd isohybrid ${efihybrid} ${outroot}/images/boot.iso ## runcmd isohybrid ${efihybrid} ${outroot}/images/boot.iso
treeinfo images-${basearch} boot.iso images/boot.iso ## treeinfo images-${basearch} boot.iso images/boot.iso