[openwrt/openwrt] build: apk: Remove /run/apk/db.lock

LEDE Commits lede-commits at lists.infradead.org
Sat Nov 16 05:22:42 PST 2024


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/71c14cbee5aa5f1924191252c07a69b7e6aabd29

commit 71c14cbee5aa5f1924191252c07a69b7e6aabd29
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Thu Nov 14 22:57:02 2024 +0100

    build: apk: Remove /run/apk/db.lock
    
    Do not add the file /run/apk/db.lock to the root file system. The /run
    folder should be on a tmpfs.
    
    At runtime we should make /run point to a tmpfs. At build time we should
    just remove the folder.
    
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    Link: https://github.com/openwrt/openwrt/pull/16961
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 package/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/Makefile b/package/Makefile
index 2c7cd58879..3c6621b81c 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -101,6 +101,7 @@ ifneq ($(CONFIG_USE_APK),)
 	$(call apk,$(TARGET_DIR)) add --no-cache --initdb --no-scripts --arch $(ARCH_PACKAGES) \
 		--repositories-file /dev/null --repository file://$(PACKAGE_DIR_ALL)/packages.adb \
 		$$(cat $(TMP_DIR)/apk_install_list)
+	rm -rf $(TARGET_DIR)/run
 else
 	$(file >$(TMP_DIR)/opkg_install_list,\
 	  $(call opkg_package_files,\




More information about the lede-commits mailing list