X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fpackage-ipkg.mk;h=9e2717e788cc21457df15162a0926aa6ad7db6ec;hp=36091dcc81f7eb259b2eb996ecacb26f3585ff02;hb=f4b9d9d6f13c898d473ce678234339e4a9dba5b2;hpb=765c73f3094dfbba2ed03a64c1133c280db5a4de diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 36091dcc81..9e2717e788 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -5,7 +5,9 @@ # See /LICENSE for more information. # -include $(INCLUDE_DIR)/feeds.mk +ifndef DUMP + include $(INCLUDE_DIR)/feeds.mk +endif # invoke ipkg-build with some default options IPKG_BUILD:= \ @@ -21,7 +23,7 @@ define BuildIPKGVariable ifdef Package/$(1)/$(2) $$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2)) $(call shexport,Package/$(1)/$(2)) - $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3); $(if $(4),chmod 0755 $(2)$(3)); + $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3); $(if $(4),chmod 0755 $(2)$(3);) endif endef @@ -94,28 +96,29 @@ ifeq ($(DUMP),) KEEP_$(1):=$(strip $(call Package/$(1)/conffiles)) ifeq ($(BUILD_VARIANT),$$(if $$(VARIANT),$$(VARIANT),$(BUILD_VARIANT))) + do_install= ifdef Package/$(1)/install + do_install=yes + endif + ifdef Package/$(1)/install-overlay + do_install=yes + endif + ifdef do_install ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) IPKGS += $(1) - compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(STAGING_DIR_ROOT)/stamp/.$(1)_installed - ifneq ($(ABI_VERSION),) - compile: $(PKG_INFO_DIR)/$(1).version - endif - - ifeq ($(CONFIG_PACKAGE_$(1)),y) - .PHONY: $(PKG_INSTALL_STAMP).$(1) - compile: $(PKG_INSTALL_STAMP).$(1) - $(PKG_INSTALL_STAMP).$(1): - if [ -f $(PKG_INSTALL_STAMP).clean ]; then \ - rm -f \ - $(PKG_INSTALL_STAMP) \ - $(PKG_INSTALL_STAMP).clean; \ - fi; \ - echo "$(1)" >> $(PKG_INSTALL_STAMP) - endif + $(_pkg_target)compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(PKG_BUILD_DIR)/.pkgdir/$(1).installed + prepare-package-install: $$(IPKG_$(1)) + compile: $(STAGING_DIR_ROOT)/stamp/.$(1)_installed else $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected)) endif + + .PHONY: $(PKG_INSTALL_STAMP).$(1) + ifeq ($(CONFIG_PACKAGE_$(1)),y) + compile: $(PKG_INSTALL_STAMP).$(1) + endif + $(PKG_INSTALL_STAMP).$(1): prepare-package-install + echo "$(1)" >> $(PKG_INSTALL_STAMP) endif endif @@ -129,20 +132,21 @@ ifeq ($(DUMP),) $(eval $(call BuildIPKGVariable,$(1),preinst,,1)) $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg,1)) $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg,1)) - $(eval $(call BuildIPKGVariable,$(1),postrm,1)) - - $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT) - rm -rf $(STAGING_DIR_ROOT)/tmp-$(1) - mkdir -p $(STAGING_DIR_ROOT)/stamp $(STAGING_DIR_ROOT)/tmp-$(1) - $(call Package/$(1)/install,$(STAGING_DIR_ROOT)/tmp-$(1)) - $(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)/tmp-$(1)) - $(call locked,$(CP) $(STAGING_DIR_ROOT)/tmp-$(1)/. $(STAGING_DIR_ROOT)/,root-copy) - rm -rf $(STAGING_DIR_ROOT)/tmp-$(1) + $(eval $(call BuildIPKGVariable,$(1),postrm,,1)) + + $(PKG_BUILD_DIR)/.pkgdir/$(1).installed : export PATH=$$(TARGET_PATH_PKG) + $(PKG_BUILD_DIR)/.pkgdir/$(1).installed: $(STAMP_BUILT) + rm -rf $$@ $(PKG_BUILD_DIR)/.pkgdir/$(1) + mkdir -p $(PKG_BUILD_DIR)/.pkgdir/$(1) + $(call Package/$(1)/install,$(PKG_BUILD_DIR)/.pkgdir/$(1)) + $(call Package/$(1)/install_lib,$(PKG_BUILD_DIR)/.pkgdir/$(1)) touch $$@ - $(PKG_INFO_DIR)/$(1).version: $$(IPKG_$(1)) - echo '$(ABI_VERSION)' | cmp -s - $$@ || \ - echo '$(ABI_VERSION)' > $$@ + $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed + mkdir -p $(STAGING_DIR_ROOT)/stamp + $(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version) + $(call locked,$(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(STAGING_DIR_ROOT)/,root-copy) + touch $$@ Package/$(1)/DEPENDS := $$(call mergelist,$$(filter-out @%,$$(IDEPEND_$(1)))) ifneq ($$(EXTRA_DEPENDS),) @@ -154,10 +158,11 @@ Package: $(1) Version: $(VERSION) $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS)) -)$$(call addfield,Provides,$(PROVIDES) +)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES)) +)$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES)) )$$(call addfield,Source,$(SOURCE) -)$$(call addfield,License,$$(PKG_LICENSE) -)$$(call addfield,LicenseFiles,$$(PKG_LICENSE_FILES) +)$$(call addfield,License,$(LICENSE) +)$$(call addfield,LicenseFiles,$(LICENSE_FILES) )$$(call addfield,Section,$(SECTION) )$$(call addfield,Require-User,$(USERID) )$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed @@ -167,13 +172,15 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) Installed-Size: 0 $(_endef) - $(PKG_INFO_DIR)/$(1).provides: $$(IPKG_$(1)) $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL) $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description) - $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk - @rm -rf $$(PDIR_$(1))/$(1)_* $$(IDIR_$(1)) + $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG) + $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk + @rm -rf $$(IDIR_$(1)) $$(call opkg_package_files,$(1)) mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR) $(call Package/$(1)/install,$$(IDIR_$(1))) + $(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay) + $(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay) -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf @( \ find $$(IDIR_$(1)) -name lib\*.so\* -or -name \*.ko | awk -F/ '{ print $$$$NF }'; \ @@ -196,11 +203,13 @@ $(_endef) ( \ echo "#!/bin/sh"; \ echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \ + echo "[ -x "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ echo "default_postinst \$$$$0 \$$$$@"; \ ) > postinst; \ ( \ echo "#!/bin/sh"; \ + echo "[ -x "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ echo "default_prerm \$$$$0 \$$$$@"; \ ) > prerm; \ @@ -226,7 +235,7 @@ $(_endef) @[ -f $$(IPKG_$(1)) ] $(1)-clean: - rm -f $$(PDIR_$(1))/$(1)_* + $$(if $$(call opkg_package_files,$(1)),rm -f $$(call opkg_package_files,$(1))) clean: $(1)-clean