package: use file_copy to deploy files/ in the package/install phase

[openwrt/openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 2180df3b37b0cef89c4f95d36c8c440bc6a68562..e88efdfe9f692e6061b3843041af6c4a1bfb6fc8 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -9,23 +9,16 @@ curdir:=package
 
 -include $(TMP_DIR)/.packagedeps
 $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
+$(curdir)/builddirs-install:=.
 ifeq ($(SDK),1)
-  $(curdir)/builddirs-install:=.
 else
   $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
   $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
-  $(curdir)/builddirs-install:=. $(sort $(package-y))
 endif
 ifneq ($(IGNORE_ERRORS),)
   $(curdir)/builddirs-ignore-compile:= $(if $(filter n m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(subst n,,$(m)))),$(package-m) $(package-))
 endif
 
-$(curdir)/install:=$(curdir)/install-cleanup
-
-$(curdir)/cleanup: $(TMP_DIR)/.build
-       - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
-       rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT)
-
 ifdef CONFIG_USE_MKLIBS
   define mklibs
        rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out
@@ -38,7 +31,7 @@ ifdef CONFIG_USE_MKLIBS
                file -r -N -F '' {} + | \
                awk ' /shared object/ { print $$1 }' >> $(TMP_DIR)/mklibs-progs
        mkdir -p $(TMP_DIR)/mklibs-out
-       $(STAGING_DIR_HOST)/bin/mklibs.py -D \
+       $(STAGING_DIR_HOST)/bin/mklibs -D \
                -d $(TMP_DIR)/mklibs-out \
                --sysroot $(STAGING_DIR_ROOT) \
                -L /lib \
@@ -61,18 +54,42 @@ ifdef CONFIG_USE_MKLIBS
   endef
 endif
 
-$(curdir)/rootfs-prepare: $(TMP_DIR)/.build
+# where to build (and put) .ipk packages
+OPKG:= \
+  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:=$(sort $(foreach pkg,$(package-y),$(lastword $(subst /,$(space),$(pkg)))))
+PACKAGE_INSTALL_FILES:=$(patsubst %,$(PKG_INFO_DIR)/%.*.install,$(PACKAGE_INSTALL))
+
+$(curdir)/cleanup: $(TMP_DIR)/.build
+       rm -rf $(STAGING_DIR_ROOT)
+
+$(curdir)/install: $(TMP_DIR)/.build
+       - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
+       rm -rf $(TARGET_DIR)
+       [ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
+       @$(FIND) `sed -e 's|.*|$(PACKAGE_DIR)/&_*.ipk|' $(PACKAGE_INSTALL_FILES)` | sort -u | $(OPKG) install
+       @for file in $(PACKAGE_INSTALL_FILES); do \
+               [ -s $$file.flags ] || continue; \
+               for flag in `cat $$file.flags`; do \
+                       $(OPKG) flag $$flag < $$file; \
+               done; \
+       done || true
        @-$(MAKE) package/preconfig
        @if [ -d $(TOPDIR)/files ]; then \
-               ( cd $(TOPDIR)/files; find -type f ) | \
-                       ( cd $(TARGET_DIR); while :; do \
-                               read FILE; \
-                               [ -z "$$FILE" ] && break; \
-                               [ -L "$$FILE" ] || continue; \
-                               echo "Removing symlink $(TARGET_DIR)/$$FILE"; \
-                               rm -f "$$FILE"; \
-                       done; ); \
-               $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \
+               $(call file_copy,$(TOPDIR)/files/.,$(TARGET_DIR)); \
        fi
        @mkdir -p $(TARGET_DIR)/etc/rc.d
        @( \
@@ -85,6 +102,7 @@ $(curdir)/rootfs-prepare: $(TMP_DIR)/.build
        @-find $(TARGET_DIR) -name CVS   | $(XARGS) rm -rf
        @-find $(TARGET_DIR) -name .svn  | $(XARGS) rm -rf
        @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
+       rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst
        $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
        $(call mklibs)
 
@@ -93,12 +111,13 @@ $(curdir)/index: FORCE
                gzip -9c Packages > Packages.gz \
        )
 
+$(curdir)/preconfig:
+
 $(curdir)/flags-install:= -j1
 
 $(eval $(call stampfile,$(curdir),package,prereq,.config))
 $(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))
-$(eval $(call stampfile,$(curdir),package,rootfs-prepare,$(TMP_DIR)/.build))
 
 $(eval $(call subdir,$(curdir)))