diff --git a/mk/prefix.mk b/mk/prefix.mk index fa7ead17..4af8f825 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -22,8 +22,8 @@ prefix: $(PREFIX)/sysroot # Update relibc used for compiling and clean all statically linked recipes prefix_clean: | $(FSTOOLS_TAG) - rm -rf $(PREFIX)/relibc-install $(PREFIX)/sysroot $(REPO_TAG) - $(MAKE) c.base,base-initfs,extrautils,kernel,ion,pkgutils,redoxfs,relibc + $(MAKE) c.relibc + $(MAKE) c.base,base-initfs,extrautils,kernel,ion,pkgutils,redoxfs $(PREFIX)/relibc-install: $(PREFIX)/rust-install | $(FSTOOLS_TAG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) diff --git a/mk/repo.mk b/mk/repo.mk index cfe0424e..f97982ba 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -39,6 +39,16 @@ else @./target/release/repo find $(foreach f,$(subst $(comma), ,$*),$(f)) endif +# Invoke clean for relibc in recipe and relibc in sysroot +c.relibc: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) make $@ +else + ./target/release/repo clean relibc + rm -rf $(PREFIX)/relibc-install $(PREFIX)/sysroot $(REPO_TAG) + @echo "\033[1;36;49mSysroot cleaned\033[0m" +endif + # Invoke clean for one or more targets separated by comma c.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) @@ -58,7 +68,7 @@ else endif # Invoke repo.sh for one or more targets separated by comma -r.%: $(FSTOOLS_TAG) FORCE +r.%: prefix $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ else diff --git a/src/bin/repo.rs b/src/bin/repo.rs index 9fe66a21..7dcbc5f1 100644 --- a/src/bin/repo.rs +++ b/src/bin/repo.rs @@ -237,7 +237,7 @@ fn main_inner() -> anyhow::Result<()> { return publish_packages(&recipe_names, &config.repo_dir); } - if verbose { + if verbose && recipe_names.len() > 1 { println!( "\nCommand '{}' completed for {} recipes.", command.to_string(),