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

iso build: keep intermediate files in "work" dir and clean it up

Browse Source 
Also take care to set right owner of result files.

Commend about method: pungi have --destdir option, but apparently it
break whole build process. So change directory just before build
This commit is contained in:
Marek Marczykowski 2013-02-19 22:33:03 +01:00
parent 62252c5a3c
commit ac856cca70
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -136,15 +136,18 @@ update-repo-unstable:
iso: iso:
ln -sf `pwd` /tmp/qubes-installer ln -sf `pwd` /tmp/qubes-installer
pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg mkdir -p work
./rpm_verify $(ISO_VERSION)/x86_64/os/Packages/*/*.rpm pushd work; pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg; popd
./rpm_verify work/$(ISO_VERSION)/x86_64/os/Packages/*/*.rpm
# Currently netinstall not supported # Currently netinstall not supported
rm $(ISO_VERSION)/x86_64/iso/*-netinst.iso 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 $(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/
rm -rf build/work/$(ISO_VERSION) rm -rf build/work/$(ISO_VERSION)
mv $(ISO_VERSION)/x86_64/os build/work/$(ISO_VERSION) mv work/$(ISO_VERSION)/x86_64/os build/work/$(ISO_VERSION)
chown --reference=Makefile -R build
rm -rf work
clean-repos: clean-repos:
@echo "--> Removing old rpms from the installer repos..." @echo "--> Removing old rpms from the installer repos..."