X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2FMakefile;h=5d942ca78391733b13ce1278de2408115c62b0f4;hb=d4c6868027273aee151dcc201cea4aba2ac172d0;hp=2180df3b37b0cef89c4f95d36c8c440bc6a68562;hpb=c5a65a03735d00b756ad580d4ef829716295ff6a;p=oweals%2Fopenwrt.git diff --git a/package/Makefile b/package/Makefile index 2180df3b37..5d942ca783 100644 --- a/package/Makefile +++ b/package/Makefile @@ -14,7 +14,7 @@ ifeq ($(SDK),1) else $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) - $(curdir)/builddirs-install:=. $(sort $(package-y)) + $(curdir)/builddirs-install:=. $(filter-out base-files,$(sort $(package-y))) $(filter base-files,$(package-y)) endif 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-)) @@ -38,7 +38,7 @@ ifdef CONFIG_USE_MKLIBS file -r -N -F '' {} + | \ awk ' /shared object/ { print $$1 }' >> $(TMP_DIR)/mklibs-progs mkdir -p $(TMP_DIR)/mklibs-out - $(STAGING_DIR_HOST)/bin/mklibs.py -D \ + $(STAGING_DIR_HOST)/bin/mklibs -D \ -d $(TMP_DIR)/mklibs-out \ --sysroot $(STAGING_DIR_ROOT) \ -L /lib \ @@ -85,6 +85,7 @@ $(curdir)/rootfs-prepare: $(TMP_DIR)/.build @-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf @-find $(TARGET_DIR) -name .svn | $(XARGS) rm -rf @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f + rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg) $(call mklibs)