target/sdk: use .config instead of unconditionally enabling all build dirs

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index e88efdf..3b4eecd 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -10,13 +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),)
-  $(curdir)/builddirs-ignore-compile:= $(if $(filter n m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(subst n,,$(m)))),$(package-m) $(package-))
+  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-compile := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter))
 endif
 
 ifdef CONFIG_USE_MKLIBS
@@ -29,20 +31,18 @@ ifdef CONFIG_USE_MKLIBS
        # find all loadable objects that are not regular libraries and add them to the list as well
        find $(STAGING_DIR_ROOT) -type f -name \*.so\* -exec \
                file -r -N -F '' {} + | \
-               awk ' /shared object/ { print $$1 }' >> $(TMP_DIR)/mklibs-progs
+               awk ' /shared object/ { print $$1 }' > $(TMP_DIR)/mklibs-libs
        mkdir -p $(TMP_DIR)/mklibs-out
        $(STAGING_DIR_HOST)/bin/mklibs -D \
                -d $(TMP_DIR)/mklibs-out \
                --sysroot $(STAGING_DIR_ROOT) \
-               -L /lib \
-               -L /usr/lib \
-               -L /usr/lib/ebtables \
+               `cat $(TMP_DIR)/mklibs-libs | sed 's:/*[^/]\+/*$$::' | uniq | sed 's:^$(STAGING_DIR_ROOT):-L :'` \
                --ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \
                        $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so, \
                          $(STAGING_DIR_ROOT)/lib/$(name) \
                        )))) \
                --target $(REAL_GNU_TARGET_NAME) \
-               `cat $(TMP_DIR)/mklibs-progs` 2>&1
+               `cat $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-libs` 2>&1
        $(RSTRIP) $(TMP_DIR)/mklibs-out
        for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \
                LIB="$${lib##*/}"; \
@@ -70,8 +70,19 @@ OPKG:= \
        --add-arch all:100 \
        --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
 
-PACKAGE_INSTALL:=$(sort $(foreach pkg,$(package-y),$(lastword $(subst /,$(space),$(pkg)))))
-PACKAGE_INSTALL_FILES:=$(patsubst %,$(PKG_INFO_DIR)/%.*.install,$(PACKAGE_INSTALL))
+PACKAGE_INSTALL_FILES:= \
+       $(foreach pkg,$(sort $(package-y)), \
+               $(foreach variant, \
+                       $(if $(strip $(package/$(pkg)/variants)), \
+                               $(package/$(pkg)/variants), \
+                               $(if $(package/$(pkg)/default-variant), \
+                                       $(package/$(pkg)/default-variant), \
+                                       default \
+                               ) \
+                       ), \
+                       $(PKG_INFO_DIR)/$(lastword $(subst /,$(space),$(pkg))).$(variant).install \
+               ) \
+       )
 
 $(curdir)/cleanup: $(TMP_DIR)/.build
        rm -rf $(STAGING_DIR_ROOT)
@@ -106,10 +117,35 @@ $(curdir)/install: $(TMP_DIR)/.build
        $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
        $(call mklibs)
 
+PASSOPT=""
+PASSARG=""
+ifndef CONFIG_OPKGSMIME_PASSPHRASE
+  ifneq ($(call qstrip,$(CONFIG_OPKGSMIME_PASSFILE)),)
+    PASSOPT="-passin"
+    PASSARG="file:$(call qstrip,$(CONFIG_OPKGSMIME_PASSFILE))"
+  endif
+endif
+
 $(curdir)/index: FORCE
-       @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
-               gzip -9c Packages > Packages.gz \
-       )
+       @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 Signing package index...
+       @(cd $(PACKAGE_DIR); \
+               openssl smime -binary -in Packages.gz \
+                       -out Packages.sig -outform PEM -sign \
+                       -signer $(CONFIG_OPKGSMIME_CERT) \
+                       -inkey $(CONFIG_OPKGSMIME_KEY) \
+                       $(PASSOPT) $(PASSARG) )
+endif
+endif
 
 $(curdir)/preconfig: