X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2FMakefile;h=8726e2eae9c741ca073a56bfd279e8cd8661ee75;hb=519a199cbcc0930e229ddd7087309326a846bdce;hp=9f39395bae6a7ef5e912c62300285d14f575ec12;hpb=180465c38f1599f7339a00f80b383620c7c3818d;p=openwrt%2Fopenwrt.git diff --git a/package/Makefile b/package/Makefile index 9f39395bae..8726e2eae9 100644 --- a/package/Makefile +++ b/package/Makefile @@ -54,7 +54,7 @@ $(curdir)/merge-index: $(curdir)/merge $(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index) - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 - rm -rf $(TARGET_DIR) + rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG) [ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp $(call opkg,$(TARGET_DIR)) install \ $(call opkg_package_files,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null)) @@ -65,6 +65,9 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install $(curdir done; \ done || true @-$(MAKE) package/preconfig + + $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG) + $(call prepare_rootfs,$(TARGET_DIR)) PASSOPT=""