add upstream fixes for 1.7.2

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index cd4304e..aa059a7 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,81 +1,50 @@
 # 
-# 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.
 #
 # $Id$
 
-include $(TOPDIR)/rules.mk
-include $(TOPDIR)/.config
-include $(TMP_DIR)/.pkgdeps
-include $(INCLUDE_DIR)/host.mk
+curdir:=package
 
-PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
-DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
-COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
-INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
+-include $(TMP_DIR)/.packagedeps
+$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
+$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
+$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
+$(curdir)/builddirs-install:=. $(sort $(package-y))
 
-$(STAMP_DIR) $(TARGET_DIR):
-       mkdir -p $@
+$(curdir)/install:=$(curdir)/install-cleanup
 
-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-prereq,%,$@) prereq
+$(curdir)/cleanup: $(TMP_DIR)/.build
+       rm -rf $(TARGET_DIR)
 
-%-download: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-download,%,$@) download
-
-%-prepare: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-
-%-compile: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-compile,%,$@) compile
-
-%-install: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-install,%,$@) install
-
-%-clean: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-clean,%,$@) clean
-
-ifeq ($(SDK),1)
-GENDEP_OPTS := -s
-endif
-
-$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo
-       @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@
-
-all: compile
-clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
-prereq: $(PREREQ_PACKAGES)
-download: $(DOWNLOAD_PACKAGES)
-compile-targets: $(COMPILE_PACKAGES)
-compile:
-       @-rm -f $(PACKAGE_DIR)/*.ipk
-       $(MAKE) compile-targets
-
-install-targets: $(INSTALL_PACKAGES)
-install:
-       rm -rf $(BUILD_DIR)/root
-       $(MAKE) install-targets
+$(curdir)/rootfs-prepare: $(TMP_DIR)/.build
+       @-$(MAKE) package/preconfig
        @if [ -d $(TOPDIR)/files ]; then \
-               $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
+               $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \
        fi
+       @mkdir -p $(TARGET_DIR)/etc/rc.d
        @( \
-               cd $(BUILD_DIR)/root; \
+               cd $(TARGET_DIR); \
                for script in ./etc/init.d/*; do \
                        grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
-                       IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
-               done; \
+                       IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \
+               done || true \
        )
+       @-find $(TARGET_DIR) -name CVS   | $(XARGS) rm -rf
+       @-find $(TARGET_DIR) -name .svn  | $(XARGS) rm -rf
+       @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
 
-index: $(PACKAGE_DIR)/Packages
+$(curdir)/index: FORCE
+       @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
 
-$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
-       (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
+$(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))
 
-ifeq ($(MAKECMDGOALS),compile-targets)
-MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
-else
-.NOTPARALLEL:
-endif
+$(eval $(call subdir,$(curdir)))