[oe] [meta-virtualization][PATCH V2] lxc: fix RDEPENDS on bash
Split a ${PN}-template pkg to put ${datadir}/lxc/templates/, and debash in
${datadir}/lxc/hooks/*
Bash scripts:
lxc/usr/share/lxc/hooks/mountcgroups:#!/bin/bash
lxc/usr/share/lxc/hooks/ubuntu-cloud-prep:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-debian:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-openmandriva:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-archlinux:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-centos:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-plamo:1:#!/bin/bash -eu
lxc/usr/share/lxc/templates/lxc-ubuntu-cloud:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-opensuse:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-gentoo:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-altlinux:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-sshd:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-ubuntu:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-cirros:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-busybox:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-fedora:1:#!/bin/bash
Signed-off-by: Chong Lu
---
recipes-containers/lxc/lxc_1.0.5.bb | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/recipes-containers/lxc/lxc_1.0.5.bb
b/recipes-containers/lxc/lxc_1.0.5.bb
index bea1ad0..c0603ee 100644
--- a/recipes-containers/lxc/lxc_1.0.5.bb
+++ b/recipes-containers/lxc/lxc_1.0.5.bb
@@ -37,10 +37,11 @@ S = "${WORKDIR}/${BPN}-${PV}"
PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-tests',
'', d)}"
EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "templates"
PACKAGECONFIG[doc] = "--enable-doc,--disable-doc,,"
PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,,"
PACKAGECONFIG[apparmour] =
"--enable-apparmor,--disable-apparmor,apparmor,apparmor"
+PACKAGECONFIG[templates] = ",,, ${PN}-templates"
inherit autotools pkgconfig ptest
@@ -48,6 +49,9 @@ FILES_${PN}-doc = "${mandir} ${infodir}"
# For LXC the docdir only contains example configuration files and should be
included in the lxc package
FILES_${PN} += "${docdir}"
FILES_${PN}-dbg += "${libexecdir}/lxc/.debug"
+PACKAGES =+ "${PN}-templates"
+FILES_${PN}-templates += "${datadir}/lxc/templates"
+RDEPENDS_${PN}-templates += "bash"
PRIVATE_LIBS_${PN}-ptest = "liblxc.so.1"
@@ -57,8 +61,11 @@ do_install_append() {
rm -rf ${D}${localstatedir}/cache
install -d ${D}${sysconfdir}/default/volatiles
echo "d root root 0755 ${localstatedir}/cache/lxc none" \
-> ${D}${sysconfdir}/default/volatiles/99_lxc
+ > ${D}${sysconfdir}/default/volatiles/99_lxc
+ # The checkbashisms shows there are no bashism, so use /bin/sh.
+ for i in `grep -l "#! */bin/bash" ${D}${datadir}/lxc/hooks/*`; do \
+ sed -e 's|#! */bin/bash|#!/bin/sh|' -i $i; done
}
EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests"
--
1.7.9.5
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-virtualization][PATCH] lxc: fix RDEPENDS on bash
Please ignore this one, I will resend.
//Chong
On 09/03/2014 02:23 PM, Chong Lu wrote:
Split a ${PN}-template pkg to put ${datadir}/lxc/templates/, and debash in
${datadir}/lxc/hooks/*
Bash scripts:
lxc/usr/share/lxc/hooks/mountcgroups:#!/bin/bash
lxc/usr/share/lxc/hooks/ubuntu-cloud-prep:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-debian:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-openmandriva:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-archlinux:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-centos:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-plamo:1:#!/bin/bash -eu
lxc/usr/share/lxc/templates/lxc-ubuntu-cloud:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-opensuse:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-gentoo:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-altlinux:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-sshd:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-ubuntu:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-cirros:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-busybox:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-fedora:1:#!/bin/bash
Signed-off-by: Chong Lu
---
recipes-containers/lxc/lxc_1.0.5.bb | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/recipes-containers/lxc/lxc_1.0.5.bb
b/recipes-containers/lxc/lxc_1.0.5.bb
index bea1ad0..7c83bc7 100644
--- a/recipes-containers/lxc/lxc_1.0.5.bb
+++ b/recipes-containers/lxc/lxc_1.0.5.bb
@@ -37,10 +37,11 @@ S = "${WORKDIR}/${BPN}-${PV}"
PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-tests', '',
d)}"
EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "templates"
PACKAGECONFIG[doc] = "--enable-doc,--disable-doc,,"
PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,,"
PACKAGECONFIG[apparmour] =
"--enable-apparmor,--disable-apparmor,apparmor,apparmor"
+PACKAGECONFIG[templates] = ",,, ${PN}-templates"
inherit autotools pkgconfig ptest
@@ -48,6 +49,9 @@ FILES_${PN}-doc = "${mandir} ${infodir}"
# For LXC the docdir only contains example configuration files and should be
included in the lxc package
FILES_${PN} += "${docdir}"
FILES_${PN}-dbg += "${libexecdir}/lxc/.debug"
+PACKAGES =+ "${PN}-templates"
+FILES_${PN}-templates += "${datadir}/lxc/templates"
+RDEPENDS_${PN}-templates += "bash"
PRIVATE_LIBS_${PN}-ptest = "liblxc.so.1"
@@ -57,8 +61,9 @@ do_install_append() {
rm -rf ${D}${localstatedir}/cache
install -d ${D}${sysconfdir}/default/volatiles
echo "d root root 0755 ${localstatedir}/cache/lxc none" \
-> ${D}${sysconfdir}/default/volatiles/99_lxc
-
+ > ${D}${sysconfdir}/default/volatiles/99_lxc
+ for i in `grep -l "bash" ${D}${datadir}/lxc/hooks/*`; do \
+ sed -e 's|bash|sh|' -i $i; done
}
EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests"
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-virtualization][PATCH] lxc: fix RDEPENDS on bash
Split a ${PN}-template pkg to put ${datadir}/lxc/templates/, and debash in
${datadir}/lxc/hooks/*
Bash scripts:
lxc/usr/share/lxc/hooks/mountcgroups:#!/bin/bash
lxc/usr/share/lxc/hooks/ubuntu-cloud-prep:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-debian:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-openmandriva:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-archlinux:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-centos:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-plamo:1:#!/bin/bash -eu
lxc/usr/share/lxc/templates/lxc-ubuntu-cloud:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-opensuse:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-gentoo:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-altlinux:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-sshd:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-ubuntu:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-cirros:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-busybox:1:#!/bin/bash
lxc/usr/share/lxc/templates/lxc-fedora:1:#!/bin/bash
Signed-off-by: Chong Lu
---
recipes-containers/lxc/lxc_1.0.5.bb | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/recipes-containers/lxc/lxc_1.0.5.bb
b/recipes-containers/lxc/lxc_1.0.5.bb
index bea1ad0..7c83bc7 100644
--- a/recipes-containers/lxc/lxc_1.0.5.bb
+++ b/recipes-containers/lxc/lxc_1.0.5.bb
@@ -37,10 +37,11 @@ S = "${WORKDIR}/${BPN}-${PV}"
PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-tests',
'', d)}"
EXTRA_OECONF += "--with-distro=${DISTRO} ${PTEST_CONF}"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "templates"
PACKAGECONFIG[doc] = "--enable-doc,--disable-doc,,"
PACKAGECONFIG[rpath] = "--enable-rpath,--disable-rpath,,"
PACKAGECONFIG[apparmour] =
"--enable-apparmor,--disable-apparmor,apparmor,apparmor"
+PACKAGECONFIG[templates] = ",,, ${PN}-templates"
inherit autotools pkgconfig ptest
@@ -48,6 +49,9 @@ FILES_${PN}-doc = "${mandir} ${infodir}"
# For LXC the docdir only contains example configuration files and should be
included in the lxc package
FILES_${PN} += "${docdir}"
FILES_${PN}-dbg += "${libexecdir}/lxc/.debug"
+PACKAGES =+ "${PN}-templates"
+FILES_${PN}-templates += "${datadir}/lxc/templates"
+RDEPENDS_${PN}-templates += "bash"
PRIVATE_LIBS_${PN}-ptest = "liblxc.so.1"
@@ -57,8 +61,9 @@ do_install_append() {
rm -rf ${D}${localstatedir}/cache
install -d ${D}${sysconfdir}/default/volatiles
echo "d root root 0755 ${localstatedir}/cache/lxc none" \
-> ${D}${sysconfdir}/default/volatiles/99_lxc
-
+ > ${D}${sysconfdir}/default/volatiles/99_lxc
+ for i in `grep -l "bash" ${D}${datadir}/lxc/hooks/*`; do \
+ sed -e 's|bash|sh|' -i $i; done
}
EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests"
--
1.7.9.5
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [oe-commits] Richard Purdie : package_rpm: Add custom extension support for spec generation.
Build failure:
https://autobuilder.yoctoproject.org/main/builders/poky-tiny/builds/30/steps/BuildImages/logs/stdio
...
ERROR: Error executing a python function in
/home/pokybuild/yocto-autobuilder/yocto-worker/poky-tiny/build/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.16.bb:
The stack trace of python calls that resulted in this exception/failure was:
File: 'write_specfile', lineno: 554, function:
0550:
0551:specfile.close()
0552:
0553:
*** 0554:write_specfile(d)
0555:
File: 'write_specfile', lineno: 420, function: write_specfile
0416:bb.note("Not creating empty RPM package for %s" %
splitname)
0417:else:
0418:spec_files_bottom.append('%%files -n %s' % splitname)
0419:if extra_pkgdata:
*** 0420:package_rpm_extra_pkgdata(splitname,
spec_files_bottom, localdata)
0421:spec_files_bottom.append('%defattr(-,-,-,-)')
0422:if file_list:
0423:bb.note("Creating RPM package for %s" % splitname)
0424:spec_files_bottom.extend(file_list)
Exception: NameError: global name 'package_rpm_extra_pkgdata' is not defined
...
//Hongxu
On 09/02/2014 09:50 PM, g...@opal.openembedded.org wrote:
Module: openembedded-core.git
Branch: master-next
Commit: 4b42982b8e6d859315c0f95dc0d6e4bcadf9a785
URL:
http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4b42982b8e6d859315c0f95dc0d6e4bcadf9a785
Author: Richard Purdie
Date: Mon Sep 1 17:32:26 2014 +0100
package_rpm: Add custom extension support for spec generation.
Add hooks to allow customisation of the rpm spec files. Since python functions
aren't visible in the data store, one variable is used to trigger the call to
a separately named function. A dummy function is not provided since this then
triggers various class ordering complexities which are best avoided.
Ultimately this will be replaced by a refactor of the code to generate the
spec file using a python class.
This allows the tizen layer to add hooks for the security manifests for
example.
Signed-off-by: Richard Purdie
---
meta/classes/package_rpm.bbclass | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 0a32b3e..65b4463 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -293,6 +293,7 @@ python write_specfile () {
spec_files_bottom = []
perfiledeps = (d.getVar("MERGEPERFILEDEPS", True) or "0") == "0"
+extra_pkgdata = (d.getVar("RPM_EXTRA_PKGDATA", True) or "0") == "0"
for pkg in packages.split():
localdata = bb.data.createCopy(d)
@@ -373,6 +374,8 @@ python write_specfile () {
else:
bb.note("Creating RPM package for %s" % splitname)
spec_files_top.append('%files')
+if extra_pkgdata:
+package_rpm_extra_pkgdata(splitname, spec_files_top,
localdata)
spec_files_top.append('%defattr(-,-,-,-)')
if file_list:
bb.note("Creating RPM package for %s" % splitname)
@@ -479,6 +482,8 @@ python write_specfile () {
bb.note("Not creating empty RPM package for %s" % splitname)
else:
spec_files_bottom.append('%%files -n %s' % splitname)
+if extra_pkgdata:
+package_rpm_extra_pkgdata(splitname, spec_files_bottom,
localdata)
spec_files_bottom.append('%defattr(-,-,-,-)')
if file_list:
bb.note("Creating RPM package for %s" % splitname)
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2][meta-networking] tcpslice: add recipe under tcpdump
On 09/02/2014 08:19 PM, Joe MacDonald wrote: [Re: [oe] [PATCH v2][meta-networking] tcpslice: add recipe under tcpdump] On 14.09.02 (Tue 10:45) Rongqing Li wrote: On 07/30/2014 03:25 PM, Martin Jansa wrote: On Wed, Jul 30, 2014 at 10:22:41AM +0800,rongqing...@windriver.com wrote: From: Roy Li tcpslice is a tool for extracting parts of a tcpdump packet trace, so put it under tcpdump dir Signed-off-by: Roy Li --- Hi Martin: I see this recipes has been merged into master-next for a long time, Could you cherry-pick it to master? I had asked for some kind of clarification on the license for tcpslice. I didn't notice a follow-up on it yet, did you get a chance to check into it? I don't think anyone has any concern about the stability of the package itself, though, if we'd had some kind of response on the license question I had I would've merged it long ago. Sorry, I just updated the License in recipes file, and forgot to reply your email. Currently, the license is same as the below: http://www.rpmfind.net//linux/RPM/mandriva/2010.1/i586/media/contrib/release/tcpslice-1.2a3-3.20061130.5mdv2010.0.i586.html I check again in source code, the license is most same as BSD-4-Clause, and has some typos, but the content is same as BSD-4-Clause, Could you update to BSD-4-Clause in recipes file when you merge it to master 1. Copyright in tcpslice.c or other source files. tcpslice-1.2a3$ head -n20 tcpslice.c /* * Copyright (c) 1991, 1992, 1993, 1995, 1996, 1997, 1999, 2000 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that: (1) source code distributions * retain the above copyright notice and this paragraph in its entirety, (2) * distributions including binary code include the above copyright notice and * this paragraph in its entirety in the documentation or other materials * provided with the distribution, and (3) all advertising materials mentioning * features or use of this software display the following acknowledgement: * ``This product includes software developed by the University of California, * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of * the University nor the names of its contributors may be used to endorse * or promote products derived from this software without specific prior * written permission. * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ 2. BSD-4-Clause license file. cat .oe-core$ cat ./meta/files/common-licenses/BSD-4-Clause Copyright (c) , All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. All advertising materials mentioning features or use of this software must display the following acknowledgement: This product includes software developed by the . 4. Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY ``AS IS`` AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Roy -J. -Roy -- Best Reagrds, Roy | RongQing Li -- Best Reagrds, Roy | RongQing Li -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] [RFT] Moving on from eglibc to glibc 2.20
On 29 August 2014 21:01, Khem Raj wrote: > On Fri, Aug 29, 2014 at 4:59 PM, Khem Raj wrote: >> On Fri, Aug 29, 2014 at 5:18 AM, Richard Purdie >> wrote: >>> On Thu, 2014-08-28 at 18:46 -0700, Khem Raj wrote: On Thu, Aug 28, 2014 at 5:41 PM, Khem Raj wrote: > reproduced. will apprise as I have some fix. OK pushed another patch to the contrib tree that should take care of both xf86-input-synaptics xf86-input-vmmouse >>> >>> https://autobuilder.yoctoproject.org/main/builders/nightly-fsl-arm/builds/17/steps/BuildImages/logs/stdio >>> >>> xf86-video-imxfb has the same issue and will need the same fix. Otavio >>> cc'd... >>> >> >> I have sent a patch to meta-fsl-arm for this > > Until its installed, the patch is here > http://patchwork.openembedded.org/patch/79443/ > -- > ___ > Openembedded-core mailing list > openembedded-c...@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core Is it possible to add an RREPLACES to these recipes so there's a clean upgrade path from eglibc? -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 4/5] subsurface: Adjust dependencies to match eglibc -> glibc move
Signed-off-by: Khem Raj
---
meta-oe/recipes-extended/subsurface/subsurface_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/subsurface/subsurface_git.bb
b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
index 0632f21..fc50eb6 100644
--- a/meta-oe/recipes-extended/subsurface/subsurface_git.bb
+++ b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
@@ -28,5 +28,5 @@ do_install() {
}
FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg"
-RRECOMMENDS_${PN}_append_libc-glibc = " eglibc-gconv-iso8859-15"
+RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-iso8859-15"
--
2.1.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] OE Changelog since 2014-08-24 until 2014-08-31
Changelog since 2014-08-24 until 2014-08-31. Projects included in this report: bitbake: git://git.openembedded.org/bitbake openembedded-core: git://git.openembedded.org/openembedded-core meta-openembedded: git://git.openembedded.org/meta-openembedded meta-angstrom: git://github.com/Angstrom-distribution/meta-angstrom.git meta-arago: git://arago-project.org/git/meta-arago.git meta-beagleboard: git://github.com/beagleboard/meta-beagleboard.git meta-browser: git://github.com/OSSystems/meta-browser.git meta-bug: git://github.com/buglabs/meta-bug.git meta-chicken: git://github.com/OSSystems/meta-chicken meta-efikamx: git://github.com/kraj/meta-efikamx.git meta-ettus: http://github.com/koenkooi/meta-ettus.git meta-fsl-arm: git://git.yoctoproject.org/meta-fsl-arm meta-fsl-arm-extra: git://github.com/Freescale/meta-fsl-arm-extra.git meta-fsl-ppc: git://git.yoctoproject.org/meta-fsl-ppc meta-guacamayo: git://github.com/Guacamayo/meta-guacamayo.git meta-gumstix: git://github.com/gumstix/meta-gumstix.git meta-gumstix-community: git://gitorious.org/schnitzeltony-oe-meta/meta-gumstix-community.git meta-handheld: git://git.openembedded.org/meta-handheld meta-igep: http://github.com/ebutera/meta-igep.git meta-intel: git://git.yoctoproject.org/meta-intel meta-ivi: git://git.yoctoproject.org/meta-ivi meta-java: git://github.com/woglinde/meta-java meta-kde: git://gitorious.org/openembedded-core-layers/meta-kde.git meta-micro: git://git.openembedded.org/meta-micro meta-mono: git://git.yoctoproject.org/meta-mono.git meta-netbookpro: git://github.com/tworaz/meta-netbookpro meta-nslu2: git://github.com/kraj/meta-nslu2 meta-opie: git://git.openembedded.org/meta-opie meta-qt3: git://git.yoctoproject.org/meta-qt3 meta-qt5: git://github.com/meta-qt5/meta-qt5.git meta-slugos: git://github.com/kraj/meta-slugos meta-systemd: git://git.yoctoproject.org/meta-systemd meta-raspberrypi: git://github.com/djwillis/meta-raspberrypi.git meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git meta-ti: git://git.yoctoproject.org/meta-ti meta-webos: git://github.com/openwebos/meta-webos.git meta-xilinx: git://git.yoctoproject.org/meta-xilinx meta-yocto: git://git.yoctoproject.org/meta-yocto openembedded: git://git.openembedded.org/openembedded Changelog for bitbake: Alexandru DAMIAN (11): toasterui: refactor log saving and save out-of-build errors toaster: fix application discovery in settings.py toaster: update orm models for layerindex compatibility toaster: enable admin interface on select models toaster: create project section navigation structure toaster: add all layers page toaster: update checksettings command for auto-detection toaster: update the bldcontrol to the new orm models toatergui: update pages to match project models buildinfohelper: BuildRequest project file update soft linked toaster: create Build methods for calculating progress and ETA Richard Purdie (5): runqueue: Fix setscene tasks not running fetch2/hg: Fix username/password handling utils: Improve profile log processing bitbake-worker: Extra profiling data dump build/data: Write out more complete python run files Changelog for openembedded-core: Armin Kuster (3): IBM Power5 v2: Add new tune file for PPC power5 cpu IBM power6 v2: Add new tune file for PPC power6 IBM power7 v2: Add new tune file for PPC power7 Carlos Rafael Giani (5): gstreamer1.0-plugins-bad: add opencv haar cascade XML files to package gstreamer1.0-omx: Add DEPENDS on gstreamer1.0-plugins-bad gstreamer1.0-plugins-bad: Add DEPENDS on libpng gstreamer1.0-plugins-bad: Fix GL/GLES configuration gstreamer1.0-plugins-bad: Add DEPENDS on jpeg Chong Lu (1): lttng-tools: fix ptest execution failure Christopher Larson (3): sanity: handle both \n and \\n in mirror vars sanity: fix support for regex schemes in mirrors check sanity: refactor mirrors checks to be more pythonic Ciobanu Roxana (1): xf86-input-synaptics: upgrade to 1.8.0 Corneliu Stoicescu (4): classes/populate_sdk_base.bbclass: add a manifest for target sdk classes/testimage.bbclass: add more fields to the sdk TestContext oeqa/oetest.py: enable sdk tests to use hasFeature and hasPackage methods. oeqa/sdk/buildsudoku.py: add setUpModule method to run only when gtk+ in ins Cristian Iorga (4): connman: upgrade to 1.25 harfbuzz: upgrade to 0.9.35 bluez5: upgrade to 5.22 ofono: upgrade to 1.15 Fahad Usman (4): logrotate: obey our flags logrotate: add packageconfigs buildtools-tarball: include nativesdk-ca-certificates buildtools-tarball: export GIT_SSL_CAINFO Jackie Huang (1): qemu: add PACKAGECONFIG for numa Jate Sujjavanich (1): useradd: Add setscene dep on pseudo-native Joe Slater (1): archiver.bbclass: add revision to git tarfile name Khem Raj (5): native/nativesdk: Clear MACHINEOVERRIDES openssl: Re-add linux-uclibc tuple uc
Re: [oe] [PATCH 09/13] apache2: split apache2-scripts subpkg
Hello,
I updated this commit in the original repo:
git://git.openembedded.org/meta-openembedded-contrib rbt/rdeps
// Robert
And the patch is:
Subject: [PATCH] apache2: split apache2-scripts subpkg
Split apache2-scripts subpkg to put the perl script dbmmanage, so that
apache2 doesn't have to RDEPEND on perl.
Add another perl script apxs to apache2-dev pkg as Olof Johansson
suggested.
Signed-off-by: Robert Yang
---
.../recipes-httpd/apache2/apache2_2.4.10.bb| 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
index 0356029..573cd6f 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
@@ -112,7 +112,7 @@ INITSCRIPT_NAME = "apache2"
INITSCRIPT_PARAMS = "defaults 91 20"
LEAD_SONAME = "libapr-1.so.0"
-PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
+PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \
${sysconfdir}/${BPN}/magic \
@@ -129,11 +129,16 @@ FILES_${PN}-dev = "${datadir}/${BPN}/build \
${libdir}/apr*.exp \
${includedir}/${BPN} \
${libdir}/*.la \
- ${libdir}/*.a"
+ ${libdir}/*.a \
+ ${bindir}/apxs \
+"
+
# manual to manual
FILES_${PN}-doc += " ${datadir}/${BPN}/manual"
+FILES_${PN}-scripts += "${bindir}/dbmmanage"
+
#
# override this too - here is the default, less datadir
#
@@ -150,3 +155,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
RDEPENDS_${PN} += "openssl libgcc"
+RDEPENDS_${PN}-scripts += "perl ${PN}"
--
1.7.9.5
On 09/02/2014 04:31 PM, Olof Johansson wrote:
On 14-09-01 17:18 +0200, Robert Yang wrote:
Perl:
apache2/usr/bin/dbmmanage:#!/usr/bin/perl
apache2/usr/bin/apxs:#!/usr/bin/perl -w
Signed-off-by: Robert Yang
---
.../recipes-httpd/apache2/apache2_2.4.10.bb|2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
index 0356029..5989a05 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
@@ -149,4 +149,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
-RDEPENDS_${PN} += "openssl libgcc"
+RDEPENDS_${PN} += "openssl libgcc perl"
This would probably be nice to separate to a -scripts package if
those two scripts are the only reason they would rdepend on perl.
I think apxs could be included in the -dev package.
Regards,
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2][meta-networking] tcpslice: add recipe under tcpdump
[Re: [oe] [PATCH v2][meta-networking] tcpslice: add recipe under tcpdump] On 14.09.02 (Tue 10:45) Rongqing Li wrote: > > > On 07/30/2014 03:25 PM, Martin Jansa wrote: > >On Wed, Jul 30, 2014 at 10:22:41AM +0800,rongqing...@windriver.com wrote: > >>>From: Roy Li > >>> > >>>tcpslice is a tool for extracting parts of a tcpdump packet trace, > >>>so put it under tcpdump dir > >>> > >>>Signed-off-by: Roy Li > >>>--- > > > Hi Martin: > > I see this recipes has been merged into master-next for a long time, > Could you cherry-pick it to master? I had asked for some kind of clarification on the license for tcpslice. I didn't notice a follow-up on it yet, did you get a chance to check into it? I don't think anyone has any concern about the stability of the package itself, though, if we'd had some kind of response on the license question I had I would've merged it long ago. -J. > > > -Roy > > > -- > Best Reagrds, > Roy | RongQing Li -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 09/13] apache2: add perl to RDEPENDS_apache2
On 14-09-02 10:45 +0200, Robert Yang wrote: > Yes, these are the only two AFAIK, I will create a apache2-scripts > which only includes /usr/bin/dbmmanage, and put apxs to -dev. Awesome, thanks! :) -- olofjn -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 09/13] apache2: add perl to RDEPENDS_apache2
On 09/02/2014 04:31 PM, Olof Johansson wrote:
On 14-09-01 17:18 +0200, Robert Yang wrote:
Perl:
apache2/usr/bin/dbmmanage:#!/usr/bin/perl
apache2/usr/bin/apxs:#!/usr/bin/perl -w
Signed-off-by: Robert Yang
---
.../recipes-httpd/apache2/apache2_2.4.10.bb|2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
index 0356029..5989a05 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
@@ -149,4 +149,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
-RDEPENDS_${PN} += "openssl libgcc"
+RDEPENDS_${PN} += "openssl libgcc perl"
This would probably be nice to separate to a -scripts package if
those two scripts are the only reason they would rdepend on perl.
I think apxs could be included in the -dev package.
Yes, these are the only two AFAIK, I will create a apache2-scripts
which only includes /usr/bin/dbmmanage, and put apxs to -dev.
// Robert
Regards,
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 09/13] apache2: add perl to RDEPENDS_apache2
On 14-09-01 17:18 +0200, Robert Yang wrote:
> Perl:
> apache2/usr/bin/dbmmanage:#!/usr/bin/perl
> apache2/usr/bin/apxs:#!/usr/bin/perl -w
>
> Signed-off-by: Robert Yang
> ---
> .../recipes-httpd/apache2/apache2_2.4.10.bb|2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
> b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
> index 0356029..5989a05 100644
> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
> @@ -149,4 +149,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
>
> FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
>
> -RDEPENDS_${PN} += "openssl libgcc"
> +RDEPENDS_${PN} += "openssl libgcc perl"
This would probably be nice to separate to a -scripts package if
those two scripts are the only reason they would rdepend on perl.
I think apxs could be included in the -dev package.
Regards,
--
olofjn
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-browser][PATCH] Disable fatal linker warnings related to SQLite
With the gold linker, problems with hidden sqlite3 symbols occur. Example:
warning: hidden symbol 'sqlite3_temp_directory' in
obj/third_party/sqlite/libsqlite3.a
(obj/third_party/sqlite/amalgamation/sqlite.sqlite3.o) is referenced by DSO
/mnt/ramdisk/yocto/qemu-test-build/tmp//sysroots/qemux86/usr/lib/../lib/libsoftokn3.so
The problem is known, and a solution would be to set the build scripts
to not build sqlite3 and use the system's sqlite3 library instead.
However, currently, this is not possible:
https://code.google.com/p/chromium/issues/detail?id=22208
The Crosswalk project fixed this by setting the warnings to non-fatal:
https://github.com/crosswalk-project/crosswalk/commit/83d22586852a3d64300fd024e24ade9a4ac325be
The disable_fatal_linker_warnings GYP flag used in that commit is already
part of Chromium 37. It just needs to be enabled. This commit does
precisely that.
Signed-off-by: Carlos Rafael Giani
---
recipes-browser/chromium/chromium_37.0.2062.0.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-browser/chromium/chromium_37.0.2062.0.bb
b/recipes-browser/chromium/chromium_37.0.2062.0.bb
index 2cf6d2a..c0e3b36 100644
--- a/recipes-browser/chromium/chromium_37.0.2062.0.bb
+++ b/recipes-browser/chromium/chromium_37.0.2062.0.bb
@@ -81,6 +81,7 @@ PACKAGECONFIG ??= "use-egl"
PACKAGECONFIG[use-egl] = ",,virtual/egl virtual/libgles2"
EXTRA_OEGYP = " \
+ -Ddisable_fatal_linker_warnings=1 \
${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '',
'-Dlinux_use_gold_binary=0', d)} \
${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '',
'-Dlinux_use_gold_flags=0', d)} \
-I ${WORKDIR}/oe-defaults.gypi \
--
1.8.3.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver] [PATCH] webmin: fix hardcode of python2.3
Use "/usr/bin/env python" to fix it.
Signed-off-by: Robert Yang
---
.../webmin/files/remove-python2.3.patch| 25
.../recipes-webadmin/webmin/webmin_1.700.bb|4 +++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644
meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
diff --git
a/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
b/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
new file mode 100644
index 000..b93ac52
--- /dev/null
+++ b/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
@@ -0,0 +1,25 @@
+From 6f04699d5d417122b67e8118fd1955c769f17e76 Mon Sep 17 00:00:00 2001
+From: Robert Yang
+Date: Tue, 2 Sep 2014 00:11:05 -0700
+Subject: [PATCH] ajaxterm/ajaxterm/qweb.py: fix hardcode of python2.3
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang
+---
+ ajaxterm/ajaxterm/qweb.py |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meta-webserver/ajaxterm/ajaxterm/qweb.py
b/meta-webserver/ajaxterm/ajaxterm/qweb.py
+index 20c5092..c658a6b 100644
+--- a/meta-webserver/ajaxterm/ajaxterm/qweb.py
b/meta-webserver/ajaxterm/ajaxterm/qweb.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/env python
+ #
+ # vim:set et ts=4 fdc=0 fdn=2 fdl=0:
+ #
+--
+1.7.9.5
+
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
b/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
index 45d635e..2a363cb 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
@@ -15,7 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz
\
file://samba-config-fix.patch \
file://proftpd-config-fix.patch \
file://net-lib.pl.patch \
- file://media-tomb.patch"
+ file://media-tomb.patch \
+ file://remove-python2.3.patch \
+"
SRC_URI[md5sum] = "e5261114a6a6ed10caf570d3239ed5b7"
SRC_URI[sha256sum] =
"1a6a8aa62c32c04932b902d17fc1864ee8f3fba03012bd25f709aa65e7e9b0f2"
--
1.7.9.5
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 5/5] meta-networking: Update layer dependency information
since python recipes are now spun out into its own layer
and there are recipes like crda which depend on M2Crypto
python module, of which the recipe is now moved from meta-oe
into meta-python, we need to express this change of layers
otherwise if you are not using meta-python then you end up
with errors e.g.
Nothing PROVIDES 'python-m2crypto-native' (but
meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
DEPENDS on or otherwise requires it).
Signed-off-by: Khem Raj
---
meta-networking/README | 8 ++--
meta-networking/conf/layer.conf | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta-networking/README b/meta-networking/README
index 339d40e..e1ba27d 100644
--- a/meta-networking/README
+++ b/meta-networking/README
@@ -17,17 +17,21 @@ Dependencies
This layer depends on:
-URI: git://github.com/openembedded/oe-core.git
+URI: git://github.com/openembedded/openembedded-core.git
branch: master
revision: HEAD
For some recipes, the meta-oe layer is required:
-URI: git://github.com/openembedded/meta-oe.git
+URI: git://github.com/openembedded/meta-openembedded.git
subdirectory: meta-oe
branch: master
revision: HEAD
+URI: git://github.com/openembedded/meta-openembedded.git
+subdirectory: meta-python
+branch: master
+revision: HEAD
Maintenance
---
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index 39c2ceb..d99d738 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -14,5 +14,7 @@ BBFILE_PRIORITY_networking-layer = "5"
LAYERVERSION_networking-layer = "1"
LAYERDEPENDS_networking-layer = "core"
+LAYERDEPENDS_networking-layer = "openembedded-layer"
+LAYERDEPENDS_networking-layer = "meta-python"
LICENSE_PATH += "${LAYERDIR}/licenses"
--
2.1.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/5] glade3: Enable gnome support in meta-gnome instead of meta-oe
This decouples meta-oe dependencies on meta-gnome, right now
we have to use meta-gnome as dependent layer
ERROR: Nothing PROVIDES 'libbonoboui' (but
meta-openembedded/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
DEPENDS on or otherwise requires it)
ERROR: Required build target 'glade3' has no buildable providers.
Missing or unbuildable dependency chain was: ['glade3', 'libbonoboui']
Signed-off-by: Khem Raj
---
meta-gnome/recipe-devtools/glade/glade3_%.bbappend | 1 +
meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 meta-gnome/recipe-devtools/glade/glade3_%.bbappend
diff --git a/meta-gnome/recipe-devtools/glade/glade3_%.bbappend
b/meta-gnome/recipe-devtools/glade/glade3_%.bbappend
new file mode 100644
index 000..3abacfb
--- /dev/null
+++ b/meta-gnome/recipe-devtools/glade/glade3_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG ??= "gnome"
diff --git a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
index d0657e4..69d9eae 100644
--- a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
+++ b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] =
"f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d
EXTRA_OECONF += "--disable-scrollkeeper"
-PACKAGECONFIG ??= "gnome"
+PACKAGECONFIG ??= ""
PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui"
do_configure_prepend() {
--
2.1.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome][PATCH 1/5] libgnomekbd: Drop using autotools-brokensep
Signed-off-by: Khem Raj
---
meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
index 0381192..d148062 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
@@ -6,17 +6,13 @@ SECTION = "x11/gnome/libs"
DEPENDS = "gconf gtk+ glib-2.0 libxklavier"
-inherit gnome autotools-brokensep
+inherit gnome
SRC_URI[archive.md5sum] = "de32a6e3e3464b566eecdc4332bf34bd"
SRC_URI[archive.sha256sum] =
"ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256"
do_configure_append() {
-find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-find ${S} -name Makefile | xargs sed -i
s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+find ${B} -name Makefile | xargs sed -i
s:'-I/usr/include':'-I${STAGING_INCDIR}':g
}
-
-
-
-
--
2.1.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome][PATCH 2/5] nautilus: Drop using autotools-brokensep
Signed-off-by: Khem Raj
---
meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
index 58a45b1..4be3f08 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
@@ -11,7 +11,7 @@ PR = "r6"
DEPENDS = "gdk-pixbuf gtk+ libunique gvfs librsvg libexif esound gnome-desktop
orbit2-native"
# optional: tracker
-inherit gnome autotools-brokensep
+inherit gnome
SRC_URI[archive.md5sum] = "51565aa10d1625dff56e381228346911"
SRC_URI[archive.sha256sum] =
"2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057584d22d15347a2"
@@ -26,10 +26,10 @@ EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb
"
export SYSROOT = "${STAGING_DIR_HOST}"
do_configure() {
-sed -i -e /docs/d Makefile.am
+sed -i -e /docs/d ${S}/Makefile.am
autotools_do_configure
# We need native orbit-idl with target idl files. No way to say it in a
clean way:
-find -name Makefile -exec sed -i
'/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}'
{} \;
+find ${B} -name Makefile -exec sed -i
'/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}'
{} \;
}
RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-networking"
--
2.1.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
