From 8c018dcb5601150f26a01babd297e6b416895eba Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Fri, 15 Nov 2024 12:27:44 +0100 Subject: [PATCH] package: use /dev/null for apk --repositories-file In preparation for APK version bump, use /dev/null instead of /dev/zero for --repositories-file to mute an error in recent APK files. New APK version use modern istream logic that are more sensible to the kind of file passed and /dev/null is required to correctly handle an empty repository file. Signed-off-by: Christian Marangi --- include/image.mk | 4 ++-- package/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/image.mk b/include/image.mk index 9a4dff2167a1..881d420ae1c3 100644 --- a/include/image.mk +++ b/include/image.mk @@ -310,7 +310,7 @@ endef define Image/Manifest $(if $(CONFIG_USE_APK), \ $(call apk,$(TARGET_DIR_ORIG)) list --quiet --manifest --no-network \ - --repositories-file /dev/zero | sort | sed 's/ / - /' > \ + --repositories-file /dev/null | sort | sed 's/ / - /' > \ $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest, \ $(call opkg,$(TARGET_DIR_ORIG)) list-installed > \ $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest \ @@ -365,7 +365,7 @@ opkg_target = \ apk_target = \ $(call apk,$(mkfs_cur_target_dir)) --no-scripts \ - --repositories-file /dev/zero --repository file://$(PACKAGE_DIR_ALL)/packages.adb + --repositories-file /dev/null --repository file://$(PACKAGE_DIR_ALL)/packages.adb target-dir-%: FORCE diff --git a/package/Makefile b/package/Makefile index 88d312d4edc5..2c7cd588793b 100644 --- a/package/Makefile +++ b/package/Makefile @@ -99,7 +99,7 @@ ifneq ($(CONFIG_USE_APK),) $(file >$(TMP_DIR)/apk_install_list,\ $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg)))) $(call apk,$(TARGET_DIR)) add --no-cache --initdb --no-scripts --arch $(ARCH_PACKAGES) \ - --repositories-file /dev/zero --repository file://$(PACKAGE_DIR_ALL)/packages.adb \ + --repositories-file /dev/null --repository file://$(PACKAGE_DIR_ALL)/packages.adb \ $$(cat $(TMP_DIR)/apk_install_list) else $(file >$(TMP_DIR)/opkg_install_list,\