build: clean up and optimize ipkg control generator code

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43017
This commit is contained in:
Felix Fietkau 2014-10-22 08:57:16 +00:00
parent 364fb4dacb
commit d081edf7eb
3 changed files with 53 additions and 45 deletions

View File

@ -15,8 +15,8 @@ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
define BuildIPKGVariable define BuildIPKGVariable
ifdef Package/$(1)/$(2) ifdef Package/$(1)/$(2)
$(call shexport,Package/$(1)/$(2)) $$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2))
$(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2)$(3); $(1)_COMMANDS += echo "$$$$$(2)$(3)" > $(2)$(3);
endif endif
endef endef
@ -74,6 +74,13 @@ ifneq ($(PKG_NAME),toolchain)
endef endef
endif 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),) ifeq ($(DUMP),)
define BuildTarget/ipkg define BuildTarget/ipkg
PDIR_$(1):=$(call FeedPackageDir,$(1)) PDIR_$(1):=$(call FeedPackageDir,$(1))
@ -132,7 +139,32 @@ ifeq ($(DUMP),)
echo '$(ABI_VERSION)' | cmp -s - $$@ || \ echo '$(ABI_VERSION)' | cmp -s - $$@ || \
echo '$(ABI_VERSION)' > $$@ 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)) $(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 $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
@rm -rf $$(PDIR_$(1))/$(1)_* $$(IDIR_$(1)) @rm -rf $$(PDIR_$(1))/$(1)_* $$(IDIR_$(1))
mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR) mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)
@ -150,46 +182,24 @@ ifeq ($(DUMP),)
$(CheckDependencies) $(CheckDependencies)
$(RSTRIP) $$(IDIR_$(1)) $(RSTRIP) $$(IDIR_$(1))
( \ (cd $$(IDIR_$(1))/CONTROL; \
echo "Package: $(1)"; \ ( \
echo "Version: $(VERSION)"; \ echo "$$$$CONTROL"; \
DEPENDS='$(EXTRA_DEPENDS)'; \ echo -n "Description: "; echo "$$$$DESCRIPTION" | sed -e 's,^[[:space:]]*, ,g'; \
for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ ) > control; \
DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ chmod 644 control; \
done; \ ( \
[ -z "$$$$DEPENDS" ] || echo "Depends: $$$$DEPENDS"; \ echo "#!/bin/sh"; \
CONFLICTS=''; \ echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \
for conflict in $(CONFLICTS); do \ echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
CONFLICTS=$$$${CONFLICTS:+$$$$CONFLICTS, }$$$$conflict; \ echo "default_postinst \$$$$0 \$$$$@"; \
done; \ ) > postinst; \
[ -z "$$$$CONFLICTS" ] || echo "Conflicts: $$$$CONFLICTS"; \ ( \
$(if $(PROVIDES), echo "Provides: $(PROVIDES)"; ) \ echo "#!/bin/sh"; \
echo "Source: $(SOURCE)"; \ echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
$(if $(PKG_LICENSE), echo "License: $(PKG_LICENSE)"; ) \ echo "default_prerm \$$$$0 \$$$$@"; \
$(if $(PKG_LICENSE_FILES), echo "LicenseFiles: $(PKG_LICENSE_FILES)"; ) \ ) > prerm; \
echo "Section: $(SECTION)"; \ chmod 0755 prerm; \
$(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_NO_SCRIPT}\" = \"1\" ] && exit 0"; \
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; \
$($(1)_COMMANDS) \ $($(1)_COMMANDS) \
) )

View File

@ -251,9 +251,6 @@ endif
endif endif
) )
$(call shexport,Package/$(1)/description)
$(call shexport,Package/$(1)/config)
$(if $(DUMP), \ $(if $(DUMP), \
$(Dumpinfo/Package), \ $(Dumpinfo/Package), \
$(foreach target, \ $(foreach target, \

View File

@ -21,6 +21,7 @@ qstrip=$(strip $(subst ",,$(1)))
empty:= empty:=
space:= $(empty) $(empty) space:= $(empty) $(empty)
comma:=,
merge=$(subst $(space),,$(1)) merge=$(subst $(space),,$(1))
confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n))) confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n)))
strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1)) strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))