improve el make

ctc-oss · Dec 30, 2024 · b3e9c06 · b3e9c06
1 parent e258416
commit b3e9c06
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -25,6 +25,7 @@ NC=\033[0m # No Color
 
 VERSION ?= $(shell sed -n 's/^Version: *//p' fapolicy-analyzer.spec)
 fc      ?= rawhide
+el      ?= 9
 
 # List the common developer targets
 list:
@@ -144,15 +145,15 @@ build-info:
 fc-rpm:
 	@echo -e "${GRN}--- Fedora $(fc) RPM generation v${VERSION}...${NC}"
 	make -f .copr/Makefile vendor OS_ID=fedora VERSION=${VERSION}
-	podman build -t fapolicy-analyzer:build --target fedorabuild --build-arg version=${VERSION} -f Containerfile .
-	podman run --privileged --rm -it -v /tmp:/v fapolicy-analyzer:build fedora-$(fc)-x86_64 /v
+	podman build -t fapolicy-analyzer:build-fc$(fc) --target fedorabuild --build-arg version=${VERSION} -f Containerfile .
+	podman run --privileged --rm -it -v /tmp:/v fapolicy-analyzer:build-fc$(fc) fedora-$(fc)-x86_64 /v
 
 # Generate RHEL 9 rpms
-el9-rpm:
-	@echo -e "${GRN}--- el9 RPM generation v${VERSION}...${NC}"
-	make -f .copr/Makefile vendor vendor-rs OS_ID=rhel VERSION=${VERSION} DIST=.el9 spec=scripts/srpm/fapolicy-analyzer.el9.spec
-	podman build -t fapolicy-analyzer:build --target elbuild --build-arg version=${VERSION} --build-arg spec=scripts/srpm/fapolicy-analyzer.el9.spec -f Containerfile .
-	podman run --privileged --rm -it -v /tmp:/v fapolicy-analyzer:build rocky+epel-9-x86_64 /v
+el-rpm:
+	@echo -e "${GRN}--- el$(el) RPM generation v${VERSION}...${NC}"
+	make -f .copr/Makefile vendor vendor-rs OS_ID=rhel VERSION=${VERSION} DIST=.el$(el) spec=scripts/srpm/fapolicy-analyzer.el$(el).spec
+	podman build -t fapolicy-analyzer:build-el$(el) --target elbuild --build-arg version=${VERSION} --build-arg spec=scripts/srpm/fapolicy-analyzer.el$(el).spec -f Containerfile .
+	podman run --privileged --rm -it -v /tmp:/v fapolicy-analyzer:build-el$(el) rocky+epel-$(el)-x86_64 /v
 
 # Update embedded help documentation
 help-docs: