X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2FMakefile;h=aa5d52251625a4b7a2febe351e3d0e5f3c4cea7a;hp=3c7b0b49bc477b02a45d3aae27fd3201224596e0;hb=0a6919b8bcc1d7bd638391637044dde76dee01a3;hpb=ceeb9a8013e4416953d7ced30893ff87375a85b9 diff --git a/package/Makefile b/package/Makefile index 3c7b0b49bc..aa5d522516 100644 --- a/package/Makefile +++ b/package/Makefile @@ -7,50 +7,45 @@ curdir:=package +include $(INCLUDE_DIR)/feeds.mk + -include $(TMP_DIR)/.packagedeps $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m)) -ifeq ($(SDK),1) - $(curdir)/builddirs-install:=. -else - $(curdir)/base-files/compile += $(curdir)/opkg/host/compile - $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) - $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) - $(curdir)/builddirs-install:=. $(sort $(package-y)) -endif +$(curdir)/builddirs-install:=. +$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) +$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) ifneq ($(IGNORE_ERRORS),) - $(curdir)/builddirs-ignore-compile:= $(if $(filter m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(m))),$(package-m)) + package-y-filter := $(package-y) + package-m-filter := $(filter-out $(package-y),$(package-m)) + 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)) 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 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 \ + 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 + awk ' /shared object/ { print $$1 }' > $(TMP_DIR)/mklibs-libs 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 \ - -L /usr/lib \ - -L /usr/lib/ebtables \ + `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, \ + $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so ld-musl-*.so.*, \ $(STAGING_DIR_ROOT)/lib/$(name) \ )))) \ --target $(REAL_GNU_TARGET_NAME) \ - `cat $(TMP_DIR)/mklibs-progs` 2>&1 + `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##*/}"; \ @@ -62,14 +57,61 @@ ifdef CONFIG_USE_MKLIBS endef endif -$(curdir)/rootfs-prepare: $(TMP_DIR)/.build +# 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, \ + $(if $(strip $(package/$(pkg)/variants)), \ + $(package/$(pkg)/variants), \ + $(if $(package/$(pkg)/default-variant), \ + $(package/$(pkg)/default-variant), \ + default \ + ) \ + ), \ + $(PKG_INFO_DIR)/$(lastword $(subst /,$(space),$(pkg))).$(variant).install \ + ) \ + ) + +$(curdir)/cleanup: $(TMP_DIR)/.build + rm -rf $(STAGING_DIR_ROOT) + +$(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install + - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 + rm -rf $(TARGET_DIR) + [ -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 + @for file in $(PACKAGE_INSTALL_FILES); do \ + [ -s $$file.flags ] || continue; \ + for flag in `cat $$file.flags`; do \ + $(OPKG) flag $$flag < $$file; \ + done; \ + done || true @-$(MAKE) package/preconfig @if [ -d $(TOPDIR)/files ]; then \ - $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \ + $(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; \ for script in ./etc/init.d/*; do \ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ IPKG_INSTROOT=$(TARGET_DIR) $$(which bash) ./etc/rc.common $$script enable; \ @@ -78,20 +120,72 @@ $(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* + rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.prerm* $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg) $(call mklibs) +PASSOPT="" +PASSARG="" +ifndef CONFIG_OPKGSMIME_PASSPHRASE + ifneq ($(call qstrip,$(CONFIG_OPKGSMIME_PASSFILE)),) + PASSOPT="-passin" + PASSARG="file:$(call qstrip,$(CONFIG_OPKGSMIME_PASSFILE))" + endif +endif + +PACKAGE_SUBDIRS=. +ifneq ($(CONFIG_PER_FEED_REPO),) + ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),) + PACKAGE_SUBDIRS=base $(FEEDS_AVAILABLE) + else + PACKAGE_SUBDIRS=base $(FEEDS_ENABLED) + endif +endif + $(curdir)/index: FORCE - @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ - gzip -9c Packages > Packages.gz \ - ) + @echo Generating package index... + @for d in $(PACKAGE_SUBDIRS); do ( \ + mkdir -p $(PACKAGE_DIR)/$$d; \ + cd $(PACKAGE_DIR)/$$d || continue; \ + $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \ + gzip -9nc Packages > Packages.gz; \ + ); done +ifdef CONFIG_SIGNED_PACKAGES + @echo Signing package index... + @for d in $(PACKAGE_SUBDIRS); do ( \ + [ -d $(PACKAGE_DIR)/$$d ] && \ + cd $(PACKAGE_DIR)/$$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 +ifeq ($(call qstrip,$(CONFIG_OPKGSMIME_CERT)),) + @echo Certificate has not been configured +else + @echo Signing package index... + @for d in $(PACKAGE_SUBDIRS); do ( \ + [ -d $(PACKAGE_DIR)/$$d ] && \ + cd $(PACKAGE_DIR)/$$d || continue; \ + openssl smime -binary -in Packages.gz \ + -out Packages.sig -outform PEM -sign \ + -signer $(CONFIG_OPKGSMIME_CERT) \ + -inkey $(CONFIG_OPKGSMIME_KEY) \ + $(PASSOPT) $(PASSARG); \ + ); done +endif +endif +endif + +$(curdir)/preconfig: $(curdir)/flags-install:= -j1 $(eval $(call stampfile,$(curdir),package,prereq,.config)) -$(eval $(call stampfile,$(curdir),package,cleanup)) -$(eval $(call stampfile,$(curdir),package,compile)) -$(eval $(call stampfile,$(curdir),package,install)) -$(eval $(call stampfile,$(curdir),package,rootfs-prepare)) +$(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 subdir,$(curdir)))