arch templates: install runtime to /images/, put it on boot.iso

make sure the arch templates (s390 excluded) copy the runtime image in
to the /images/ dir, and make sure it gets grafted/copied into the
boot.iso.
This commit is contained in:
Will Woods 2011-06-22 20:22:24 -04:00
parent eda011a49c
commit 5eb6c9b12f
4 changed files with 16 additions and 1 deletions

View File

@ -15,6 +15,9 @@ prepboot = ""
macboot = "" macboot = ""
%> %>
mkdir images
install ${runtime} images
mkdir ${BOOTDIR} ${BOOTDIR}/chrp etc mkdir ${BOOTDIR} ${BOOTDIR}/chrp etc
install ${ANABOOTDIR}/bootinfo.txt ${BOOTDIR} install ${ANABOOTDIR}/bootinfo.txt ${BOOTDIR}
install boot/efika.forth ${BOOTDIR} install boot/efika.forth ${BOOTDIR}
@ -84,6 +87,7 @@ runcmd usr/lib/yaboot/addnote ${outroot}/${BOOTDIR}/chrp/yaboot
mkdir isopath mkdir isopath
copy ${BOOTDIR} isopath copy ${BOOTDIR} isopath
copy etc isopath copy etc isopath
copy images isopath
runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \ runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \
${prepboot} -part -hfs -T -r -l -J \ ${prepboot} -part -hfs -T -r -l -J \
-A "${product.name} ${product.version}" -sysid PPC -V "PBOOT" \ -A "${product.name} ${product.version}" -sysid PPC -V "PBOOT" \

View File

@ -8,6 +8,9 @@ MKCDBOOT="usr/libexec/anaconda/mk-s390-cdboot"
kernel = kernels[0] kernel = kernels[0]
%> %>
mkdir images
install ${runtime} images
install ${ANABOOTDIR}/redhat.exec ${BOOTDIR} install ${ANABOOTDIR}/redhat.exec ${BOOTDIR}
install ${ANABOOTDIR}/generic.prm ${BOOTDIR} install ${ANABOOTDIR}/generic.prm ${BOOTDIR}
install ${ANABOOTDIR}/generic.ins . install ${ANABOOTDIR}/generic.ins .

View File

@ -4,6 +4,9 @@ BOOTDIR="boot"
KERNELDIR=BOOTDIR KERNELDIR=BOOTDIR
%> %>
mkdir images
install ${runtime} images
install boot/*.b ${BOOTDIR} install boot/*.b ${BOOTDIR}
install ${ANABOOTDIR}/silo.conf ${BOOTDIR} install ${ANABOOTDIR}/silo.conf ${BOOTDIR}
install ${ANABOOTDIR}/boot.msg ${BOOTDIR}/boot.msg install ${ANABOOTDIR}/boot.msg ${BOOTDIR}/boot.msg
@ -22,5 +25,6 @@ runcmd mkisofs -R -J -T -G /${BOOTDIR}/isofs.b -B ... \
-x Fedora -x repodata \ -x Fedora -x repodata \
-sparc-label "${product.name} ${product.version} Boot Disc" \ -sparc-label "${product.name} ${product.version} Boot Disc" \
-o ${outroot}/images/boot.iso \ -o ${outroot}/images/boot.iso \
-graft-points boot=${BOOTDIR} -graft-points boot=${outroot}/${BOOTDIR} \
${runtime}=${outroot}/${runtime}
treeinfo images-${basearch} boot.iso images/boot.iso treeinfo images-${basearch} boot.iso images/boot.iso

View File

@ -6,6 +6,9 @@ BOOTDIR="isolinux"
KERNELDIR=PXEBOOTDIR KERNELDIR=PXEBOOTDIR
%> %>
mkdir images
install ${runtime} images
mkdir ${BOOTDIR} ${KERNELDIR} mkdir ${BOOTDIR} ${KERNELDIR}
install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR} install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR}
install ${ANABOOTDIR}/syslinux.cfg ${BOOTDIR}/isolinux.cfg install ${ANABOOTDIR}/syslinux.cfg ${BOOTDIR}/isolinux.cfg
@ -63,6 +66,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso \
${efiargs} -R -J -V '${product.name}' -T -graft-points \ ${efiargs} -R -J -V '${product.name}' -T -graft-points \
${BOOTDIR}=${outroot}/${BOOTDIR} \ ${BOOTDIR}=${outroot}/${BOOTDIR} \
${KERNELDIR}=${outroot}/${KERNELDIR} \ ${KERNELDIR}=${outroot}/${KERNELDIR} \
${runtime}=${outroot}/${runtime} \
${efigraft} ${efigraft}
runcmd isohybrid ${outroot}/images/boot.iso runcmd isohybrid ${outroot}/images/boot.iso
treeinfo images-${basearch} boot.iso images/boot.iso treeinfo images-${basearch} boot.iso images/boot.iso