summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-21 18:49:54 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-29 10:18:26 +0200
commit973e6e1d71c161f1df336d9eaed019b013a7927f (patch)
tree8ca3426142b6517e7d9b1d27fec6e7ddccc95dad
parent119b4422f8e822bdb4f96e3df2b01b952718f672 (diff)
downloadmaster-31e0f0ae-973e6e1d71c161f1df336d9eaed019b013a7927f.tar.gz
master-31e0f0ae-973e6e1d71c161f1df336d9eaed019b013a7927f.tar.bz2
master-31e0f0ae-973e6e1d71c161f1df336d9eaed019b013a7927f.zip
build: move rootfs processing code to include/rootfs.mk so it can be reused later
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--include/rootfs.mk78
-rw-r--r--package/Makefile76
2 files changed, 80 insertions, 74 deletions
diff --git a/include/rootfs.mk b/include/rootfs.mk
new file mode 100644
index 0000000000..5c9276a6e4
--- /dev/null
+++ b/include/rootfs.mk
@@ -0,0 +1,78 @@
+include $(INCLUDE_DIR)/feeds.mk
+
+ifdef CONFIG_USE_MKLIBS
+ define mklibs
+ rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out
+ # first find all programs and add them to the mklibs list
+ find $(STAGING_DIR_ROOT) -type f -perm /100 -exec \
+ file -r -N -F '' {} + | \
+ awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs
+ # find all loadable objects that are not regular libraries and add them to the list as well
+ find $(STAGING_DIR_ROOT) -type f -name \*.so\* -exec \
+ file -r -N -F '' {} + | \
+ awk ' /shared object/ { print $$1 }' > $(TMP_DIR)/mklibs-libs
+ mkdir -p $(TMP_DIR)/mklibs-out
+ $(STAGING_DIR_HOST)/bin/mklibs -D \
+ -d $(TMP_DIR)/mklibs-out \
+ --sysroot $(STAGING_DIR_ROOT) \
+ `cat $(TMP_DIR)/mklibs-libs | sed 's:/*[^/]\+/*$$::' | uniq | sed 's:^$(STAGING_DIR_ROOT):-L :'` \
+ --ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \
+ $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so ld-musl-*.so.*, \
+ $(STAGING_DIR_ROOT)/lib/$(name) \
+ )))) \
+ --target $(REAL_GNU_TARGET_NAME) \
+ `cat $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-libs` 2>&1
+ $(RSTRIP) $(TMP_DIR)/mklibs-out
+ for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \
+ LIB="$${lib##*/}"; \
+ DEST="`ls "$(TARGET_DIR)/lib/$$LIB" "$(TARGET_DIR)/usr/lib/$$LIB" 2>/dev/null`"; \
+ [ -n "$$DEST" ] || continue; \
+ echo "Copying stripped library $$lib to $$DEST"; \
+ cp "$$lib" "$$DEST" || exit 1; \
+ done
+ endef
+endif
+
+# where to build (and put) .ipk packages
+OPKG:= \
+ IPKG_NO_SCRIPT=1 \
+ IPKG_TMP=$(TMP_DIR)/ipkg \
+ IPKG_INSTROOT=$(TARGET_DIR) \
+ IPKG_CONF_DIR=$(STAGING_DIR)/etc \
+ IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
+ $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \
+ --offline-root $(TARGET_DIR) \
+ --force-depends \
+ --force-overwrite \
+ --force-postinstall \
+ --force-maintainer \
+ --add-dest root:/ \
+ --add-arch all:100 \
+ --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
+
+
+define prepare_rootfs
+ @if [ -d $(TOPDIR)/files ]; then \
+ $(call file_copy,$(TOPDIR)/files/.,$(TARGET_DIR)); \
+ fi
+ @mkdir -p $(TARGET_DIR)/etc/rc.d
+ @( \
+ cd $(TARGET_DIR); \
+ for script in ./usr/lib/opkg/info/*.postinst; do \
+ IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) $$script; \
+ done; \
+ for script in ./etc/init.d/*; do \
+ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
+ IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) ./etc/rc.common $$script enable; \
+ done || true \
+ )
+ $(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(TARGET_DIR)/usr/lib/opkg/status)
+ @-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf
+ @-find $(TARGET_DIR) -name .svn | $(XARGS) rm -rf
+ @-find $(TARGET_DIR) -name .git | $(XARGS) rm -rf
+ @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
+ rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst*
+ rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.prerm*
+ $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
+ $(mklibs)
+endef
diff --git a/package/Makefile b/package/Makefile
index c8f12d8a44..d4081cf689 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -7,7 +7,7 @@
curdir:=package
-include $(INCLUDE_DIR)/feeds.mk
+include $(INCLUDE_DIR)/rootfs.mk
-include $(TMP_DIR)/.packagedeps
$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
@@ -27,56 +27,6 @@ ifneq ($(IGNORE_ERRORS),)
$(curdir)/builddirs-ignore-host-compile := $(package-ignore-subdirs)
endif
-ifdef CONFIG_USE_MKLIBS
- define mklibs
- rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out
- # first find all programs and add them to the mklibs list
- find $(STAGING_DIR_ROOT) -type f -perm /100 -exec \
- file -r -N -F '' {} + | \
- awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs
- # find all loadable objects that are not regular libraries and add them to the list as well
- find $(STAGING_DIR_ROOT) -type f -name \*.so\* -exec \
- file -r -N -F '' {} + | \
- awk ' /shared object/ { print $$1 }' > $(TMP_DIR)/mklibs-libs
- mkdir -p $(TMP_DIR)/mklibs-out
- $(STAGING_DIR_HOST)/bin/mklibs -D \
- -d $(TMP_DIR)/mklibs-out \
- --sysroot $(STAGING_DIR_ROOT) \
- `cat $(TMP_DIR)/mklibs-libs | sed 's:/*[^/]\+/*$$::' | uniq | sed 's:^$(STAGING_DIR_ROOT):-L :'` \
- --ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \
- $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so ld-musl-*.so.*, \
- $(STAGING_DIR_ROOT)/lib/$(name) \
- )))) \
- --target $(REAL_GNU_TARGET_NAME) \
- `cat $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-libs` 2>&1
- $(RSTRIP) $(TMP_DIR)/mklibs-out
- for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \
- LIB="$${lib##*/}"; \
- DEST="`ls "$(TARGET_DIR)/lib/$$LIB" "$(TARGET_DIR)/usr/lib/$$LIB" 2>/dev/null`"; \
- [ -n "$$DEST" ] || continue; \
- echo "Copying stripped library $$lib to $$DEST"; \
- cp "$$lib" "$$DEST" || exit 1; \
- done
- endef
-endif
-
-# where to build (and put) .ipk packages
-OPKG:= \
- IPKG_NO_SCRIPT=1 \
- IPKG_TMP=$(TMP_DIR)/ipkg \
- IPKG_INSTROOT=$(TARGET_DIR) \
- IPKG_CONF_DIR=$(STAGING_DIR)/etc \
- IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
- $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \
- --offline-root $(TARGET_DIR) \
- --force-depends \
- --force-overwrite \
- --force-postinstall \
- --force-maintainer \
- --add-dest root:/ \
- --add-arch all:100 \
- --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
-
PACKAGE_INSTALL_FILES:= \
$(foreach pkg,$(sort $(package-y)), \
$(foreach variant, \
@@ -106,29 +56,7 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install
done; \
done || true
@-$(MAKE) package/preconfig
- @if [ -d $(TOPDIR)/files ]; then \
- $(call file_copy,$(TOPDIR)/files/.,$(TARGET_DIR)); \
- fi
- @mkdir -p $(TARGET_DIR)/etc/rc.d
- @( \
- cd $(TARGET_DIR); \
- for script in ./usr/lib/opkg/info/*.postinst; do \
- IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) $$script; \
- done; \
- for script in ./etc/init.d/*; do \
- grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
- IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) ./etc/rc.common $$script enable; \
- done || true \
- )
- $(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(TARGET_DIR)/usr/lib/opkg/status)
- @-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf
- @-find $(TARGET_DIR) -name .svn | $(XARGS) rm -rf
- @-find $(TARGET_DIR) -name .git | $(XARGS) rm -rf
- @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
- rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst*
- rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.prerm*
- $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
- $(call mklibs)
+ $(prepare_rootfs)
PASSOPT=""
PASSARG=""