installer-qubes-os Makefile has incorrect kickstart path for iso-liveusb

[matthazinski]

Qubes OS version (e.g., R3.1):

qubes-builder HEAD (4c063dfd27c30ae280c6b3f3842e14204cf81cb0)

Affected TemplateVMs (e.g., fedora-23, if applicable):

N/A

---

Expected behavior:

With ISO_INSTALLER=0 and ISO_LIVEUSB=1 are set in builder.conf, make iso should result in a working live ISO.

Actual behavior:

It can't find the Kickstart file because there's an extra "../" prepended to the --config parameter of livecd-creator-qubes

[matt@localhost qubes-builder]$ make iso
-> Preparing for ISO build...
--> Removing old rpms from the installer repos...
---> Cleaning up repo: dom0-updates...
---> Cleaning up repo: installer...
---> Cleaning up repo: qubes-dom0...
--> Copying RPMs from individual repos...
-> Building installer-qubes-os iso for fc23 (logfile: build-logs/installer-qubes-os-iso-fc23.log)...
--> build failed!
make[1]: Entering directory '/home/user/qubes-src/installer-qubes-os'
ln -nsf `pwd` /tmp/qubes-installer
createrepo -q -g ../../conf/comps-qubes.xml --update yum/qubes-dom0
mkdir -p work
pushd work && ../livecd-creator-qubes --debug --product='Qubes OS' --title="Qubes OS 20160922" --fslabel="Qubes-20160922-x86_64-LIVE" --config ..//home/user/qubes-src/installer-qubes-os/conf/liveusb.ks && popd
/home/user/qubes-src/installer-qubes-os/work /home/user/qubes-src/installer-qubes-os
Kickstart file must be provided
Makefile:69: recipe for target 'iso-liveusb' failed
make[1]: *** [iso-liveusb] Error 2
make[1]: Leaving directory '/home/user/qubes-src/installer-qubes-os'
Makefile:449: recipe for target 'iso' failed
make: *** [iso] Error 1

Steps to reproduce the behavior:

Follow the instructions here: #1970

General notes:

Changing the iso-liveusb target to this fixed it for me:

[matt@localhost qubes-builder]$ cat qubes-src/installer-qubes-os/Makefile | grep -A7 ^iso-liveusb
iso-liveusb: $(LIVE_KICKSTART) iso-prepare
    mkdir -p work
    pushd work && ../livecd-creator-qubes --debug --product='Qubes OS' --title="Qubes OS $(ISO_VERSION)" --fslabel="Qubes-$(ISO_VERSION)-x86_64-LIVE" --config $< && popd
    # Move result files to known-named directories
    mkdir -p build/ISO/qubes-x86_64/iso build/work
    mv work/*.iso build/ISO/qubes-x86_64/iso/
    chown --reference=Makefile -R build yum
    rm -rf work

---

Related issues:

[marmarek]

Fixed in QubesOS/qubes-installer-qubes-os#7

[marmarek]

Fixed in QubesOS/qubes-installer-qubes-os#7