X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9fb3820df1d6e082addabfe88d7121b70c371dfd..69c230b37fac79fb9b4d8ee261fc49c29dd7e95b:/package/Makefile diff --git a/package/Makefile b/package/Makefile index f6c08e10a..7d2c42d8b 100644 --- a/package/Makefile +++ b/package/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -14,15 +14,16 @@ 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 m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(m))),$(package-m)) + $(curdir)/builddirs-ignore-compile:= $(if $(filter n m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(subst n,,$(m)))),$(package-m) $(package-)) endif $(curdir)/install:=$(curdir)/install-cleanup $(curdir)/cleanup: $(TMP_DIR)/.build + - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT) ifdef CONFIG_USE_MKLIBS @@ -42,8 +43,9 @@ ifdef CONFIG_USE_MKLIBS --sysroot $(STAGING_DIR_ROOT) \ -L /lib \ -L /usr/lib \ + -L /usr/lib/ebtables \ --ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \ - $(foreach name,ld-uClibc.so.* ld-linux.so.*, \ + $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so, \ $(STAGING_DIR_ROOT)/lib/$(name) \ )))) \ --target $(REAL_GNU_TARGET_NAME) \ @@ -62,6 +64,14 @@ endif $(curdir)/rootfs-prepare: $(TMP_DIR)/.build @-$(MAKE) package/preconfig @if [ -d $(TOPDIR)/files ]; then \ + ( cd $(TOPDIR)/files; find -type f ) | \ + ( cd $(TARGET_DIR); while :; do \ + read FILE; \ + [ -z "$$FILE" ] && break; \ + [ -L "$$FILE" ] || continue; \ + echo "Removing symlink $(TARGET_DIR)/$$FILE"; \ + rm -f "$$FILE"; \ + done; ); \ $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \ fi @mkdir -p $(TARGET_DIR)/etc/rc.d @@ -75,11 +85,12 @@ $(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 - $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/ipkg) + rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst + $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg) $(call mklibs) $(curdir)/index: FORCE - @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ + @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \ gzip -9c Packages > Packages.gz \ )