A few random improvements from the Mentor patch queue
cover A few random improvements from the Mentor patch queue
The following changes since commit 62849843a4a83b10316bc6cb1e4b3f0622391dea:
gdb-7.6.1: fix cygwin check in configure script (2013-12-12 22:41:13 +0000)
are available in the git repository at:
[email protected]:kergoth/oe-core.git random-improvements
for you to fetch changes up to 9950f35b110f1c3032e199c9d0b32a2e43a326b2:
git: leverage upstream relocation support (2013-12-13 07:47:37 -0700)
----------------------------------------------------------------
Christopher Larson (3):
xz: make the LICENSE info more accurate
libdrm: use RRECOMMENDS for libdrm-drivers
git: leverage upstream relocation support
meta/recipes-devtools/git/git.inc | 14 +------------- meta/recipes-extended/xz/xz_5.1.3alpha.bb | 17 ++++++++++++++++- meta/recipes-graphics/drm/libdrm.inc | 4 ++-- 3 files changed, 19 insertions(+), 16 deletions(-)
Signature · 1 line
1.8.3.4
PATCH 1/3 xz: make the LICENSE info more accurate
From: Christopher Larson <[email protected]>
--- meta/recipes-extended/xz/xz_5.1.3alpha.bb | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
meta/recipes-extended/xz/xz_5.1.3alpha.bb +16 -1
@@ -2,7 +2,22 @@ DESCRIPTION = "utils for managing LZMA compressed files" HOMEPAGE = "http://tukaani.org/xz/" SECTION = "base" -LICENSE = "GPLv2+ & LGPLv2.1+" +# The source includes bits of PD, GPLv2, GPLv3, LGPLv2.1+, but the only file +# which is GPLv3 is an m4 macro which isn't shipped in any of our packages, +# and the LGPL bits are under lib/, which appears to be used for libgnu, which +# appears to be used for DOS builds. So we're left with GPLv2+ and PD. +LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+ & PD" +LICENSE_${PN} = "GPLv2+" +LICENSE_${PN}-dev = "GPLv2+" +LICENSE_${PN}-staticdev = "GPLv2+" +LICENSE_${PN}-doc = "GPLv2+" +LICENSE_${PN}-dbg = "GPLv2+" +LICENSE_${PN}-locale = "GPLv2+" +LICENSE_liblzma = "PD" +LICENSE_liblzma-dev = "PD" +LICENSE_liblzma-staticdev = "PD" +LICENSE_liblzma-dbg = "PD" + LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \ file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
Signature · 1 line
1.8.3.4
PATCH 2/3 libdrm: use RRECOMMENDS for libdrm-drivers
In reply to Christopher LarsonFrom: Christopher Larson <[email protected]>
As libdrm enables modules automatically, based on what it needs / can build, it's unlikely we'll *ever* get a situation where all the modules are emitted, so libdrm-drivers, which depends on all of them, ends up being useless and non-installable. Make it use rrecommends, so it only pulls in what we have.
--- meta/recipes-graphics/drm/libdrm.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/drm/libdrm.inc +2 -2
@@ -27,8 +27,8 @@ ALLOW_EMPTY_${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ ${PN}-intel ${PN}-exynos ${PN}-kms" -RDEPENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ - ${PN}-exynos" +RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ + ${PN}-exynos" FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
Signature · 1 line
1.8.3.4
PATCH 3/3 git: leverage upstream relocation support
In reply to Christopher LarsonFrom: Christopher Larson <[email protected]>
--- meta/recipes-devtools/git/git.inc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
meta/recipes-devtools/git/git.inc +1 -13
@@ -16,7 +16,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ inherit autotools perlnative -EXTRA_OEMAKE = "NO_PYTHON=1" +EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1" do_compile_prepend () { # Remove perl/perl.mak to fix the out-of-date perl.mak error
@@ -35,18 +35,6 @@ do_install () { rmdir ${D}${exec_prefix}/lib || true } -do_install_append_class-native() { - create_wrapper ${D}/${bindir}/git \ - GIT_EXEC_PATH=${libexecdir}/git-core \ - GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates -} - -do_install_append_class-nativesdk() { - create_wrapper ${D}/${bindir}/git \ - GIT_EXEC_PATH=${libexecdir}/git-core \ - GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates -} - FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
Signature · 1 line
1.8.3.4