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

Move result files version independent directory

Browse Source
This commit is contained in:
Marek Marczykowski 2013-01-26 22:19:09 +01:00
parent d4d4dc7c09
commit da9fe1b076
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ src/*.pyc
src/modules/*.pyc src/modules/*.pyc
installer installer
*~ *~
build/

17
Makefile
View File

@ -39,8 +39,12 @@ LORAXQBS_VERSION := $(call spec_version,lorax-templates-qubes/lorax-templates-qu
PUNGI_OPTS := --nosource --nodebuginfo --nogreedy --all-stages PUNGI_OPTS := --nosource --nodebuginfo --nogreedy --all-stages
ifdef QUBES_RELEASE ifdef QUBES_RELEASE
PUNGI_OPTS += --isfinal --ver="$(QUBES_RELEASE)" ISO_VERSION := $(QUBES_RELEASE)
PUNGI_OPTS += --isfinal
else
ISO_VERSION := $(shell date +%Y%m%d)
endif endif
PUNGI_OPTS += --ver="$(ISO_VERSION)"
help: help:
@echo "make rpms <--- make all rpms and sign them";\ @echo "make rpms <--- make all rpms and sign them";\
@ -118,9 +122,16 @@ update-repo-unstable:
ln -f $(RPMS) ../yum/current-release/unstable/dom0/rpm/ ln -f $(RPMS) ../yum/current-release/unstable/dom0/rpm/
iso: iso:
# TODO? cp rpm_verify /usr/local/bin/ ln -sf `pwd` /tmp/qubes-installer
pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg
# TODO rpm_verify build/work/revisor-install/*/qubes-x86_64/x86_64/os/Packages/*.rpm ./rpm_verify $(ISO_VERSION)/x86_64/os/Packages/*/*.rpm
# Currently netinstall not supported
rm $(ISO_VERSION)/x86_64/iso/*-netinst.iso
# Move result files to known-named directories
mkdir -p build/ISO/qubes-x86_64/iso build/work
mv $(ISO_VERSION)/x86_64/iso/*-DVD.iso build/ISO/qubes-x86_64/iso/
rm -rf build/work/$(ISO_VERSION)
mv $(ISO_VERSION)/x86_64/os build/work/$(ISO_VERSION)
clean-repos: clean-repos:
@echo "--> Removing old rpms from the installer repos..." @echo "--> Removing old rpms from the installer repos..."

2
build/.gitignore vendored
View File

@ -1,2 +0,0 @@
work/
ISO/