From fdadd4aff8ff418088bdbd5c9df8e5b0c98e48a9 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 7 Feb 2013 23:29:14 +0100 Subject: [PATCH] fedorize_image: support per-DIST packages.list --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b373ba6..e3cfc4a 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,8 @@ TEMPLATE_NAME := $${DIST/fc/fedora-}-x64 VERSION := $(shell cat version) TIMESTAMP := $(shell date -u +%Y%m%d%H%M) +PKGLISTFILE := $(shell [ -r clean_images/packages_$(DIST).list ] && echo clean_images/packages_$(DIST).list || echo clean_images/packages.list) + help: @echo "make rpms -- generate template rpm" @echo "make update-repo-installer -- copy newly generated rpm to installer repo" @@ -16,7 +18,7 @@ rpms: @echo $(TIMESTAMP) > build_timestamp @echo "Building template: $(TEMPLATE_NAME)" @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 clean_images/packages.list && \ + sudo -E ./fedorize_image fedorized_images/$(TEMPLATE_NAME).img $(PKGLISTFILE) && \ sudo -E ./qubeize_image fedorized_images/$(TEMPLATE_NAME).img $(TEMPLATE_NAME) && \ ./build_template_rpm $(TEMPLATE_NAME) || exit 1; \