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

make: set release version based on RELEASE variable, default to test-build (#668)

Browse Source
This commit is contained in:
Marek Marczykowski 2012-11-13 05:18:13 +01:00
parent 59fa0dd599
commit 34b3d281c8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -37,6 +37,11 @@ QBSLOGOS_VERSION := $(call spec_version,qubes-logos/qubes-logos.spec)
QBSRELEASE_VERSION := $(call spec_version,qubes-release/qubes-release.spec) QBSRELEASE_VERSION := $(call spec_version,qubes-release/qubes-release.spec)
REVISOR_VERSION := $(call spec_version,revisor/revisor.spec) REVISOR_VERSION := $(call spec_version,revisor/revisor.spec)
REVISOR_OPTS := --install-dvd
ifdef RELEASE
REVISOR_OPTS += --product-version="$(RELEASE)"
endif
help: help:
@echo "make rpms <--- make all rpms and sign them";\ @echo "make rpms <--- make all rpms and sign them";\
echo "make rpms_anaconda <--- create binary rpms for Anaconda"; \ echo "make rpms_anaconda <--- create binary rpms for Anaconda"; \
@ -98,9 +103,9 @@ update-repo:
iso: iso:
cp rpm_verify /usr/local/bin/ cp rpm_verify /usr/local/bin/
ln -sf `pwd` /tmp/qubes-installer ln -sf `pwd` /tmp/qubes-installer
revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 --install-dvd revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 $(REVISOR_OPTS)
isohybrid build/ISO/qubes-x86_64/iso/*.iso isohybrid build/ISO/qubes-x86_64/iso/*.iso
rpm_verify build/work/revisor-install/R?*/qubes-x86_64/x86_64/os/Packages/*.rpm rpm_verify build/work/revisor-install/*/qubes-x86_64/x86_64/os/Packages/*.rpm
clean: clean:
rm -fr rpm/SOURCES/*.bz2 rm -fr rpm/SOURCES/*.bz2

2
conf/qubes-install.conf
View File

@ -31,7 +31,7 @@ product_name = Qubes
product_path = Packages product_path = Packages
iso_basename = Qubes iso_basename = Qubes
iso_label = Qubes iso_label = Qubes
version = R2-Alpha1-2 version = test-build
version_from = F13 version_from = F13
comps_filter = 0 comps_filter = 0
revisor_comps = 1 revisor_comps = 1