odhcp6c: add support for option passthru

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index bac7001..e189e37 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -10,17 +10,15 @@ curdir:=package
 -include $(TMP_DIR)/.packagedeps
 $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
 $(curdir)/builddirs-install:=.
-ifeq ($(SDK),1)
-else
-  $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
-  $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
-endif
+$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
+$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
 ifneq ($(IGNORE_ERRORS),)
   package-y-filter := $(package-y)
   package-m-filter := $(filter-out $(package-y),$(package-m))
   package-n-filter := $(filter-out $(package-y) $(package-m),$(package-))
   package-ignore-errors := $(filter n m y,$(IGNORE_ERRORS))
   package-ignore-errors := $(if $(package-ignore-errors),$(package-ignore-errors),n m)
+  $(curdir)/builddirs-ignore-download := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter))
   $(curdir)/builddirs-ignore-compile := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter))
 endif
 
@@ -76,7 +74,7 @@ OPKG:= \
 PACKAGE_INSTALL_FILES:= \
        $(foreach pkg,$(sort $(package-y)), \
                $(foreach variant, \
-                       $(if $(package/$(pkg)/variants), \
+                       $(if $(strip $(package/$(pkg)/variants)), \
                                $(package/$(pkg)/variants), \
                                $(if $(package/$(pkg)/default-variant), \
                                        $(package/$(pkg)/default-variant), \
@@ -130,16 +128,16 @@ ifndef CONFIG_OPKGSMIME_PASSPHRASE
 endif
 
 $(curdir)/index: FORCE
+       @echo Generating package index...
+       @(cd $(PACKAGE_DIR); \
+               $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
+               gzip -9c Packages > Packages.gz )
 ifeq ($(call qstrip,$(CONFIG_OPKGSMIME_KEY)),)
        @echo Signing key has not been configured
 else
 ifeq ($(call qstrip,$(CONFIG_OPKGSMIME_CERT)),)
        @echo Certificate has not been configured
 else
-       @echo Generating package index...
-       @(cd $(PACKAGE_DIR); \
-               $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
-               gzip -9c Packages > Packages.gz )
        @echo Signing package index...
        @(cd $(PACKAGE_DIR); \
                openssl smime -binary -in Packages.gz \