diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-02-06 13:33:45 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:56:35 +0000 |
| commit | 244e1d73ef58e92d73c098044c66bd784644b933 (patch) | |
| tree | 83c7918657e66aa13b180cc7087b3e99c3e4a583 | |
| parent | 85c8dd4170a88a5d7f3d9ca181e75720302727c5 (diff) | |
| download | openembedded-core-contrib-244e1d73ef58e92d73c098044c66bd784644b933.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.
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.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 3 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
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 () { 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 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 () { 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 = [] 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 () { 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) 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." LICENSE = "INVALID" MAINTAINER = "OE-Core Developers <openembedded-core@lists.openembedded.org>" -HOMEPAGE = "unknown" +HOMEPAGE = "" # Package dependencies and provides. |