openstack
/
ironic-python-agent-builder
Code Issues Proposed changes

Make sure we can create tinyipa isos 

Verify we're able to build a tinyipa iso.

- use bash in build-iso script
- account for filenames with branch names in them
- Fix isolinux.bin path
The correct location is now under bios/core
[...]/syslinux-6.03$ find . -name "isolinux.bin"
./bios/core/isolinux.bin

Change-Id: Idce5d81ce83df121e521b7d26fd6523a378a0585
This commit is contained in:
Riccardo Pittau 2021-02-19 14:54:23 +01:00
parent 0401dcf5ca
commit 2f4f0320a4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ipa-build-tinyipa-image/tasks/main.yaml
View File

@ -1,5 +1,5 @@
- name: Build a TinyIPA image - name: Build a TinyIPA image
command: make command: make all
args: args:
chdir: '{{ tinyipa_dir }}' chdir: '{{ tinyipa_dir }}'
environment: environment:

12
tinyipa/build-iso.sh
View File

@ -1,18 +1,20 @@
#!/bin/sh #!/bin/bash
set -ex set -ex
WORKDIR=$(readlink -f $0 | xargs dirname) WORKDIR=$(readlink -f $0 | xargs dirname)
SYSLINUX_VERSION="6.03" SYSLINUX_VERSION="6.03"
SYSLINUX_URL="https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-${SYSLINUX_VERSION}.tar.gz" SYSLINUX_URL="https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-${SYSLINUX_VERSION}.tar.gz"
cd $WORKDIR/build_files source ${WORKDIR}/common.sh
cd ${WORKDIR}/build_files
wget -N $SYSLINUX_URL && tar zxf syslinux-${SYSLINUX_VERSION}.tar.gz wget -N $SYSLINUX_URL && tar zxf syslinux-${SYSLINUX_VERSION}.tar.gz
cd $WORKDIR cd $WORKDIR
rm -rf newiso rm -rf newiso
mkdir -p newiso/boot/isolinux mkdir -p newiso/boot/isolinux
cp build_files/syslinux-${SYSLINUX_VERSION}/core/isolinux.bin newiso/boot/isolinux/. cp build_files/syslinux-${SYSLINUX_VERSION}/bios/core/isolinux.bin newiso/boot/isolinux/.
cp build_files/isolinux.cfg newiso/boot/isolinux/. cp build_files/isolinux.cfg newiso/boot/isolinux/.
cp tinyipa.gz newiso/boot/corepure64.gz cp tinyipa${BRANCH_EXT}.gz newiso/boot/corepure64.gz
cp tinyipa.vmlinuz newiso/boot/vmlinuz64 cp tinyipa${BRANCH_EXT}.vmlinuz newiso/boot/vmlinuz64
genisoimage -l -r -J -R -V TC-custom -no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -o tinyipa.iso newiso genisoimage -l -r -J -R -V TC-custom -no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -o tinyipa.iso newiso