conf/bitbake.conf: default HOMEPAGE to blank instead of unknown

PATCH New Paul Eggleton 1 participant 1 message Feb 6, 2014

Share & tools

Paul Eggleton

author

2014-02-06 13:34 UTC #0 lore raw

PATCH v2 1/1 conf/bitbake.conf: default HOMEPAGE to blank instead of unknown

The default value for HOMEPAGE of "unknown" has been in place since the early OE-Classic days, but it doesn't really make sense - "unknown" is not a valid URL and it just means we have to explicitly check for this hardcoded string if we're displaying the value in some form of UI, such as Toaster.

This has required some changes to the packaging classes as they previously did not expect the value to be blank.

Signed-off-by Paul Eggleton <[email protected]>

---
 meta/classes/package_deb.bbclass | 3 ++-
 meta/classes/package_ipk.bbclass | 3 ++-
 meta/classes/package_rpm.bbclass | 3 ++-
 meta/conf/bitbake.conf           | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

meta/classes/package_deb.bbclass +2 -1

index 5d316aa..bc62c6e 100644
@@ -262,7 +262,8 @@ python do_package_deb () {
         fields.append(["Architecture: %s\n", ['DPKG_ARCH']])
         fields.append(["OE: %s\n", ['PN']])
         fields.append(["PackageArch: %s\n", ['PACKAGE_ARCH']])
-        fields.append(["Homepage: %s\n", ['HOMEPAGE']])
+        if d.getVar('HOMEPAGE', True):
+            fields.append(["Homepage: %s\n", ['HOMEPAGE']])
 
         # Package, Version, Maintainer, Description - mandatory
         # Section, Priority, Essential, Architecture, Source, Depends, Pre-Depends, Recommends, Suggests, Conflicts, Replaces, Provides - Optional

meta/classes/package_ipk.bbclass +2 -1

index 2d8e459..5835d36 100644
@@ -290,7 +290,8 @@ python do_package_ipk () {
         fields.append(["License: %s\n", ['LICENSE']])
         fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
         fields.append(["OE: %s\n", ['PN']])
-        fields.append(["Homepage: %s\n", ['HOMEPAGE']])
+        if d.getVar('HOMEPAGE', True):
+            fields.append(["Homepage: %s\n", ['HOMEPAGE']])
 
         def pullData(l, d):
             l2 = []

meta/classes/package_rpm.bbclass +2 -1

index e9a6ac8..32863d7 100644
@@ -969,7 +969,8 @@ python write_specfile () {
     spec_preamble_top.append('License: %s' % srclicense)
     spec_preamble_top.append('Group: %s' % srcsection)
     spec_preamble_top.append('Packager: %s' % srcmaintainer)
-    spec_preamble_top.append('URL: %s' % srchomepage)
+    if srchomepage:
+        spec_preamble_top.append('URL: %s' % srchomepage)
     if srccustomtagschunk:
         spec_preamble_top.append(srccustomtagschunk)
     tail_source(d)

meta/conf/bitbake.conf +1 -1

index 57668e1..4fb6a1c 100644
@@ -241,7 +241,7 @@ This package contains documentation."
 
 LICENSE = "INVALID"
 MAINTAINER = "OE-Core Developers <[email protected]>"
-HOMEPAGE = "unknown"
+HOMEPAGE = ""
 
 # Package dependencies and provides.

Signature · 1 line

1.8.5.3