[cpp-linbuild] 03/06: Make product directories upon platform image build

[John W. O'Brien]

This is an automated email from the git hooks/post-receive script.

obrienjw pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=fa1b3abf0fa5d050a5c940279ea721a42e283e4d

commit fa1b3abf0fa5d050a5c940279ea721a42e283e4d
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Feb 3 19:42:42 2023 +0000

    Make product directories upon platform image build
---
 Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index d02ed61..51a013b 100644
--- a/Makefile
+++ b/Makefile
@@ -172,9 +172,6 @@ PLATFORMS=\
 #	os/$OS/
 #		image/
 #			Dockerfile
-#		products/
-#			RPMS/
-#			SRPMS/
 
 # Platform-specific variables and rules
 
@@ -210,6 +207,7 @@ define prepare-platform
 $(1)_token = $$(srcdir).$(1)_image
 $(1)_products = $(srcdir)os/$(1)/products
 $$($(1)_token): $(srcdir)os/$(1)/image/Dockerfile
+	mkdir -p $$($(1)_products)/{RPMS,SRPMS}
 	@echo "==> Building base Docker image for $(1)"
 	docker build -t shibboleth/$(1):$(BASETAG) $(srcdir)os/$(1)/image
 	touch $$($(1)_token)
@@ -245,7 +243,6 @@ $(foreach platform,$(PLATFORMS),$(foreach component,$(COMPONENTS),$(eval $(call
 define build-component-platform
 $(1)_$(2)_token = $(srcdir).$(1)_$(2)_products
 $$($(1)_$(2)_token): $$($(1)_$(2)_image_token) $(SOURCEDIR)/$$($(1)_DISTFILE) $(SPECDIR)/$$($(1)_COMPNAME).spec
-	mkdir -p $$($(2)_products)/{RPMS,SRPMS}
 	@echo "==> Sanity checking $(1) on $(2)"
 	grep -E "^Version:[[:space:]]+$$($(1)_VERSION)$$$$" $(SPECDIR)/$$($(1)_COMPNAME).spec
 	@echo "==> Building $(1) on $(2)"
@@ -264,7 +261,6 @@ $(foreach platform,$(PLATFORMS),$(foreach component,$(COMPONENTS),$(eval $(call
 define run-container-component-platform
 .PHONY: run_container_$($(1)_COMPNAME)_$(2)
 run_container_$($(1)_COMPNAME)_$(2): $$($(1)_$(2)_image_token) $(SOURCEDIR)/$$($(1)_DISTFILE)
-       mkdir -p $$($(2)_products)/{RPMS,SRPMS}
 	docker run -it --rm \
 		-v $$($(2)_products):/opt/build/external/out:z \
 		-v $(srcdir)common:/opt/build/external/in:z \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.