fix rootfs and init script handling

[openwrt-10.03/.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 31f03c01bbc878e3973f76c148325fa15fc4021f..153ca657b0283b20dd105297e2150489d9bea8c0 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,19 +8,18 @@
 
 curdir:=package
 
-include .config
 -include $(TMP_DIR)/.packagedeps
 $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
-$(curdir)/builddirs-compile:=$(sort $(package-y) $(package-m))
-$(curdir)/builddirs-install:=. $(sort $(package-y))
+$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
 $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
+$(curdir)/builddirs-install:=. $(sort $(package-y))
 
-$(curdir)//compile:=.config prereq
 $(curdir)/install:=$(curdir)/install-cleanup
-$(curdir)/install-cleanup:
+
+$(curdir)/cleanup:
        rm -rf $(BUILD_DIR)/root
-       $(MAKE) install-targets
-       $(MAKE) preconfig
+
+$(curdir)/rootfs-prepare:
        @if [ -d $(TOPDIR)/files ]; then \
                $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
        fi
@@ -35,9 +34,19 @@ $(curdir)/install-cleanup:
        @-find $(BUILD_DIR)/root -name CVS   | $(XARGS) rm -rf
        @-find $(BUILD_DIR)/root -name .svn  | $(XARGS) rm -rf
        @-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
+       @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
 
-$(curdir)/index: FORCE
-       (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
+$(curdir)/flags-install:= -j1
 
 $(eval $(call stampfile,$(curdir),package,prereq))
+$(eval $(call stampfile,$(curdir),package,cleanup))
+$(eval $(call stampfile,$(curdir),package,compile))
+$(eval $(call stampfile,$(curdir),package,install))
+$(eval $(call stampfile,$(curdir),package,rootfs-prepare))
+
+$($(curdir)/stamp-cleanup): $(TMP_DIR)/.build
+$($(curdir)/stamp-compile): $($(curdir)/stamp-cleanup) $(TMP_DIR)/.build
+$($(curdir)/stamp-install): $($(curdir)/stamp-compile) $(TMP_DIR)/.build
+$($(curdir)/stamp-rootfs-prepare): $($(curdir)/stamp-install) $(TMP_DIR)/.build
+
 $(eval $(call subdir,$(curdir)))