base-files: do not source system.sh in functions.sh

The default_postinst() function in /lib/functions.sh sources
/lib/functions/system.sh before cycling through uci-defaults files.

This creates a pseudo-cyclic dependency as system.sh also uses
functions that are located in functions.sh. Despite that, there
is actually only one uci-defaults file in the entire repo that needs
system.sh, and this one contains an explicit source for system.sh
anyway.

Consequently, this patch removes the sourcing of system.sh in
functions.sh. There are no relevant uses in packages, routing and
luci repositories.
This may require adjustments for downstream, though.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8e252153feb8452974496afe3484bf66616cfc7d..87c43fdc0c881df1d44865c95407d154bc3bdb92 100644 (file)
--- 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:=215
+PKG_RELEASE:=216
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index fe908f7aa4fbb5bd79a51ee2f70766ba3fa3b154..a77b669709ff7b2895e2cb20a5d86c6203700428 100755 (executable)
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -254,7 +254,6 @@ default_postinst() {
                fi
 
                if grep -m1 -q -s "^/etc/uci-defaults/" "$filelist"; then
-                       . /lib/functions/system.sh
                        [ -d /tmp/.uci ] || mkdir -p /tmp/.uci
                        for i in $(grep -s "^/etc/uci-defaults/" "$filelist"); do
                                ( [ -f "$i" ] && cd "$(dirname $i)" && . "$i" ) && rm -f "$i"