rename ANABOOTDIR to configdir

This commit is contained in:
Will Woods 2011-08-08 20:35:35 -04:00
parent 905b8f0dd7
commit 058fa13a54
5 changed files with 20 additions and 20 deletions

View File

@ -1,4 +1,4 @@
<%page args="ANABOOTDIR, KERNELDIR, efiarch"/> <%page args="configdir, KERNELDIR, efiarch"/>
<% EFIBOOTDIR="EFI/BOOT" %> <% EFIBOOTDIR="EFI/BOOT" %>
mkdir ${EFIBOOTDIR} mkdir ${EFIBOOTDIR}
@ -21,7 +21,7 @@ ${make_efiboot("images/efiboot.img", include_kernel=False)}
copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR} copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR}
copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR} copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR}
%endif %endif
install ${ANABOOTDIR}/grub.conf ${eficonf} install ${configdir}/grub.conf ${eficonf}
replace @PRODUCT@ ${product.name} ${eficonf} replace @PRODUCT@ ${product.name} ${eficonf}
replace @VERSION@ ${product.version} ${eficonf} replace @VERSION@ ${product.version} ${eficonf}
replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf} replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}

View File

@ -1,13 +1,13 @@
<%page args="kernels, runtime_img, basearch, libdir, inroot, outroot, product"/> <%page args="kernels, runtime_img, basearch, libdir, inroot, outroot, product"/>
<% <%
ANABOOTDIR="tmp/config_files" configdir="tmp/config_files"
BOOTDIR="ppc" BOOTDIR="ppc"
MACDIR=BOOTDIR+"/mac" MACDIR=BOOTDIR+"/mac"
NETBOOTDIR="images/netboot" NETBOOTDIR="images/netboot"
WRAPPER="usr/sbin/wrapper" WRAPPER="usr/sbin/wrapper"
WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper" WRAPPER_DATA="usr/"+libdir+"/kernel-wrapper"
MAPPING=ANABOOTDIR+"/mapping" MAPPING=configdir+"/mapping"
bitsizes = set() bitsizes = set()
prepboot = "" prepboot = ""
@ -17,14 +17,14 @@ mkdir images
install ${runtime_img} images/install.img install ${runtime_img} images/install.img
mkdir ${BOOTDIR} ${BOOTDIR}/chrp etc mkdir ${BOOTDIR} ${BOOTDIR}/chrp etc
install ${ANABOOTDIR}/bootinfo.txt ${BOOTDIR} install ${configdir}/bootinfo.txt ${BOOTDIR}
install boot/efika.forth ${BOOTDIR} install boot/efika.forth ${BOOTDIR}
install usr/lib/yaboot/yaboot ${BOOTDIR}/chrp install usr/lib/yaboot/yaboot ${BOOTDIR}/chrp
## boot dir for PowerMacs ## boot dir for PowerMacs
mkdir ${MACDIR} mkdir ${MACDIR}
install usr/lib/yaboot/yaboot ${MACDIR} install usr/lib/yaboot/yaboot ${MACDIR}
install ${ANABOOTDIR}/ofboot.b ${MACDIR} install ${configdir}/ofboot.b ${MACDIR}
%for kernel in kernels: %for kernel in kernels:
<% <%
@ -34,7 +34,7 @@ install ${ANABOOTDIR}/ofboot.b ${MACDIR}
bitsizes.add(bits) bitsizes.add(bits)
%> %>
mkdir ${KERNELDIR} ${NETBOOTDIR} mkdir ${KERNELDIR} ${NETBOOTDIR}
install ${ANABOOTDIR}/yaboot.conf.in ${KERNELDIR}/yaboot.conf install ${configdir}/yaboot.conf.in ${KERNELDIR}/yaboot.conf
installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz installkernel images-${kernel.arch} ${kernel.path} ${KERNELDIR}/vmlinuz
installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img installinitrd images-${kernel.arch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
@ -62,7 +62,7 @@ runcmd ${inroot}/usr/lib/yaboot/addnote ${outroot}/${BOOTDIR}/chrp/yaboot
## copy yaboot.conf into /etc ## copy yaboot.conf into /etc
%if len(bitsizes) == 2: %if len(bitsizes) == 2:
## magic ppc biarch tree! we need magic ppc biarch config. ## magic ppc biarch tree! we need magic ppc biarch config.
install ${ANABOOTDIR}/yaboot.conf.3264 etc/yaboot.conf install ${configdir}/yaboot.conf.3264 etc/yaboot.conf
replace @PRODUCT@ ${product.name} etc/yaboot.conf replace @PRODUCT@ ${product.name} etc/yaboot.conf
replace @VERSION@ ${product.version} etc/yaboot.conf replace @VERSION@ ${product.version} etc/yaboot.conf
replace @ROOT@ root=live:CDLABEL=PBOOT etc/yaboot.conf replace @ROOT@ root=live:CDLABEL=PBOOT etc/yaboot.conf

View File

@ -1,6 +1,6 @@
<%page args="kernels, runtime_img, basearch, outroot"/> <%page args="kernels, runtime_img, basearch, outroot"/>
<% <%
ANABOOTDIR="tmp/config_files" configdir="tmp/config_files"
BOOTDIR="images" BOOTDIR="images"
KERNELDIR=BOOTDIR KERNELDIR=BOOTDIR
INITRD_ADDRESS="0x02000000" INITRD_ADDRESS="0x02000000"
@ -12,9 +12,9 @@ kernel = kernels[0]
mkdir images mkdir images
install ${runtime_img} images install ${runtime_img} images
install ${ANABOOTDIR}/redhat.exec ${BOOTDIR} install ${configdir}/redhat.exec ${BOOTDIR}
install ${ANABOOTDIR}/generic.prm ${BOOTDIR} install ${configdir}/generic.prm ${BOOTDIR}
install ${ANABOOTDIR}/generic.ins . install ${configdir}/generic.ins .
replace @INITRD_LOAD_ADDRESS@ ${INITRD_ADDRESS} generic.ins replace @INITRD_LOAD_ADDRESS@ ${INITRD_ADDRESS} generic.ins

View File

@ -1,6 +1,6 @@
<%page args="kernels, runtime_img, basearch, outroot, product"/> <%page args="kernels, runtime_img, basearch, outroot, product"/>
<% <%
ANABOOTDIR="tmp/config_files" configdir="tmp/config_files"
BOOTDIR="boot" BOOTDIR="boot"
KERNELDIR=BOOTDIR KERNELDIR=BOOTDIR
%> %>
@ -9,8 +9,8 @@ mkdir images
install ${runtime_img} images/install.img install ${runtime_img} images/install.img
install boot/*.b ${BOOTDIR} install boot/*.b ${BOOTDIR}
install ${ANABOOTDIR}/silo.conf ${BOOTDIR} install ${configdir}/silo.conf ${BOOTDIR}
install ${ANABOOTDIR}/boot.msg.sparc ${BOOTDIR}/boot.msg install ${configdir}/boot.msg.sparc ${BOOTDIR}/boot.msg
replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg
replace @PRODUCT@ ${product.name} ${BOOTDIR}/boot.msg replace @PRODUCT@ ${product.name} ${BOOTDIR}/boot.msg

View File

@ -1,6 +1,6 @@
<%page args="kernels, runtime_img, basearch, outroot, product"/> <%page args="kernels, runtime_img, basearch, outroot, product"/>
<% <%
ANABOOTDIR="tmp/config_files" configdir="tmp/config_files"
SYSLINUXDIR="usr/share/syslinux" SYSLINUXDIR="usr/share/syslinux"
PXEBOOTDIR="images/pxeboot" PXEBOOTDIR="images/pxeboot"
BOOTDIR="isolinux" BOOTDIR="isolinux"
@ -12,11 +12,11 @@ install ${runtime_img} images/install.img
mkdir ${BOOTDIR} ${KERNELDIR} mkdir ${BOOTDIR} ${KERNELDIR}
install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR} install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR}
install ${ANABOOTDIR}/syslinux.cfg ${BOOTDIR}/isolinux.cfg install ${configdir}/syslinux.cfg ${BOOTDIR}/isolinux.cfg
install usr/share/anaconda/boot/syslinux-vesa-splash.jpg ${BOOTDIR}/splash.jpg install usr/share/anaconda/boot/syslinux-vesa-splash.jpg ${BOOTDIR}/splash.jpg
install ${ANABOOTDIR}/boot.msg.x86 ${BOOTDIR}/boot.msg install ${configdir}/boot.msg.x86 ${BOOTDIR}/boot.msg
install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR} install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR}
install ${ANABOOTDIR}/grub.conf ${BOOTDIR} install ${configdir}/grub.conf ${BOOTDIR}
replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
replace @PRODUCT@ ${product.name} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg replace @PRODUCT@ ${product.name} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
@ -56,7 +56,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
efiargs="-eltorito-alt-boot -e images/efiboot.img -no-emul-boot" efiargs="-eltorito-alt-boot -e images/efiboot.img -no-emul-boot"
efigraft="EFI/BOOT={0}/EFI/BOOT images/efiboot.img={0}/images/efiboot.img".format(outroot) efigraft="EFI/BOOT={0}/EFI/BOOT images/efiboot.img={0}/images/efiboot.img".format(outroot)
%> %>
<%include file="efi.tmpl" args="ANABOOTDIR=ANABOOTDIR, KERNELDIR=KERNELDIR, efiarch=efiarch"/> <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch"/>
%endif %endif
runcmd mkisofs -o ${outroot}/images/boot.iso \ runcmd mkisofs -o ${outroot}/images/boot.iso \