Signed-off-by: Yousong Zhou <yszhou4t...@gmail.com>
---
include/rootfs.mk | 18 +++++++++++++++---
package/Makefile | 1 +
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/include/rootfs.mk b/include/rootfs.mk
index bd9af6a..46ccce4 100644
--- a/include/rootfs.mk
+++ b/include/rootfs.mk
@@ -37,6 +37,9 @@ endif
opkg = \
IPKG_NO_SCRIPT=1 \
IPKG_INSTROOT=$(1) \
+ UCI=$(STAGING_DIR_HOST)/sbin/uci \
+ UCI_CONFDIR=$(1)/etc/config \
+ UCI_SAVEDIR=$(1)/tmp/.uci \
TMPDIR=$(1)/tmp \
$(STAGING_DIR_HOST)/bin/opkg \
--offline-root $(1) \
@@ -61,9 +64,14 @@ define prepare_rootfs
fi
@mkdir -p $(1)/etc/rc.d
@( \
- cd $(1); \
+ cd $(1); shell=$$(which bash); \
+ mkdir -p $(1)/tmp/.uci/; \
for script in ./usr/lib/opkg/info/*.postinst; do \
- IPKG_INSTROOT=$(1) $$(which bash) $$script; \
+ IPKG_INSTROOT=$(1) \
+ UCI=$(STAGING_DIR_HOST)/sbin/uci \
+ UCI_CONFDIR=$(1)/etc/config \
+ UCI_SAVEDIR=$(1)/tmp/.uci \
+ $$shell $$script; \
ret=$$?; \
if [ $$ret -ne 0 ]; then \
echo "postinst script $$script has failed with
exit code $$ret" >&2; \
@@ -72,7 +80,11 @@ define prepare_rootfs
done; \
for script in ./etc/init.d/*; do \
grep '#!/bin/sh /etc/rc.common' $$script >/dev/null ||
continue; \
- IPKG_INSTROOT=$(1) $$(which bash) ./etc/rc.common
$$script enable; \
+ IPKG_INSTROOT=$(1) \
+ UCI=$(STAGING_DIR_HOST)/sbin/uci \
+ UCI_CONFDIR=$(1)/etc/config \
+ UCI_SAVEDIR=$(1)/tmp/.uci \
+ $$shell ./etc/rc.common $$script enable; \
done || true \
)
$(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time:
$(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status)
diff --git a/package/Makefile b/package/Makefile
index 4fdf415..79aa58d 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -58,6 +58,7 @@ $(curdir)/merge-index: $(curdir)/merge
ifndef SDK
$(curdir)/compile: $(curdir)/system/opkg/host/compile
+ $(curdir)/compile: $(curdir)/system/uci/host/compile
endif
$(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if
$(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index)
--
2.6.4
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
