X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2FMakefile;h=2180df3b37b0cef89c4f95d36c8c440bc6a68562;hp=31f03c01bbc878e3973f76c148325fa15fc4021f;hb=807bf36c8dfe1a04b8c52f60ece1559c8ea380d7;hpb=bdb2fea3b5d3084ba449f8925afeeaa61e10052a

diff --git a/package/Makefile b/package/Makefile
index 31f03c01bb..2180df3b37 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,43 +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$
 
 curdir:=package
 
-include .config
 -include $(TMP_DIR)/.packagedeps
 $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
-$(curdir)/builddirs-compile:=$(sort $(package-y) $(package-m))
-$(curdir)/builddirs-install:=. $(sort $(package-y))
-$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
+ifeq ($(SDK),1)
+  $(curdir)/builddirs-install:=.
+else
+  $(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
 
-$(curdir)//compile:=.config prereq
 $(curdir)/install:=$(curdir)/install-cleanup
-$(curdir)/install-cleanup:
-	rm -rf $(BUILD_DIR)/root
-	$(MAKE) install-targets
-	$(MAKE) preconfig
+
+$(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
+
+$(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
+	@-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 . > Packages)
+	@(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
+		gzip -9c Packages > Packages.gz \
+	)
+
+$(curdir)/flags-install:= -j1
+
+$(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))
 
-$(eval $(call stampfile,$(curdir),package,prereq))
 $(eval $(call subdir,$(curdir)))