aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2006-09-24 21:17:17 +0000
committerNicolas Thill <nico@openwrt.org>2006-09-24 21:17:17 +0000
commit6c2f8db6672a83561439bc42ddfefdf84f6164a3 (patch)
tree0f96f24040ce36cf0a58307192c7cd1448edddfb /include
parentecb6c4b599eab655681dbaa3e755709fa1b819b3 (diff)
downloadupstream-6c2f8db6672a83561439bc42ddfefdf84f6164a3.tar.gz
upstream-6c2f8db6672a83561439bc42ddfefdf84f6164a3.tar.bz2
upstream-6c2f8db6672a83561439bc42ddfefdf84f6164a3.zip
fix DESCRIPTION use in menuconfig and ipkg control files
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4856 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/package.mk21
1 files changed, 11 insertions, 10 deletions
diff --git a/include/package.mk b/include/package.mk
index f7dbacc415..709bb44155 100644
--- a/include/package.mk
+++ b/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) \