From 829b4f68f43c8e65ebf59b2033cf04a83821aca1 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 25 Apr 2026 03:05:37 +0700 Subject: [PATCH 1/2] Add install Makefile target --- mk/repo.mk | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/mk/repo.mk b/mk/repo.mk index 93d96d933..c4f89ec90 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -228,6 +228,38 @@ ucrp.%: $(FSTOOLS_TAG) FORCE $(MAKE) ucr.$*,--with-package-deps $(MAKE) p.$* +ifeq ($(HOSTED_REDOX),1) +DESTDIR?=/ + +# Install all recipes specified by the filesystem config +install: + $(REPO_BIN) push $(COOKBOOK_OPTS) --with-package-deps "--sysroot=$(DESTDIR)" + +# Rebuild and install all recipes specified by the filesystem config +rebuild-install: $(FSTOOLS_TAG) FORCE + rm -f $(REPO_TAG) + $(MAKE) repo + $(MAKE) install + +i.%: $(FSTOOLS_TAG) FORCE + $(REPO_BIN) push $(COOKBOOK_OPTS) --with-package-deps "--sysroot=$(DESTDIR)" + +# Invoke repo.sh and install for one of more targets separated by comma +ri.%: $(FSTOOLS_TAG) FORCE + $(MAKE) r.$*,--with-package-deps + $(MAKE) i.$* + +# Invoke clean, repo.sh and install for one of more targets separated by comma +cri.%: $(FSTOOLS_TAG) FORCE + $(MAKE) cr.$*,--with-package-deps + $(MAKE) i.$* + +# Invoke unfetch. clean, repo.sh and install for one of more targets separated by comma +ucri.%: $(FSTOOLS_TAG) FORCE + $(MAKE) ucr.$*,--with-package-deps + $(MAKE) i.$* +endif + export DEBUG_BIN?= # Debug a statically linked program with gdbgui, for example: debug.drivers-initfs DEBUG_BIN=pcid From adeb668e3faced603dab9e79ad9097502a748e99 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 25 Apr 2026 03:06:37 +0700 Subject: [PATCH 2/2] Rename repo.sh comments --- mk/repo.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mk/repo.mk b/mk/repo.mk index c4f89ec90..1a0a7857f 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -176,7 +176,7 @@ else $(REPO_BIN) unfetch $(foreach f,$(subst $(comma), ,$*),$(f)) endif -# Invoke clean, and repo.sh for one of more targets separated by comma +# Invoke clean, and rebuild for one of more targets separated by comma cr.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ @@ -185,7 +185,7 @@ else $(MAKE) r.$* endif -# Invoke unfetch, clean, and repo.sh for one or more targets separated by comma +# Invoke unfetch, clean, and rebuild for one or more targets separated by comma ucr.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ @@ -212,18 +212,18 @@ else $(MAKE) f.$* endif -# Invoke repo.sh and push for one of more targets separated by comma +# Invoke rebuild and push for one of more targets separated by comma # Don't use podman here, as the p target cannot mount inside podman rp.%: $(FSTOOLS_TAG) FORCE $(MAKE) r.$*,--with-package-deps $(MAKE) p.$* -# Invoke clean, repo.sh and push for one of more targets separated by comma +# Invoke clean, rebuild and push for one of more targets separated by comma crp.%: $(FSTOOLS_TAG) FORCE $(MAKE) cr.$*,--with-package-deps $(MAKE) p.$* -# Invoke unfetch. clean, repo.sh and push for one of more targets separated by comma +# Invoke unfetch. clean, rebuild and push for one of more targets separated by comma ucrp.%: $(FSTOOLS_TAG) FORCE $(MAKE) ucr.$*,--with-package-deps $(MAKE) p.$* @@ -244,17 +244,17 @@ rebuild-install: $(FSTOOLS_TAG) FORCE i.%: $(FSTOOLS_TAG) FORCE $(REPO_BIN) push $(COOKBOOK_OPTS) --with-package-deps "--sysroot=$(DESTDIR)" -# Invoke repo.sh and install for one of more targets separated by comma +# Invoke rebuild and install for one of more targets separated by comma ri.%: $(FSTOOLS_TAG) FORCE $(MAKE) r.$*,--with-package-deps $(MAKE) i.$* -# Invoke clean, repo.sh and install for one of more targets separated by comma +# Invoke clean, rebuild and install for one of more targets separated by comma cri.%: $(FSTOOLS_TAG) FORCE $(MAKE) cr.$*,--with-package-deps $(MAKE) i.$* -# Invoke unfetch. clean, repo.sh and install for one of more targets separated by comma +# Invoke unfetch. clean, rebuild and install for one of more targets separated by comma ucri.%: $(FSTOOLS_TAG) FORCE $(MAKE) ucr.$*,--with-package-deps $(MAKE) i.$*