update qos-scripts to v1.1 - rewritten hfsc rate calculation

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 85f852f..9b8f872 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -8,9 +8,13 @@
 
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/.config
 
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/.config

-include $(TOPDIR)/.pkgdeps
+include $(INCLUDE_DIR)/host.mk

 
 

-PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(package-y) $(package-m))
+all: compile
+
+include $(TMP_DIR)/.packagedeps
+
+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))
 DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))


@@ -18,43 +22,48 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 $(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 
 $(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 

-%-prereq: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-prereq,%,$@) prereq MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-%-download: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-download,%,$@) download MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-%-prepare: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-%-compile: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-%-install: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+%-prereq %-download %-clean %-compile %-install: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)

 
 

-%-clean: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-clean,%,$@) clean MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-ifeq ($(SDK),1)
-GENDEP_OPTS := -s
-endif
+%-prereq: $(STAMP_DIR) $(TARGET_DIR)
+%-prepare: $(TARGET_DIR)
+%-compile: %-prepare

 
 

-$(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo
-       @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@
+$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
+       @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@

 
 

-all: compile
+preconfig:

 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 prereq: $(PREREQ_PACKAGES)
 download: $(DOWNLOAD_PACKAGES)
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 prereq: $(PREREQ_PACKAGES)
 download: $(DOWNLOAD_PACKAGES)

-compile-targets: $(COMPILE_PACKAGES)
-compile:
-       $(MAKE) -j$(CONFIG_JLEVEL) compile-targets
-install-targets: base-files-install $(INSTALL_PACKAGES)
+compile: $(COMPILE_PACKAGES)
+
+install-targets: $(INSTALL_PACKAGES)

 install:
        rm -rf $(BUILD_DIR)/root
        $(MAKE) install-targets
 install:
        rm -rf $(BUILD_DIR)/root
        $(MAKE) install-targets

+       $(MAKE) preconfig
+       @if [ -d $(TOPDIR)/files ]; then \
+               $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
+       fi
+       @( \
+               cd $(BUILD_DIR)/root; \
+               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 || true \
+       )
+
+index: $(PACKAGE_DIR)/Packages

 
 

-index: FORCE
-       (cd $(PACKAGE_DIR); $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages)
+$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
+       (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)

 
 

+symlinks:
+       ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) 
+
+ifeq ($(MAKECMDGOALS),compile)
+MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
+else
+.NOTPARALLEL:
+endif