X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2FMakefile;h=cc691b5ad2080e19ee74f5f614aa13f46ca8dd18;hb=5ba6ef147f6dfbef84bb4e4ffe564cb7240ea19b;hp=94b807f5d54757c63f60d26fbb626ef894282058;hpb=15e34192d77fbb711203b92db4b439f830e5a7b7;p=openwrt.git diff --git a/package/Makefile b/package/Makefile index 94b807f5d5..cc691b5ad2 100644 --- a/package/Makefile +++ b/package/Makefile @@ -41,7 +41,7 @@ ifdef CONFIG_USE_MKLIBS --sysroot $(STAGING_DIR_ROOT) \ `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, \ + $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so ld-musl-*.so.*, \ $(STAGING_DIR_ROOT)/lib/$(name) \ )))) \ --target $(REAL_GNU_TARGET_NAME) \ @@ -111,6 +111,10 @@ $(curdir)/install: $(TMP_DIR)/.build cd $(TARGET_DIR); \ for script in ./usr/lib/opkg/info/*.postinst; do \ IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) $$script; \ + done; \ + for script in ./etc/init.d/*; do \ + grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ + IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) ./etc/rc.common $$script enable; \ done || true \ ) @-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf @@ -132,7 +136,11 @@ endif PACKAGE_SUBDIRS=. ifneq ($(CONFIG_PER_FEED_REPO),) - PACKAGE_SUBDIRS=base $(FEEDS_ENABLED) + ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),) + PACKAGE_SUBDIRS=base $(FEEDS_AVAILABLE) + else + PACKAGE_SUBDIRS=base $(FEEDS_ENABLED) + endif endif $(curdir)/index: FORCE @@ -141,7 +149,7 @@ $(curdir)/index: FORCE mkdir -p $(PACKAGE_DIR)/$$d; \ cd $(PACKAGE_DIR)/$$d || continue; \ $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \ - gzip -9c Packages > Packages.gz; \ + gzip -9nc Packages > Packages.gz; \ ); done ifdef CONFIG_SIGNED_PACKAGES @echo Signing package index...