From 59ac6eea2939515a1dc808bbb61b671a302fa2b0 Mon Sep 17 00:00:00 2001 From: osak buildhauer user <buildhauer@fsmpi.rwth-aachen.de> Date: Thu, 8 Sep 2016 21:24:24 +0200 Subject: [PATCH] no longer put .bz2 behind plain text repo package files --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fe1b757..c9739cc 100644 --- a/Makefile +++ b/Makefile @@ -580,8 +580,8 @@ $(REPO_ARCHIVE_DIR)/Packages.$(call altarch,$(PRIMARY_ARCH)) $(REPO_ARCHIVE_DIR) rmdir "$(call archdir,$*)$(ROOTFS)/cdrom" $(MAKE) ARCH=$(call to_arch,$*) rootfs_finalize -$(call ensure_mount,repo_package_info) : $(REPO_DIST_DIR)/binary-$(call altarch,$(ARCH))/Packages.bz2 -$(REPO_DIST_DIR)/binary-$(call altarch,$(PRIMARY_ARCH))/Packages.bz2 $(REPO_DIST_DIR)/binary-$(call altarch,$(SECONDARY_ARCH))/Packages.bz2 : $(REPO_DIST_DIR)/binary-%/Packages.bz2 : $(REPO_ARCHIVE_DIR)/Packages.% +$(call ensure_mount,repo_package_info) : $(REPO_DIST_DIR)/binary-$(call altarch,$(ARCH))/Packages +$(REPO_DIST_DIR)/binary-$(call altarch,$(PRIMARY_ARCH))/Packages $(REPO_DIST_DIR)/binary-$(call altarch,$(SECONDARY_ARCH))/Packages : $(REPO_DIST_DIR)/binary-%/Packages : $(REPO_ARCHIVE_DIR)/Packages.% mkdir -p "$(REPO_ARCHIVE_DIR)" mkdir -p "$(REPO_DIST_DIR)/binary-$*/" #info/release file @@ -598,12 +598,12 @@ $(REPO_DIST_DIR)/binary-$(call altarch,$(PRIMARY_ARCH))/Packages.bz2 $(REPO_DIST >> "$(REPO_DIST_DIR)/binary-$*/Release" cd "$(REPO_ARCHIVE_DIR)" \ - && cat Packages.noarch "Packages.$*" > "$(REPO_DIST_DIR)/binary-$*/Packages.bz2" + && cat Packages.noarch "Packages.$*" > "$(REPO_DIST_DIR)/binary-$*/Packages" #The following rules requires none of its dependencies. However, it writes a timestamp to the metadata #that should always be "newer" than the dependencies. $(call ensure_mount,repo_metadata) : $(REPO_ARCHIVE_DIR)/Release -$(REPO_ARCHIVE_DIR)/Release : $(REPO_DIST_DIR)/binary-$(call altarch,$(PRIMARY_ARCH))/Packages.bz2 $(REPO_DIST_DIR)/binary-$(call altarch,$(SECONDARY_ARCH))/Packages.bz2 +$(REPO_ARCHIVE_DIR)/Release : $(REPO_DIST_DIR)/binary-$(call altarch,$(PRIMARY_ARCH))/Packages $(REPO_DIST_DIR)/binary-$(call altarch,$(SECONDARY_ARCH))/Packages mkdir -p "$(REPO_ARCHIVE_DIR)" touch "$(REPO_ARCHIVE_DIR)"/.aptignr -- GitLab