X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fpackage-ipkg.mk;h=eb4c874047e8a9e24a4d77b13f7ba66e1221cbb5;hp=494444613ae66079e883907bfa3520513827482c;hb=fb152a810c1aed05cd4ad5fb90bd9c378aec60c3;hpb=d6dbc22bbcde78bbc378ca3f006771a2b074ff2e diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 494444613a..eb4c874047 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -9,14 +9,19 @@ include $(INCLUDE_DIR)/feeds.mk # invoke ipkg-build with some default options IPKG_BUILD:= \ - ipkg-build -c -o 0 -g 0 + $(SCRIPT_DIR)/ipkg-build -c -o 0 -g 0 IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg +# 1: package name +# 2: variable name +# 3: variable suffix +# 4: file is a script define BuildIPKGVariable ifdef Package/$(1)/$(2) + $$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2)) $(call shexport,Package/$(1)/$(2)) - $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2)$(3); + $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3); $(if $(4),chmod 0755 $(2)$(3);) endif endef @@ -62,7 +67,7 @@ ifneq ($(PKG_NAME),toolchain) XARGS="$(XARGS)"; \ $(SCRIPT_DIR)/gen-dependencies.sh "$$(IDIR_$(1))"; \ ) | while read FILE; do \ - grep -q "$$$$FILE" $(PKG_INFO_DIR)/$(1).provides || \ + grep -qxF "$$$$FILE" $(PKG_INFO_DIR)/$(1).provides || \ echo "$$$$FILE" >> $(PKG_INFO_DIR)/$(1).missing; \ done; \ if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \ @@ -74,6 +79,13 @@ ifneq ($(PKG_NAME),toolchain) endef endif +_addsep=$(word 1,$(1))$(foreach w,$(wordlist 2,$(words $(1)),$(1)),$(strip $(2) $(w))) +_cleansep=$(subst $(space)$(2)$(space),$(2)$(space),$(1)) +mergelist=$(call _cleansep,$(call _addsep,$(1),$(comma)),$(comma)) +addfield=$(if $(strip $(2)),$(1): $(2)) +_define=define +_endef=endef + ifeq ($(DUMP),) define BuildTarget/ipkg PDIR_$(1):=$(call FeedPackageDir,$(1)) @@ -102,9 +114,7 @@ ifeq ($(DUMP),) echo "$(1)" >> $(PKG_INSTALL_STAMP) endif else - compile: $(1)-disabled - $(1)-disabled: - @echo "WARNING: skipping $(1) -- package not selected" >&2 + $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected)) endif endif endif @@ -116,10 +126,10 @@ ifeq ($(DUMP),) $(FixupReverseDependencies) $(eval $(call BuildIPKGVariable,$(1),conffiles)) - $(eval $(call BuildIPKGVariable,$(1),preinst)) - $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg)) - $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg)) - $(eval $(call BuildIPKGVariable,$(1),postrm)) + $(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) @@ -134,7 +144,32 @@ ifeq ($(DUMP),) echo '$(ABI_VERSION)' | cmp -s - $$@ || \ echo '$(ABI_VERSION)' > $$@ + Package/$(1)/DEPENDS := $$(call mergelist,$$(filter-out @%,$$(IDEPEND_$(1)))) + ifneq ($$(EXTRA_DEPENDS),) + Package/$(1)/DEPENDS := $$(EXTRA_DEPENDS)$$(if $$(Package/$(1)/DEPENDS),$$(comma) $$(Package/$(1)/DEPENDS)) + endif + +$(_define) Package/$(1)/CONTROL +Package: $(1) +Version: $(VERSION) +$$(call addfield,Depends,$$(Package/$(1)/DEPENDS) +)$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS)) +)$$(call addfield,Provides,$(PROVIDES) +)$$(call addfield,Source,$(SOURCE) +)$$(call addfield,License,$$(PKG_LICENSE) +)$$(call addfield,LicenseFiles,$$(PKG_LICENSE_FILES) +)$$(call addfield,Section,$(SECTION) +)$$(call addfield,Require-User,$(USERID) +)$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed +)$(if $(filter essential,$(PKG_FLAGS)),Essential: yes +)$(if $(MAINTAINER),Maintainer: $(MAINTAINER) +)Architecture: $(PKGARCH) +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)) mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR) @@ -152,40 +187,24 @@ ifeq ($(DUMP),) $(CheckDependencies) $(RSTRIP) $$(IDIR_$(1)) - ( \ - echo "Package: $(1)"; \ - echo "Version: $(VERSION)"; \ - DEPENDS='$(EXTRA_DEPENDS)'; \ - for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ - DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ - done; \ - [ -z "$$$$DEPENDS" ] || echo "Depends: $$$$DEPENDS"; \ - $(if $(PROVIDES), echo "Provides: $(PROVIDES)"; ) \ - echo "Source: $(SOURCE)"; \ - $(if $(PKG_LICENSE), echo "License: $(PKG_LICENSE)"; ) \ - $(if $(PKG_LICENSE_FILES), echo "LicenseFiles: $(PKG_LICENSE_FILES)"; ) \ - echo "Section: $(SECTION)"; \ - $(if $(USERID),echo "Require-User: $(USERID)"; ) \ - $(if $(filter hold,$(PKG_FLAGS)),echo "Status: unknown hold not-installed"; ) \ - $(if $(filter essential,$(PKG_FLAGS)), echo "Essential: yes"; ) \ - $(if $(MAINTAINER),echo "Maintainer: $(MAINTAINER)"; ) \ - echo "Architecture: $(PKGARCH)"; \ - echo "Installed-Size: 0"; \ - echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \ - ) > $$(IDIR_$(1))/CONTROL/control - chmod 644 $$(IDIR_$(1))/CONTROL/control - ( \ - echo "#!/bin/sh"; \ - echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ - echo "default_postinst \$$$$0 \$$$$@"; \ - ) > $$(IDIR_$(1))/CONTROL/postinst - ( \ - echo "#!/bin/sh"; \ - echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ - echo "default_prerm \$$$$0 \$$$$@"; \ - ) > $$(IDIR_$(1))/CONTROL/prerm - chmod 0755 $$(IDIR_$(1))/CONTROL/prerm - $(SH_FUNC) (cd $$(IDIR_$(1))/CONTROL; \ + (cd $$(IDIR_$(1))/CONTROL; \ + ( \ + echo "$$$$CONTROL"; \ + printf "Description: "; echo "$$$$DESCRIPTION" | sed -e 's,^[[:space:]]*, ,g'; \ + ) > control; \ + chmod 644 control; \ + ( \ + echo "#!/bin/sh"; \ + echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \ + echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ + echo "default_postinst \$$$$0 \$$$$@"; \ + ) > postinst; \ + ( \ + echo "#!/bin/sh"; \ + echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ + echo "default_prerm \$$$$0 \$$$$@"; \ + ) > prerm; \ + chmod 0755 postinst prerm; \ $($(1)_COMMANDS) \ )