diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-10 15:45:36 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-10 15:45:36 +0000 |
| commit | 9ef909243235306a47edba82e852211ff6a40853 (patch) | |
| tree | 984360c7fa4175eeb3df4fd9fd772da56368ef39 | |
| parent | 34dbf787c3fa13541abc9aadcf53c23016895382 (diff) | |
add support for Package/<pkgname>/description - old format still supported, but deprecated
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5015 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 9 | ||||
| -rw-r--r-- | package/busybox/Makefile | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/include/package.mk b/include/package.mk index 181ea32b6..7ae95f8fe 100644 --- a/include/package.mk +++ b/include/package.mk @@ -169,6 +169,8 @@ define BuildPackage echo "Default: $(DEFAULT)"; endif + $(call shexport,Package/$(1)/description) + DUMPINFO += \ if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \ echo "Version: $(VERSION)"; \ @@ -176,7 +178,12 @@ define BuildPackage echo "Build-Depends: $(PKG_BUILDDEP)"; \ echo "Category: $(CATEGORY)"; \ echo "Title: $(TITLE)"; \ - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ + if isset $(call shvar,Package/$(1)/description); then \ + echo -n "Description: "; \ + getvar $(call shvar,Package/$(1)/description); \ + else \ + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ + fi; ifneq ($(URL),) DUMPINFO += \ diff --git a/package/busybox/Makefile b/package/busybox/Makefile index f56d2462d..05174a32b 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -26,13 +26,15 @@ define Package/busybox CATEGORY:=Base system DEFAULT:=y TITLE:=Core utilities for embedded Linux - DESCRIPTION:=\ - The Swiss Army Knife of embedded Linux. \\\ - It slices, it dices, it makes Julian Fries. URL:=http://busybox.net/ MENU:=1 endef +define Package/busybox/description +The Swiss Army Knife of embedded Linux. + It slices, it dices, it makes Julian Fries. +endef + define Package/busybox/config menu "Configuration" depends on PACKAGE_busybox |