* [PATCH 0/2] Revised summary & description patch
@ 2011-02-03 19:32 Mark Hatle
2011-02-03 19:32 ` [PATCH 1/2] bitbake.conf & package.bbclass: Use default SUMMARY and DESCRIPTION Mark Hatle
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Mark Hatle @ 2011-02-03 19:32 UTC (permalink / raw)
To: poky
This is an update pull request for the revised summary & description
patch. It stop the failure mentioned by Saul in a previous email.
The second chunk of the patch is new and includes the workaround I sent
earlier today on the prelink documentation issue. I'm not sure this is
really the right patch, but it should unblock people.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: mhatle/wrsync
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/wrsync
Thanks,
Mark Hatle <mark.hatle@windriver.com>
---
Mark Hatle (2):
bitbake.conf & package.bbclass: Use default SUMMARY and DESCRIPTION
Docbook workaround
meta/classes/package.bbclass | 5 +++-
meta/conf/bitbake.conf | 30 +++++++++++++++++++-------
meta/recipes-devtools/prelink/prelink_git.bb | 5 ++++
3 files changed, 31 insertions(+), 9 deletions(-)
--
1.7.3.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] bitbake.conf & package.bbclass: Use default SUMMARY and DESCRIPTION
2011-02-03 19:32 [PATCH 0/2] Revised summary & description patch Mark Hatle
@ 2011-02-03 19:32 ` Mark Hatle
2011-02-03 19:32 ` [PATCH 2/2] Docbook workaround Mark Hatle
2011-02-03 20:00 ` [PATCH 0/2] Revised summary & description patch Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Mark Hatle @ 2011-02-03 19:32 UTC (permalink / raw)
To: poky
A new default SUMMARY and DESCRIPTION was defined for any package that
previously did not contain one. This value is based on the original
SUMMARY_${PN} value.
The new default SUMMARY and DESCRIPTION is used as a basis for all of
the automatic summary and descriptions for the various package splits,
include ${PN}, ${PN}-dbg, ${PN}-dev, ${PN}-doc, and locales.
A recipe may also override any of the automatic summaries by simply
specifying the value.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package.bbclass | 5 ++++-
meta/conf/bitbake.conf | 30 ++++++++++++++++++++++--------
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index bdc5d93..e64e441 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -289,6 +289,8 @@ python package_do_split_locales() {
if mainpkg.find('-dev'):
mainpkg = mainpkg.replace('-dev', '')
+ summary = bb.data.getVar('SUMMARY', d, True) or pn
+ description = bb.data.getVar('DESCRIPTION', d, True) or ""
for l in locales:
ln = legitimize_package_name(l)
pkg = pn + '-locale-' + ln
@@ -296,7 +298,8 @@ python package_do_split_locales() {
bb.data.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l), d)
bb.data.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' % (mainpkg, ln), d)
bb.data.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln), d)
- bb.data.setVar('DESCRIPTION_' + pkg, '%s translation for %s' % (l, pn), d)
+ bb.data.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l), d)
+ bb.data.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l), d)
bb.data.setVar('PACKAGES', ' '.join(packages), d)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3292a49..f08dda6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -166,14 +166,28 @@ BP = "${BPN}-${PV}"
SECTION = "base"
PRIORITY = "optional"
-SUMMARY_${PN} ?= "${PN} version ${PV}-${PR}"
-SUMMARY_${PN}-dbg ?= "Debugging files for ${PN}"
-SUMMARY_${PN}-dev ?= "Development files for ${PN}"
-SUMMARY_${PN}-doc ?= "Documentation files for ${PN}"
-DESCRIPTION_${PN} ?= "${SUMMARY_${PN}}"
-DESCRIPTION_${PN}-dbg ?= "${SUMMARY_${PN}-dbg}"
-DESCRIPTION_${PN}-dev ?= "${SUMMARY_${PN}-dev}"
-DESCRIPTION_${PN}-doc ?= "${SUMMARY_${PN}-doc}"
+SUMMARY ?= "${PN} version ${PV}-${PR}"
+DESCRIPTION ?= "${SUMMARY}"
+
+# The following two are commented out because they result in a recursive
+# definition of the variable in some corner cases. These are left in
+# to illustrate the intended behavior.
+#SUMMARY_${PN} ?= "${SUMMARY}"
+#DESCRIPTION_${PN} ?= "${DESCRIPTION}"
+
+SUMMARY_${PN}-dbg ?= "${SUMMARY} - Debugging files"
+DESCRIPTION_${PN}-dbg ?= "${DESCRIPTION} \
+This package contains ELF symbols and related sources for debugging purposes."
+
+SUMMARY_${PN}-dev ?= "${SUMMARY} - Development files"
+DESCRIPTION_${PN}-dev ?= "${DESCRIPTION} \
+This package contains symbolic links, static binaries, header files, and \
+related items necessary for software development."
+
+SUMMARY_${PN}-doc ?= "${SUMMARY} - Documentation files"
+DESCRIPTION_${PN}-doc ?= "${DESCRIPTION} \
+This package contains documentation."
+
LICENSE = "INVALID"
MAINTAINER = "Yocto Project Team <poky@yoctoproject.org>"
HOMEPAGE = "unknown"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] Docbook workaround
2011-02-03 19:32 [PATCH 0/2] Revised summary & description patch Mark Hatle
2011-02-03 19:32 ` [PATCH 1/2] bitbake.conf & package.bbclass: Use default SUMMARY and DESCRIPTION Mark Hatle
@ 2011-02-03 19:32 ` Mark Hatle
2011-02-03 20:00 ` [PATCH 0/2] Revised summary & description patch Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Mark Hatle @ 2011-02-03 19:32 UTC (permalink / raw)
To: poky
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-devtools/prelink/prelink_git.bb | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index 1601443..8620513 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -27,6 +27,11 @@ BBCLASSEXTEND = "native"
EXTRA_OECONF = "--disable-selinux --with-pkgversion=${PV}-${PR} \
--with-bugurl=http://bugzilla.pokylinux.org/"
+do_configure_prepend () {
+ # Disable documentation!
+ echo "all:" > ${S}/doc/Makefile.am
+}
+
do_install_append () {
install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf
--
1.7.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] Revised summary & description patch
2011-02-03 19:32 [PATCH 0/2] Revised summary & description patch Mark Hatle
2011-02-03 19:32 ` [PATCH 1/2] bitbake.conf & package.bbclass: Use default SUMMARY and DESCRIPTION Mark Hatle
2011-02-03 19:32 ` [PATCH 2/2] Docbook workaround Mark Hatle
@ 2011-02-03 20:00 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-02-03 20:00 UTC (permalink / raw)
To: Mark Hatle; +Cc: poky
On 02/03/2011 11:32 AM, Mark Hatle wrote:
> This is an update pull request for the revised summary& description
> patch. It stop the failure mentioned by Saul in a previous email.
>
> The second chunk of the patch is new and includes the workaround I sent
> earlier today on the prelink documentation issue. I'm not sure this is
> really the right patch, but it should unblock people.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: mhatle/wrsync
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/wrsync
>
> Thanks,
> Mark Hatle<mark.hatle@windriver.com>
> ---
>
>
> Mark Hatle (2):
> bitbake.conf& package.bbclass: Use default SUMMARY and DESCRIPTION
> Docbook workaround
>
> meta/classes/package.bbclass | 5 +++-
> meta/conf/bitbake.conf | 30 +++++++++++++++++++-------
> meta/recipes-devtools/prelink/prelink_git.bb | 5 ++++
> 3 files changed, 31 insertions(+), 9 deletions(-)
>
Mark,
I merged the SUMMARY & DESCRIPTION changes, but held off on the
workaround to give Scott G. a chance to fix it properly.
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-02-03 20:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-03 19:32 [PATCH 0/2] Revised summary & description patch Mark Hatle
2011-02-03 19:32 ` [PATCH 1/2] bitbake.conf & package.bbclass: Use default SUMMARY and DESCRIPTION Mark Hatle
2011-02-03 19:32 ` [PATCH 2/2] Docbook workaround Mark Hatle
2011-02-03 20:00 ` [PATCH 0/2] Revised summary & description patch Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox