diff --git a/mk/ci.mk b/mk/ci.mk index 7fa1542f7..dcf81ccf0 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -58,14 +58,14 @@ ifeq ($(PODMAN_BUILD),1) else $(MAKE) PREFIX_BINARY=0 \ "prefix/$(TARGET)/gcc-install.tar.gz" \ - "prefix/$(TARGET)/relibc-install.tar.gz" \ "prefix/$(TARGET)/rust-install.tar.gz" \ - "prefix/$(TARGET)/clang-install.tar.gz" + "prefix/$(TARGET)/clang-install.tar.gz" \ + "prefix/$(TARGET)/relibc-install.tar.gz" rm -rf "build/toolchain/$(HOST_TARGET)/$(TARGET)" mkdir -p "build/toolchain/$(HOST_TARGET)/$(TARGET)" cp "prefix/$(TARGET)/gcc-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/gcc-install.tar.gz" - cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/relibc-install.tar.gz" cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/rust-install.tar.gz" cp "prefix/$(TARGET)/clang-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/clang-install.tar.gz" + cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(HOST_TARGET)/$(TARGET)/relibc-install.tar.gz" cd "build/toolchain/$(HOST_TARGET)/$(TARGET)" && sha256sum -b * > SHA256SUM endif diff --git a/mk/prefix.mk b/mk/prefix.mk index 2601fc4b2..2ffb7054b 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -99,6 +99,8 @@ $(PREFIX)/relibc-install.tar.gz: $(PREFIX)/sysroot tar \ --create \ --gzip \ + --sort=name \ + --mtime='@0' \ --file "$@" \ --directory="$<" \ . @@ -205,6 +207,8 @@ $(PREFIX)/%.tar.gz: $(PREFIX)/% tar \ --create \ --gzip \ + --sort=name \ + --mtime='@0' \ --file "$@" \ --directory="$<" \ .