A few miscellaneous fixes from Mentor
cover A few miscellaneous fixes from Mentor
From: Christopher Larson <[email protected]>
The following changes since commit b4f208f418d18f2a4e78a56bebacef481061d917:
tar: don't mv tar for nativesdk (2013-06-10 18:06:33 +0100)
are available in the git repository at:
https://github.com/kergoth/oe-core.git misc-fixes
Christopher Larson (4):
packagegroup-core-tools-profile: don't exclude mips
gconf: inherit gettext
avahi: inherit python classes, use PACKAGECONFIG license.bbclass: include all licenses in the manifest
meta/classes/license.bbclass | 7 +++---- meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb | 9 +++++++-- .../packagegroups/packagegroup-core-tools-profile.bb | 11 ----------- meta/recipes-gnome/gnome/gconf_3.2.6.bb | 2 +- 4 files changed, 11 insertions(+), 18 deletions(-)
Signature · 1 line
1.8.3
PATCH 1/4 packagegroup-core-tools-profile: don't exclude mips
From: Christopher Larson <[email protected]>
Now that liburcu supports mips, this packagegroup can pull in lttng software on that architecture.
--- .../packagegroups/packagegroup-core-tools-profile.bb | 11 ----------- 1 file changed, 11 deletions(-)
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +0 -11
@@ -48,22 +48,15 @@ SYSTEMTAP_aarch64 = "" LTTNGUST = "lttng-ust" LTTNGUST_libc-uclibc = "" -LTTNGUST_mips = "" LTTNGUST_aarch64 = "" -# lttng-tools, lttng-modules and babeltrace all depend on liburcu -# which currentl doesn't build on mips - LTTNGTOOLS = "lttng-tools" -LTTNGTOOLS_mips = "" LTTNGTOOLS_aarch64 = "" LTTNGMODULES = "lttng-modules" -LTTNGMODULES_mips = "" LTTNGMODULES_aarch64 = "" BABELTRACE = "babeltrace" -BABELTRACE_mips = "" BABELTRACE_aarch64 = "" # valgrind does not work on mips
@@ -77,10 +70,6 @@ VALGRIND_aarch64 = "" # exmap-console # exmap-server -# At present we only build lttng-ust on -# qemux86/qemux86-64/qemuppc/qemuarm/emenlow/atom-pc since upstream liburcu -# (which is required by lttng-ust) may not build on other platforms, like -# MIPS. RDEPENDS_${PN} = "\ ${PROFILETOOLS} \ ${LTTNGUST} \
Signature · 1 line
1.8.3
Re: [PATCH 1/4] packagegroup-core-tools-profile: don't exclude mips
Quoted 7 lines · Christopher Larson
From: Christopher Larson <[email protected]>
Now that liburcu supports mips, this packagegroup can pull in lttng software
on that architecture.Signed-off-by Christopher Larson <[email protected]>
Your commit log say's nothing about babeltrace. I think it'd be good to add it.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Re: [PATCH 1/4] packagegroup-core-tools-profile: don't exclude mips
Quoted 8 lines · Otavio Salvador
Quoted 6 lines · Christopher Larson
From: Christopher Larson <[email protected]>
Now that liburcu supports mips, this packagegroup can pull in lttng software
on that architecture.
Quoted 6 lines
Quoted 1 line
Signed-off-by Christopher Larson <[email protected]>Your commit log say's nothing about babeltrace. I think it'd be good to add it.
It's debatable whether babel trace is considered 'lttng software', as it's listed at http://lttng.org/download and http://lttng.org/babeltrace redirects to the official babeltrace project page also. If you think mentioning it separately would be beneficial, I'll send a v2. Thanks for reviewing these.
Signature · 5 lines
Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics
PATCH 2/4 gconf: inherit gettext
In reply to Christopher LarsonFrom: Christopher Larson <[email protected]>
--- meta/recipes-gnome/gnome/gconf_3.2.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/gnome/gconf_3.2.6.bb +1 -1
@@ -8,7 +8,7 @@ DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-nat PR = "r0" -inherit gnomebase gtk-doc +inherit gnomebase gtk-doc gettext SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ file://remove_plus_from_invalid_characters_list.patch \
Signature · 1 line
1.8.3
PATCH 3/4 avahi: inherit python classes, use PACKAGECONFIG
In reply to Christopher LarsonFrom: Christopher Larson <[email protected]>
Without using our python classes and having appropriate dependencies, the build is nondeterministic, and whether a python-avahi package is produced will vary depending on the host environment, yet avahi-discover is always produced, and it depends on python-avahi.
--- meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb +7 -2
@@ -6,6 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ require avahi.inc +inherit python-dir pythonnative + +PACKAGECONFIG ??= "python" +PACKAGECONFIG[python] = "--enable-python,--disable-python,python-native python" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
@@ -26,7 +31,7 @@ FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a" FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" -FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*" +FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi ${PYTHON_SITEPACKAGES_DIR}/avahi_discover" FILES_avahi-discover = "${bindir}/avahi-discover \ ${datadir}/applications/avahi-discover.desktop \ ${datadir}/avahi/interfaces/avahi-discover*"
@@ -34,7 +39,7 @@ FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \ ${datadir}/avahi/interfaces/avahi-discover.glade" RDEPENDS_avahi-discover = "python-avahi python-pygtk" -RDEPENDS_python-avahi = "python-dbus" +RDEPENDS_python-avahi = "python-core python-dbus" do_install_append () {
Signature · 1 line
1.8.3
Re: [PATCH 3/4] avahi: inherit python classes, use PACKAGECONFIG
Quoted 11 lines · Christopher Larson
From: Christopher Larson <[email protected]>
Without using our python classes and having appropriate dependencies, the build is nondeterministic, and whether a python-avahi package is produced will
vary depending on the host environment, yet avahi-discover is always produced,
and it depends on python-avahi.Signed-off-by Christopher Larson <[email protected]>
This could be backported for 1.4.2 I think; Paul?
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
PATCH 4/4 license.bbclass: include all licenses in the manifest
In reply to Christopher LarsonFrom: Christopher Larson <[email protected]>
When we don't have a generic license file for the license in question, we can warn, but we should still include it in the manifest, otherwise the manifest doesn't reflect reality. Failing to include a license listed in the recipe in the manifest can't be allowed.
--- meta/classes/license.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
meta/classes/license.bbclass +3 -4
@@ -51,11 +51,10 @@ license_create_manifest() { printf "LICENSE:" >> ${LICENSE_MANIFEST} for lic in ${pkged_lic}; do # to reference a license file trim trailing + symbol - if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then - printf " ${lic}" >> ${LICENSE_MANIFEST} - else - echo "WARNING: The license listed ${lic} was not in the licenses collected for ${pkged_pn}" + if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then + bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}" fi + printf " ${lic}" >> ${LICENSE_MANIFEST} done printf "\n\n" >> ${LICENSE_MANIFEST} done
Signature · 1 line
1.8.3
Re: [PATCH 4/4] license.bbclass: include all licenses in the manifest
Quoted 10 lines · Christopher Larson
From: Christopher Larson <[email protected]>
When we don't have a generic license file for the license in question, we can
warn, but we should still include it in the manifest, otherwise the manifest
doesn't reflect reality. Failing to include a license listed in the recipe in
the manifest can't be allowed.
Quoted 2 lines
Signed-off-by Christopher Larson <[email protected]>
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750