X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2FMakefile;h=610d09d6fed6a61ed7f71bf8bc25daa4944cee2b;hb=093b75e10635dcee4a90e0263131aa8d69d251be;hp=4fdf4150469434428c7970e3ebce53f050f992a6;hpb=dac629f71093715ea002c7949a9888188e58984e;p=openwrt%2Fopenwrt.git diff --git a/package/Makefile b/package/Makefile index 4fdf415046..610d09d6fe 100644 --- a/package/Makefile +++ b/package/Makefile @@ -7,6 +7,7 @@ curdir:=package +include $(INCLUDE_DIR)/feeds.mk include $(INCLUDE_DIR)/rootfs.mk -include $(TMP_DIR)/.packagedeps @@ -72,11 +73,10 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE $(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \ done; \ done || true - @-$(MAKE) package/preconfig $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG) - $(call prepare_rootfs,$(TARGET_DIR)) + $(call prepare_rootfs,$(TARGET_DIR),$(TOPDIR)/files) $(curdir)/index: FORCE @echo Generating package index... @@ -96,8 +96,6 @@ ifdef CONFIG_SIGNED_PACKAGES ); done endif -$(curdir)/preconfig: - $(curdir)/flags-install:= -j1 $(eval $(call stampfile,$(curdir),package,prereq,.config))