Skip to content

Commit 8c018dc

Browse files
committed
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 <[email protected]>
1 parent a6c248e commit 8c018dc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/image.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ endef
310310
define Image/Manifest
311311
$(if $(CONFIG_USE_APK), \
312312
$(call apk,$(TARGET_DIR_ORIG)) list --quiet --manifest --no-network \
313-
--repositories-file /dev/zero | sort | sed 's/ / - /' > \
313+
--repositories-file /dev/null | sort | sed 's/ / - /' > \
314314
$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest, \
315315
$(call opkg,$(TARGET_DIR_ORIG)) list-installed > \
316316
$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest \
@@ -365,7 +365,7 @@ opkg_target = \
365365

366366
apk_target = \
367367
$(call apk,$(mkfs_cur_target_dir)) --no-scripts \
368-
--repositories-file /dev/zero --repository file://$(PACKAGE_DIR_ALL)/packages.adb
368+
--repositories-file /dev/null --repository file://$(PACKAGE_DIR_ALL)/packages.adb
369369

370370

371371
target-dir-%: FORCE

package/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ifneq ($(CONFIG_USE_APK),)
9999
$(file >$(TMP_DIR)/apk_install_list,\
100100
$(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg))))
101101
$(call apk,$(TARGET_DIR)) add --no-cache --initdb --no-scripts --arch $(ARCH_PACKAGES) \
102-
--repositories-file /dev/zero --repository file://$(PACKAGE_DIR_ALL)/packages.adb \
102+
--repositories-file /dev/null --repository file://$(PACKAGE_DIR_ALL)/packages.adb \
103103
$$(cat $(TMP_DIR)/apk_install_list)
104104
else
105105
$(file >$(TMP_DIR)/opkg_install_list,\

0 commit comments

Comments
 (0)