[openwrt/openwrt] Revert "base-files: source functions.sh in /lib/functions/system.sh"

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 1 21:34:00 GMT 2021


adrian pushed a commit to openwrt/openwrt.git, branch openwrt-19.07:
https://git.openwrt.org/a5672f6b96f393145070ad17c8eb1d15ef49ad2e

commit a5672f6b96f393145070ad17c8eb1d15ef49ad2e
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Mon Mar 1 22:28:13 2021 +0100

    Revert "base-files: source functions.sh in /lib/functions/system.sh"
    
    This reverts commit 86aeac4fc98f42ac0ce7e0dcf1cb240e16b28f8f.
    
    The reverted commit introduced a cyclic dependency between
    /lib/functions.sh and /lib/functions/system.sh. Further details
    are found in 282e8173509a ("base-files: do not source system.sh
    in functions.sh"), which was applied to master some time ago and
    is included in 21.02.
    
    With the current age of 19.07 branch, it seems safer to revert this
    mostly cosmetic feature than investing further time into disentangling
    the dependencies.
    
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 package/base-files/Makefile                      | 2 +-
 package/base-files/files/lib/functions/system.sh | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9df5b860f8..dfb84d10d6 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=204.3
+PKG_RELEASE:=204.4
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/lib/functions/system.sh b/package/base-files/files/lib/functions/system.sh
index e97d00c144..dceb66a851 100644
--- a/package/base-files/files/lib/functions/system.sh
+++ b/package/base-files/files/lib/functions/system.sh
@@ -1,7 +1,5 @@
 # Copyright (C) 2006-2013 OpenWrt.org
 
-. /lib/functions.sh
-
 get_mac_binary() {
 	local path="$1"
 	local offset="$2"



More information about the lede-commits mailing list