X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2FMakefile;h=2180df3b37b0cef89c4f95d36c8c440bc6a68562;hp=94241dbc3d860c5d875c22ea47789377cf1f7753;hb=807bf36c8dfe1a04b8c52f60ece1559c8ea380d7;hpb=5fe0ca4ebba70d3eba9680e31bd1cc218c21124a diff --git a/package/Makefile b/package/Makefile index 94241dbc3d..2180df3b37 100644 --- a/package/Makefile +++ b/package/Makefile @@ -1,85 +1,104 @@ -# -# Copyright (C) 2006 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. # -# $Id$ - -include $(TOPDIR)/rules.mk -include $(TOPDIR)/.config -include $(INCLUDE_DIR)/host.mk - -all: compile - -include $(TMP_DIR)/.packagedeps -PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) -DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) -COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) -INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) +curdir:=package -$(STAMP_DIR) $(TARGET_DIR): - mkdir -p $@ - -ifeq ($(QUIET),1) -%-compile %-install: FORCE - $(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; } - -%-prepare %-prereq %-download %-clean: FORCE +-include $(TMP_DIR)/.packagedeps +$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m)) +ifeq ($(SDK),1) + $(curdir)/builddirs-install:=. else -%-prepare %-prereq %-download %-clean %-compile %-install: FORCE + $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) + $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) + $(curdir)/builddirs-install:=. $(sort $(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-)) endif - $(MAKE) -C $* $(patsubst $*-%,%,$@) - -%-refresh %-update: - -$(MAKE) -C $* $(patsubst $*-%,%,$@) - - -# .IGNORE: $(COMPILE_PACKAGES) - -$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo - @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@ -preconfig: -clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) -prereq: $(PREREQ_PACKAGES) -download: $(DOWNLOAD_PACKAGES) -compile: $(COMPILE_PACKAGES) -ifneq ($(QUILT),) - refresh: $(patsubst %,%-refresh,$(package-y) $(package-m) $(package-)) +$(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 + define mklibs + rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out + # first find all programs and add them to the mklibs list + find $(STAGING_DIR_ROOT) -type f -perm +100 -exec \ + file -r -N -F '' {} + | \ + awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs + # 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 + mkdir -p $(TMP_DIR)/mklibs-out + $(STAGING_DIR_HOST)/bin/mklibs.py -D \ + -d $(TMP_DIR)/mklibs-out \ + --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.* ld-*.so, \ + $(STAGING_DIR_ROOT)/lib/$(name) \ + )))) \ + --target $(REAL_GNU_TARGET_NAME) \ + `cat $(TMP_DIR)/mklibs-progs` 2>&1 + $(RSTRIP) $(TMP_DIR)/mklibs-out + for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \ + LIB="$${lib##*/}"; \ + DEST="`ls "$(TARGET_DIR)/lib/$$LIB" "$(TARGET_DIR)/usr/lib/$$LIB" 2>/dev/null`"; \ + [ -n "$$DEST" ] || continue; \ + echo "Copying stripped library $$lib to $$DEST"; \ + cp "$$lib" "$$DEST" || exit 1; \ + done + endef endif -install-targets: $(INSTALL_PACKAGES) -install: - rm -rf $(BUILD_DIR)/root - $(MAKE) install-targets - $(MAKE) preconfig +$(curdir)/rootfs-prepare: $(TMP_DIR)/.build + @-$(MAKE) package/preconfig @if [ -d $(TOPDIR)/files ]; then \ - $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \ + ( 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 $(BUILD_DIR)/root/etc/rc.d + @mkdir -p $(TARGET_DIR)/etc/rc.d @( \ - cd $(BUILD_DIR)/root; \ + cd $(TARGET_DIR); \ for script in ./etc/init.d/*; do \ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ - IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \ + IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) ./etc/rc.common $$script enable; \ done || true \ ) - @-find $(BUILD_DIR)/root -name CVS | $(XARGS) rm -rf - @-find $(BUILD_DIR)/root -name .svn | $(XARGS) rm -rf - @-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f - -index: $(PACKAGE_DIR)/Packages + @-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/opkg) + $(call mklibs) + +$(curdir)/index: FORCE + @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \ + gzip -9c Packages > Packages.gz \ + ) -$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk - (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) +$(curdir)/flags-install:= -j1 -symlinks: - ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) +$(eval $(call stampfile,$(curdir),package,prereq,.config)) +$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,rootfs-prepare,$(TMP_DIR)/.build)) -ifeq ($(MAKECMDGOALS),compile) -MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) -else -.NOTPARALLEL: -endif +$(eval $(call subdir,$(curdir)))