diff options
| author | Nicolas Thill <nico@openwrt.org> | 2006-09-24 21:17:17 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2006-09-24 21:17:17 +0000 |
| commit | 647d1dd920011ed75e69b01b42af85459b263b80 (patch) | |
| tree | df2149f76641084b410ca39cdbca366763ac8022 /openwrt | |
| parent | 88b8c4eb63a579667e9815519ca0d910eb5f8cfc (diff) | |
| download | mtk-20170518-647d1dd920011ed75e69b01b42af85459b263b80.zip mtk-20170518-647d1dd920011ed75e69b01b42af85459b263b80.tar.gz mtk-20170518-647d1dd920011ed75e69b01b42af85459b263b80.tar.bz2 | |
fix DESCRIPTION use in menuconfig and ipkg control files
SVN-Revision: 4856
Diffstat (limited to 'openwrt')
| -rw-r--r-- | openwrt/include/package.mk | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/openwrt/include/package.mk b/openwrt/include/package.mk index f7dbacc..709bb44 100644 --- a/openwrt/include/package.mk +++ b/openwrt/include/package.mk @@ -90,6 +90,14 @@ define Package/Default DESCRIPTION:= endef +define BuildDescription + ifneq ($(DESCRIPTION),) + DESCRIPTION:=$(TITLE)\\ $(DESCRIPTION) + else + DESCRIPTION:=$(TITLE) + endif +endef + define BuildIPKGVariable pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) @@ -99,21 +107,14 @@ endef define BuildPackage $(eval $(call Package/Default)) $(eval $(call Package/$(1))) + $(eval $(call BuildDescription)) - $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, + $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION, ifeq ($($(FIELD)),) $$(error Package/$(1) is missing the $(FIELD) field) endif ) - ifeq ($(PKGARCH),) - PKGARCH:=$(ARCH) - endif - - ifeq ($(DESCRIPTION),) - $(eval DESCRIPTION:=$(TITLE)) - endif - IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list @@ -206,7 +207,7 @@ define BuildPackage echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g' | sed -e 's,^[[:space:]]*$$$$, .,g' >> $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control (cd $$(IDIR_$(1))/CONTROL; \ $($(1)_COMMANDS) \ |