X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=package%2FMakefile;h=cc691b5ad2080e19ee74f5f614aa13f46ca8dd18;hb=2927e32debc915a380376cd2da03ac82b36f0353;hp=d5212f09a84fd0867fc2498439b2b9de93bec59f;hpb=beca028bd6bb71898052faadff680d8e76f61eb3;p=lede.git diff --git a/package/Makefile b/package/Makefile index d5212f09a8..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,16 +136,20 @@ 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 @echo Generating package index... @for d in $(PACKAGE_SUBDIRS); do ( \ - [ -d $(PACKAGE_DIR)/$$d ] && \ - cd $(PACKAGE_DIR)/$$d || continue; \ + 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...