From b82a6889d492216a46e75ae8f77a57d907fd62a6 Mon Sep 17 00:00:00 2001 From: Jason Nagin <33561705+JasonN3@users.noreply.github.com> Date: Tue, 31 Dec 2024 13:58:46 -0500 Subject: [PATCH] block broken lorax-40.5.10-1 --- Makefile | 1 - external/Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 704f549..20bc28d 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,6 @@ results/images/boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templat lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \ --isfinal --buildarch=$(ARCH) --volid=$(_VOLID) --sharedir $(PWD)/external/lorax/share/templates.d/99-generic \ - --installpkgs glibc \ $(_LORAX_ARGS) \ $(foreach file,$(_REPO_FILES),--repo $(patsubst repos/%,$(PWD)/repos/%,$(file))) \ $(foreach file,$(_LORAX_TEMPLATES),--add-template $(PWD)/$(file)) \ diff --git a/external/Makefile b/external/Makefile index 74047b1..c0520b4 100644 --- a/external/Makefile +++ b/external/Makefile @@ -1,6 +1,6 @@ lorax/branch-$(VERSION): git config advice.detachedHead false - cd lorax && git reset --hard HEAD && git checkout $(if $(_RHEL),rhel$(word 1,$(subst ., ,$(VERSION)))-branch,tags/$(shell cd lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1)) + cd lorax && git reset --hard HEAD && git checkout $(if $(_RHEL),rhel$(word 1,$(subst ., ,$(VERSION)))-branch,tags/$(shell cd lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | grep -v 'lorax-40.5.10-1' | tail -n 1)) touch lorax/branch-$(VERSION) install-deps: