QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefile: Fix building many different template rpm packages at the same time

Browse Source 
Store build_timestamp for each built template to not mix them up in
update-repo-installer.
This commit is contained in:
Marek Marczykowski 2013-02-24 13:33:57 +01:00
parent 0e6af81d0f
commit 99e9e0351d
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -15,7 +15,7 @@ help:
rpms: rpms:
@echo $(TIMESTAMP) > build_timestamp @echo $(TIMESTAMP) > build_timestamp_$(DIST)
@echo "Building template: $(TEMPLATE_NAME)" @echo "Building template: $(TEMPLATE_NAME)"
@createrepo -q -g $$PWD/comps-qubes-template.xml yum_repo_qubes/$(DIST) -o yum_repo_qubes/$(DIST) && \ @createrepo -q -g $$PWD/comps-qubes-template.xml yum_repo_qubes/$(DIST) -o yum_repo_qubes/$(DIST) && \
sudo -E ./fedorize_image fedorized_images/$(TEMPLATE_NAME).img $(PKGLISTFILE) && \ sudo -E ./fedorize_image fedorized_images/$(TEMPLATE_NAME).img $(PKGLISTFILE) && \

1
build_template_rpm
View File

@ -8,6 +8,7 @@ fi
rpmbuild --target noarch \ rpmbuild --target noarch \
--define "template_name $NAME" \ --define "template_name $NAME" \
--define "DIST $DIST" \
--define "_topdir $PWD/rpmbuild" \ --define "_topdir $PWD/rpmbuild" \
--define "_tmppath $PWD/rpmbuild/tmp" \ --define "_tmppath $PWD/rpmbuild/tmp" \
-bb templates.spec -bb templates.spec

2
templates.spec
View File

@ -4,7 +4,7 @@
# #
%{!?version: %define version %(cat version)} %{!?version: %define version %(cat version)}
%{!?rel: %define rel %(cat build_timestamp)} %{!?rel: %define rel %(cat build_timestamp_%{DIST})}
Name: qubes-template-%{template_name} Name: qubes-template-%{template_name}
Version: %{version} Version: %{version}