Merge branch 'master' of git://git.qubes-os.org/marmarek/template-builder
This commit is contained in:
commit
375d12dcdc
2
Makefile
2
Makefile
@ -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) && \
|
||||||
|
@ -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
|
||||||
|
@ -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}
|
||||||
|
Loading…
Reference in New Issue
Block a user