diff --git a/mk/ci.mk b/mk/ci.mk index a0f9b3e6..fadaa6d1 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -39,7 +39,6 @@ else $(HOST_CARGO) build --manifest-path installer/Cargo.toml --release export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ PACKAGES="$$($(INSTALLER) --list-packages -c config/$(ARCH)/ci.toml)" && \ cd cookbook && \ ./fetch.sh "$${PACKAGES}" && \ diff --git a/mk/repo.mk b/mk/repo.mk index 318e4aba..5d8e4baa 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -1,15 +1,12 @@ # Configuration file for recipe commands -PREFER_STATIC?= - $(BUILD)/fetch.tag: prefix $(FSTOOLS_TAG) $(FILESYSTEM_CONFIG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) + $(PODMAN_RUN) $(MAKE) $@ else export PATH="$(PREFIX_PATH):$$PATH" && \ PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./fetch.sh "$${PACKAGES}" mkdir -p $(BUILD) @@ -18,11 +15,10 @@ endif $(REPO_TAG): $(BUILD)/fetch.tag $(FSTOOLS_TAG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) + $(PODMAN_RUN) $(MAKE) else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \ cd cookbook && \ ./repo.sh $(REPO_NONSTOP) "$${PACKAGES}" @@ -36,11 +32,10 @@ endif # Invoke clean.sh for a single target c.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) + $(PODMAN_RUN) $(MAKE) $@ else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./clean.sh $* endif @@ -48,11 +43,10 @@ endif # Invoke fetch.sh for a single target f.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) + $(PODMAN_RUN) $(MAKE) $@ else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./fetch.sh $* endif @@ -60,11 +54,10 @@ endif # Invoke repo.sh for a single target r.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) + $(PODMAN_RUN) $(MAKE) $@ else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./repo.sh $* endif @@ -72,11 +65,10 @@ endif # Invoke unfetch.sh for a single target u.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) + $(PODMAN_RUN) $(MAKE) $@ else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ - export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./unfetch.sh $* endif