DESCRIPTION:= is obselete, so complain if it is used and use TITLE if no description...

SVN-Revision: 9307

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 50554b3df5141de9b66b0294fcf728a26f055947..d6adb1a17a011e5526771e548048a8fced0861f4 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -30,7 +30,6 @@ define Package/Default
   SUBMENU:=
   SUBMENUDEP:=
   TITLE:=
-  DESCRIPTION:=
   KCONFIG:=
 endef
 

diff --git a/include/package.mk b/include/package.mk
index d90bec8872525bde3a30f62e746c3d2be76ff291..a9819642dd5f1ab2057b90ef2d543fe1cb0c2602 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -80,14 +80,15 @@ define BuildPackage
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 
-# <HACK> Support obsolete DESCRIPTION field
+ifdef DESCRIPTION
+$$(error DESCRIPTION:= is obselete, use Package/PKG_NAME/description)
+endif
+
 ifndef Package/$(1)/description
 define Package/$(1)/description
-$(TITLE)$(subst \,
-,\ $(DESCRIPTION))
+       $(TITLE)
 endef
 endif
-# </HACK>
 
   $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION,
     ifeq ($($(FIELD)),)