summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-02-06 13:33:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-11 11:56:56 +0000
commitf9623968f078758eb8fb8ebad0b4595b15f8cb42 (patch)
tree7b4deaa82164064c584172053a1229c721beeb8d
parent2882b132cc50af9fae13f0cbdbf6b690f8479287 (diff)
downloadpoky-f9623968f078758eb8fb8ebad0b4595b15f8cb42.tar.gz
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. (From OE-Core rev: 244e1d73ef58e92d73c098044c66bd784644b933) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_deb.bbclass3
-rw-r--r--meta/classes/package_ipk.bbclass3
-rw-r--r--meta/classes/package_rpm.bbclass3
-rw-r--r--meta/conf/bitbake.conf2
4 files changed, 7 insertions, 4 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index d0befade20..a0a31bd0f6 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -116,7 +116,8 @@ python do_package_deb () {
116 fields.append(["Architecture: %s\n", ['DPKG_ARCH']]) 116 fields.append(["Architecture: %s\n", ['DPKG_ARCH']])
117 fields.append(["OE: %s\n", ['PN']]) 117 fields.append(["OE: %s\n", ['PN']])
118 fields.append(["PackageArch: %s\n", ['PACKAGE_ARCH']]) 118 fields.append(["PackageArch: %s\n", ['PACKAGE_ARCH']])
119 fields.append(["Homepage: %s\n", ['HOMEPAGE']]) 119 if d.getVar('HOMEPAGE', True):
120 fields.append(["Homepage: %s\n", ['HOMEPAGE']])
120 121
121 # Package, Version, Maintainer, Description - mandatory 122 # Package, Version, Maintainer, Description - mandatory
122 # Section, Priority, Essential, Architecture, Source, Depends, Pre-Depends, Recommends, Suggests, Conflicts, Replaces, Provides - Optional 123 # Section, Priority, Essential, Architecture, Source, Depends, Pre-Depends, Recommends, Suggests, Conflicts, Replaces, Provides - Optional
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 68c8580761..516ec4b3d2 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -95,7 +95,8 @@ python do_package_ipk () {
95 fields.append(["License: %s\n", ['LICENSE']]) 95 fields.append(["License: %s\n", ['LICENSE']])
96 fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']]) 96 fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
97 fields.append(["OE: %s\n", ['PN']]) 97 fields.append(["OE: %s\n", ['PN']])
98 fields.append(["Homepage: %s\n", ['HOMEPAGE']]) 98 if d.getVar('HOMEPAGE', True):
99 fields.append(["Homepage: %s\n", ['HOMEPAGE']])
99 100
100 def pullData(l, d): 101 def pullData(l, d):
101 l2 = [] 102 l2 = []
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 4d33d01835..82ea187479 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -497,7 +497,8 @@ python write_specfile () {
497 spec_preamble_top.append('License: %s' % srclicense) 497 spec_preamble_top.append('License: %s' % srclicense)
498 spec_preamble_top.append('Group: %s' % srcsection) 498 spec_preamble_top.append('Group: %s' % srcsection)
499 spec_preamble_top.append('Packager: %s' % srcmaintainer) 499 spec_preamble_top.append('Packager: %s' % srcmaintainer)
500 spec_preamble_top.append('URL: %s' % srchomepage) 500 if srchomepage:
501 spec_preamble_top.append('URL: %s' % srchomepage)
501 if srccustomtagschunk: 502 if srccustomtagschunk:
502 spec_preamble_top.append(srccustomtagschunk) 503 spec_preamble_top.append(srccustomtagschunk)
503 tail_source(d) 504 tail_source(d)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 57668e14f2..4fb6a1c460 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -241,7 +241,7 @@ This package contains documentation."
241 241
242LICENSE = "INVALID" 242LICENSE = "INVALID"
243MAINTAINER = "OE-Core Developers <openembedded-core@lists.openembedded.org>" 243MAINTAINER = "OE-Core Developers <openembedded-core@lists.openembedded.org>"
244HOMEPAGE = "unknown" 244HOMEPAGE = ""
245 245
246# Package dependencies and provides. 246# Package dependencies and provides.
247 247