X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2FMakefile;h=8726e2eae9c741ca073a56bfd279e8cd8661ee75;hp=a6b34be0f485c650971e1771de417ec6aa666cc6;hb=82aa061251f9efa68bea8fd4f3bcfb28d3654d5a;hpb=44249f71a863682ab2569c4794ed2a98bd59c1d9 diff --git a/package/Makefile b/package/Makefile index a6b34be0f4..8726e2eae9 100644 --- a/package/Makefile +++ b/package/Makefile @@ -7,7 +7,7 @@ curdir:=package -include $(INCLUDE_DIR)/feeds.mk +include $(INCLUDE_DIR)/rootfs.mk -include $(TMP_DIR)/.packagedeps $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m)) @@ -20,60 +20,13 @@ ifneq ($(IGNORE_ERRORS),) package-n-filter := $(filter-out $(package-y) $(package-m),$(package-)) package-ignore-errors := $(filter n m y,$(IGNORE_ERRORS)) package-ignore-errors := $(if $(package-ignore-errors),$(package-ignore-errors),n m) - $(curdir)/builddirs-ignore-download := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter)) - $(curdir)/builddirs-ignore-compile := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter)) + package-ignore-subdirs := $(sort $(foreach m,$(package-ignore-errors),$(package-$(m)-filter))) + $(curdir)/builddirs-ignore-download := $(package-ignore-subdirs) + $(curdir)/builddirs-ignore-compile := $(package-ignore-subdirs) + $(curdir)/builddirs-ignore-host-download := $(package-ignore-subdirs) + $(curdir)/builddirs-ignore-host-compile := $(package-ignore-subdirs) endif -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-libs - mkdir -p $(TMP_DIR)/mklibs-out - $(STAGING_DIR_HOST)/bin/mklibs -D \ - -d $(TMP_DIR)/mklibs-out \ - --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, \ - $(STAGING_DIR_ROOT)/lib/$(name) \ - )))) \ - --target $(REAL_GNU_TARGET_NAME) \ - `cat $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-libs` 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 - -# where to build (and put) .ipk packages -OPKG:= \ - IPKG_NO_SCRIPT=1 \ - IPKG_TMP=$(TMP_DIR)/ipkg \ - IPKG_INSTROOT=$(TARGET_DIR) \ - IPKG_CONF_DIR=$(STAGING_DIR)/etc \ - IPKG_OFFLINE_ROOT=$(TARGET_DIR) \ - $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \ - --offline-root $(TARGET_DIR) \ - --force-depends \ - --force-overwrite \ - --force-postinstall \ - --force-maintainer \ - --add-dest root:/ \ - --add-arch all:100 \ - --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 - PACKAGE_INSTALL_FILES:= \ $(foreach pkg,$(sort $(package-y)), \ $(foreach variant, \ @@ -91,35 +44,31 @@ PACKAGE_INSTALL_FILES:= \ $(curdir)/cleanup: $(TMP_DIR)/.build rm -rf $(STAGING_DIR_ROOT) -$(curdir)/install: $(TMP_DIR)/.build +$(curdir)/merge: + rm -rf $(PACKAGE_DIR_ALL) + mkdir -p $(PACKAGE_DIR_ALL) + -$(foreach pdir,$(PACKAGE_SUBDIRS),$(if $(wildcard $(pdir)/*.ipk),ln -s $(pdir)/*.ipk $(PACKAGE_DIR_ALL);)) + +$(curdir)/merge-index: $(curdir)/merge + (cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; ) + +$(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index) - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 - rm -rf $(TARGET_DIR) + rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG) [ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp - @$(FIND) `sed -e 's|.*|$(PACKAGE_DIR)$(if $(CONFIG_PER_FEED_REPO),/*)/&_*.ipk|' $(PACKAGE_INSTALL_FILES)` | sort -u | $(OPKG) install + $(call opkg,$(TARGET_DIR)) install \ + $(call opkg_package_files,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null)) @for file in $(PACKAGE_INSTALL_FILES); do \ [ -s $$file.flags ] || continue; \ for flag in `cat $$file.flags`; do \ - $(OPKG) flag $$flag < $$file; \ + $(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \ done; \ done || true @-$(MAKE) package/preconfig - @if [ -d $(TOPDIR)/files ]; then \ - $(call file_copy,$(TOPDIR)/files/.,$(TARGET_DIR)); \ - fi - @mkdir -p $(TARGET_DIR)/etc/rc.d - @( \ - cd $(TARGET_DIR); \ - for script in ./usr/lib/opkg/info/*.postinst; do \ - IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) $$script; \ - done || true \ - ) - @-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* - rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.prerm* - $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg) - $(call mklibs) + + $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG) + + $(call prepare_rootfs,$(TARGET_DIR)) PASSOPT="" PASSARG="" @@ -130,19 +79,22 @@ ifndef CONFIG_OPKGSMIME_PASSPHRASE endif endif -PACKAGE_SUBDIRS=. -ifneq ($(CONFIG_PER_FEED_REPO),) - PACKAGE_SUBDIRS=base $(FEEDS_ENABLED) -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 $$d; \ + cd $$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... + @for d in $(PACKAGE_SUBDIRS); do ( \ + [ -d $$d ] && \ + cd $$d || continue; \ + $(STAGING_DIR_HOST)/bin/usign -S -m Packages -s $(BUILD_KEY); \ + ); done +else ifeq ($(call qstrip,$(CONFIG_OPKGSMIME_KEY)),) @echo Signing key has not been configured else @@ -151,8 +103,8 @@ ifeq ($(call qstrip,$(CONFIG_OPKGSMIME_CERT)),) else @echo Signing package index... @for d in $(PACKAGE_SUBDIRS); do ( \ - [ -d $(PACKAGE_DIR)/$$d ] && \ - cd $(PACKAGE_DIR)/$$d || continue; \ + [ -d $$d ] && \ + cd $$d || continue; \ openssl smime -binary -in Packages.gz \ -out Packages.sig -outform PEM -sign \ -signer $(CONFIG_OPKGSMIME_CERT) \ @@ -161,6 +113,7 @@ else ); done endif endif +endif $(curdir)/preconfig: