sig_cloud/sig-cloud-instance-images
5
0
Fork 0
mirror of https://github.com/rocky-linux/sig-cloud-instance-images.git synced 2024-06-01 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix makefile variables

Browse Source
This commit is contained in:
Neil Hanlon 2021-10-27 15:59:31 -04:00
parent a050fbcf32
commit 6be249ec06
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -3,7 +3,7 @@ BUILDDATE = $(shell /bin/date +%Y%m%d_%H%M)
KICKSTART_DIR = kickstarts
KICKSTART_PATH = "${KICKSTART_DIR}/Rocky-8-Container.ks"
LOG_DIR = logs
OUTPUT_DIR = output
OUT = out
RELEASE_VER = 8.4
MAJOR = $(shell v='$(RELEASE_VER)'; echo "$${v%.*}")
TEMPLATE_DIR = templates
@ -52,13 +52,18 @@ $(TARGETIMAGE_META): $(BASEIMAGE_META)
--parameter repository $(CONTAINER_NAME) \
docker | tee -a logs/target_image-$(OUTNAME).out | tail -n4 > $(TARGETIMAGE_META) || exit 3
$(OUTNAME).tar.xz: $(TARGETIMAGE_META) $(OUT)/packages.txt
$(OUT):
mkdir out
$(OUT)/packages.txt: $(OUT) $(TARGETIMAGE_META)
xmllint --xpath "//packages/*/@name" <(printf "$(jq '.icicle' < $(STORAGEDIR)/$(TARGETIMAGEUUID).meta)\n" | tr -d '\\' | tail -c +2 | head -c -2) | \
awk -F\= '{print substr($2,2,length($2)-2)}' | \
sort > $(OUT)/packages.txt
$(OUTNAME).tar.xz: $(OUT)/packages.txt
mkdir out
tar -Oxf $(STORAGEDIR)/$(TARGETIMAGEUUID).body */layer.tar | xz > out/$(OUTNAME).tar.xz
tar -tf out/$(OUTNAME).tar.xz > out/filelist.txt
cp $(STORAGEDIR)/$(TARGETIMAGEUUID).meta out/build.meta
$(OUT)/packages.txt:
xmllint --xpath "//packages/*/@name" <(printf "$(jq '.icicle' < $(STORAGEDIR)/$(TARGETIMAGEUUID).meta)\n" | tr -d '\\' | tail -c +2 | head -c -2) | \
awk -F\= '{print substr($2,2,length($2)-2)}' | \
sort > $(OUT)/packages.txt