Re: [oe] [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
On 2015年07月08日 17:39, Koen Kooi wrote: That's not a reason to use 2 different notations. Either put both in SRC_URI or use two SRCREV_foo statements. it is better if you can revised this patch, and submit. -R -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
On 2015年07月08日 17:39, Koen Kooi wrote:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Rongqing Li schreef op 07-07-15 om 09:31:
On 2015年07月07日 15:24, Koen Kooi wrote: rongqing...@windriver.com schreef
op 07-07-15 om 03:55:
From: Roy Li
Remove backport patch Add CSocket submodule Add the dependency on
icu
Signed-off-by: Roy Li ---
diff --git a/meta-networking/recipes-irc/znc/znc_git.bb
b/meta-networking/recipes-irc/znc/znc_git.bb index
2e35e4d..f5bed08 100644 ---
a/meta-networking/recipes-irc/znc/znc_git.bb +++
b/meta-networking/recipes-irc/znc/znc_git.bb @@ -1,16 +1,16 @@
SUMMARY = "ZNC, an advanced IRC bouncer" SECTION = "net" LICENSE =
"GPLv2" -LIC_FILES_CHKSUM =
"file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM =
"file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-DEPENDS = "openssl" +DEPENDS = "openssl zlib icu"
-PV = "1.0+git" +PV = "1.6.0+git"
If it's the 1.6 release, just call it '1.6.0'
grep oe-core
./meta/recipes-graphics/mesa/mesa_git.bb:PV = "10.5.4+git${SRCPV}"
./meta/recipes-graphics/fstests/fstests_git.bb:PV = "0.1+git${SRCPV}"
./meta/recipes-graphics/mx/mx-1.0_1.4.7.bb:PV = "1.4.7+git${SRCPV}"
./meta/recipes-graphics/drm/libdrm_git.bb:PV = "2.4.40+git${SRCPV}"
./meta/recipes-graphics/xorg-lib/libxcb_git.bb:PV =
"1.1.90.1+gitr${SRCPV}"
./meta/recipes-graphics/xorg-lib/libxext_git.bb:PV =
"1.0.99.1+gitr${SRCPV}"
./meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb:PV =
"0.0+git${SRCPV}"
./meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb:PV =
"1.3.2+git${SRCPV}"
./meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb:PV =
"1.3.0+git${SRCPV}"
./meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb:PV =
"0.15.2+git${SRCPV}"
./meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:PV =
"0.1.1+gitr${SRCPV}"
./meta/recipes-graphics/libepoxy/libepoxy_git.bb:PV =
"1.2+git${SRCPV}"
./meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb:PV =
"0.1+git${SRCPV}"
./meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb:PV =
"1.1+git${SRCPV}" ./meta/recipes-devtools/qemu/qemu_git.bb:PV =
"1.3.0+git${SRCPV}"
./meta/recipes-devtools/swabber/swabber-native_git.bb:PV =
"0.0+git${SRCPV}" ./meta/recipes-devtools/remake/remake_git.bb:PV =
"3.82+dbg-0.9+git${SRCPV}"
./meta/recipes-devtools/mtd/mtd-utils_git.bb:PV = "1.5.1+git${SRCPV}"
./meta/recipes-devtools/opkg-utils/opkg-utils_git.bb:PV =
"0.1.8+git${SRCPV}"
./meta/recipes-devtools/bootchart2/bootchart2_git.bb:PV =
"0.14.6+git${SRCPV}"
./meta/recipes-devtools/mkelfimage/mkelfimage_git.bb:PV =
"4.0+git${SRCPV}" ./meta/recipes-devtools/mmc/mmc-utils_git.bb:PV =
"0.1" ./meta/recipes-devtools/pseudo/pseudo_git.bb:PV =
"1.6.5+git${SRCPV}" ./meta/recipes-devtools/prelink/prelink_git.bb:PV =
"1.0+git${SRCPV}" ./meta/recipes-devtools/pkgconfig/pkgconfig.inc:PV =
"0.28+git${SRCPV}"
./meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb:PV =
"4.0.1+git${SRCPV}"
./meta/recipes-devtools/gnu-config/gnu-config_git.bb:PV =
"1.0+git${SRCPV}" ./meta/recipes-devtools/tcf-agent/tcf-agent_git.bb:PV
= "0.4.0+git${SRCPV}" ./meta/recipes-devtools/fdisk/gptfdisk_git.bb:PV
= "0.8.10+git${SRCPV}" ./meta/recipes-multimedia/x264/x264_git.bb:PV =
"r2491+git${SRCPV}"
./meta/recipes-multimedia/libav/libpostproc_git.bb:PV =
"52.3.0+git${SRCPV}"
Your point being?
lots of recipes under oe-core is using this style { PV=version+git}
-Roy
-SRCREV = "ef59c23068547c132cb678092fba9a21317fd5f2" -SRC_URI =
"git://github.com/znc/znc.git \ -
file://0001-Fix-NULL-pointer-dereference-in-webadmin.patch \
+SRC_URI =
"git://github.com/znc/znc.git;rev=f47e8465efa4e1cd948b9caae93ac401b4355df
8
\ +
git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;n
ame
=Csocket
\ " +SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee"
Why are you using 2 different notations for SRCREV?
there are two different git repo
That's not a reason to use 2 different notations. Either put both in SRC_URI
or use two SRCREV_foo statements.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFVnO/FMkyGM64RGpERAr4DAJ96PYxPoMF3JR3Vc4QpMP2l9FhuAACfYPao
pdHU9MAwNQDfvcegqR7tRTY=
=GSXq
-END PGP SIGNATURE-
--
Best Reagrds,
Roy | RongQing Li
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
> -Original Message-
> From: openembedded-devel-boun...@lists.openembedded.org
> [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf Of
> Martin Jansa
> Sent: Wednesday, July 08, 2015 7:59 PM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
>
> On Wed, Jul 08, 2015 at 12:32:37PM +0200, Martin Jansa wrote:
> > On Thu, Jul 02, 2015 at 09:01:14AM +, Bian, Naimeng wrote:
> > > Hi Martin,
> > >
> > > I think I have fixed them and pushed them to github, please cherry-pick
> them.
> > >
> > > - libldb
> > >
> > > https://github.com/bendaaron/meta-oe-dev/commit/c6cade4236226646fde9
> > > 9611c20fe3fcc6612e7a
> >
> > Hi Bian,
> >
> > it's still failing with this patch. I'll try to build it manually and
> > provide more details.
>
> find /usr/lib/python* -name \*tdb\*
> =nothing=
>
> ldb and tdb workdirs are here:
> http://logs.nslu2-linux.org/buildlogs/oe/world/libldb.tar.bz2
> http://logs.nslu2-linux.org/buildlogs/oe/world/libtdb.tar.bz2
>
Thank you very much.
I confirmed that tdb.so is exists in ${D}/usr/lib/python2.7/site-packages of
libtdb.
Would you helping me check whether does tdb.so exist in
${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}
after building libtdb.
# find
/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86-64/usr/lib/python2.7/site-packages
-name \*tdb\*
Thanks
Bian
> > > - samba
> > >
> > > https://github.com/bendaaron/meta-oe-dev/commit/25430ee92bbb2820294c
> > > b9ce239d9d4dccc492ea
> > >
> > > Thanks
> > > Bian
> > >
> > > > -Original Message-
> > > > From: openembedded-devel-boun...@lists.openembedded.org
> > > > [mailto:openembedded-devel-boun...@lists.openembedded.org] On
> > > > Behalf Of Bian, Naimeng
> > > > Sent: Wednesday, June 24, 2015 3:05 PM
> > > > To: openembedded-devel@lists.openembedded.org
> > > > Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
> > > >
> > > > > -Original Message-
> > > > > From: openembedded-devel-boun...@lists.openembedded.org
> > > > > [mailto:openembedded-devel-boun...@lists.openembedded.org] On
> > > > > Behalf Of Martin Jansa
> > > > > Sent: Tuesday, June 23, 2015 4:05 PM
> > > > > To: openembedded-devel
> > > > > Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
> > > > >
> > > > > I don't have access to that build anymore (because it's jenkins
> > > > > job using tmpfs for TMPDIR, so after the build the TMPDIR is
> > > > > gone), but it's failing only in
> > > > > qemux86-64 builds, so I assume that it's finding host tdb or
> > > > > python directories, because it's running on 12.04 Ubuntu x86-64.
> > > > >
> > > > > Try to install tdb on your build host if it allows you to
> > > > > reproduce the issue, otherwise I'll try to reproduce it again in some
> next jenkins build.
> > > > >
> > > >
> > > > My host is CentOS6.5 x86-64, and although I installed tdb.so into
> > > > my host, i still cannot reproduce it.
> > > >
> > > > And, I have exported
> > > > PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} in
> > > > waf-samba.bbclasss which is inherited by libldb. IMO, it should
> > > > find modules in PYTHONPATH firstly.
> > > >
> > > > Thanks
> > > > Bian
> > > >
> > > >
> > > > > On Tue, Jun 23, 2015 at 7:47 AM, Bian, Naimeng
> > > > >
> > > > > wrote:
> > > > >
> > > > > > > -Original Message-
> > > > > > > From: openembedded-devel-boun...@lists.openembedded.org
> > > > > > > [mailto:openembedded-devel-boun...@lists.openembedded.org]
> > > > > > > On Behalf Of Martin Jansa
> > > > > > > Sent: Friday, June 19, 2015 11:57 PM
> > > > > > > To: openembedded-devel@lists.openembedded.org
> > > > > > > Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new
> > > > > > > recipe
> > > > > > >
> > > > > > > On Wed, Jun 17, 2015 at 03:49:09PM +0800, Bian Naimeng wrote:
> > > > > > > > libldb is required by samba4
> > > > > > > >
> > > > > > > > Signed-off-by: Bian Naimeng
> > > > > > > > ---
> > > > > > > > .../do-not-import-target-module-in-configure.patch | 32
> > > > > > +++
> > > > > > > > meta-oe/recipes-support/libldb/libldb_1.1.17.bb| 45
> > > > > > > ++
> > > > > > > > 2 files changed, 77 insertions(+) create mode 100644
> > > > > > > > meta-oe/recipes-support/libldb/libldb/do-not-import-target
> > > > > > > > -modul
> > > > > > > > e- in-c onfigure.patch create mode 100644
> > > > > > > > meta-oe/recipes-support/libldb/libldb_1.1.17.bb
> > > > > > >
> > > > > > > Fails to build in bitbake world:
> > > > > > >
> > > > > > > | Checking for system tdb >=
> > > > > > > 1.2.13 : yes
> > > > > > > | ERROR: Python module pytdb of version 1.2.13 not found,
> > > > > > > | and bundling disabled
> > > > > > > | WARNING: exit code 1 from a shell command.
> > > > > > > | ERROR: Function failed: do_configure (log file is located
> > > > > > > | at
> > > > > > > | /home/jenkins/oe/world/shr-core/t
Re: [oe] SSL Certificate Path for Python
Hi
To follow up with one more piece of the puzzle: c_rehash.
With the suggested install_append in-place, openssl can find
certificates but they aren't indexed/hashed so aren't usable---the
c_rehash utility (from the openssl-misc package) needs to be called.
It looks like this would normally be done by the
update-ca-certificates script as part of the do_install step for the
ca-certificates package but it has been disabled by the
"0001-update-ca-certificates-remove-c-rehash.patch". By disabling
this patch, c_rehash (albeit the host's version) runs and openssl is
able to verify correctly.
It looks like this patch has a long history [1,2, 3] from before 2009
when it was part of meta-shr (I think?) but I can't find the original
reason. Anyone familiar with this?
Second: am I doing something wrong in my usage of OpenSSl? I started
debugging because the smart package manager couldn't use a package
repository at a https:// endpoint---a perhaps unusual use-case. As
I've gone down the debugging rabbit hole though, it seems like SSL
basically shouldn't be working for any application relying on openssl
which makes me think either a) others are running into this or, more
likely, b) I'm doing something silly.
[1]
https://git.congatec.com/yocto/meta-openembedded/blob/89500c583e0f1dc1b4ffdf72914e08e505e427e0/meta-oe/recipes-support/ca-certificates/ca-certificates_20090814+nmu2.bb
[2]
http://lists.openembedded.org/pipermail/openembedded-devel/2011-April/077006.html
[3]
https://github.com/openembedded/oe-core/blob/master/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch
--Ash
On Tue, Jul 7, 2015 at 5:37 PM, Ash Charles wrote:
> Hi,
>
> I did a little more digging---the issue is not so much related to
> python as it is a difference in configuration between the
> ca-certificates and openssl packages.
>
> SSL certificates provided by the ca-certificates package are installed
> to /usr/share/ca-certificates/mozilla and then symlinked to the
> standard /etc/ssl/certs (controlled by ETCCERTSDIR) as a post-install.
>
> OpenSSL gets built expecting that certificates will be stored at
> /usr/lib/ssl/certs (check the 'openssldir' compiled in using 'openssl
> version -d')---a standard but empty directory. This means we get
> verification failures for anything using openssl that doesn't
> explicitly provide a set of valid certificates. In my case, this is
> breaking the Smart package manager when using a repository at a
> 'https' URL (the certificate is valid).
>
> Debian solves this by symlinking the whole /usr/lib/ssl to /etc/ssl/
> as a postinstall step on the openssl package. I added this in a
> similar fashion in a bbappend for testing:
> do_install_append() {
> rm -r ${D}${libdir}/ssl/certs
> ln -sf /etc/ssl/certs ${D}${libdir}/ssl/certs
> }
>
> Does this seem like a reasonable approach? Another approach could be
> setting the SSL_CERT_DIR to /etc/ssl/certs in .profile (or similar).
>
> --Ash
>
> On Mon, Jul 6, 2015 at 5:16 PM, Ash Charles wrote:
>> Hi,
>>
>> With the move from python 2.7.3 (dizzy) to 2.7.9 (fido), Python
>> actually validates SSL-transport for https URLs [1]. Python, by
>> default (i.e. no environment variable SSL_CERT_DIR set), looks for
>> certificates at '/usr/lib/ssl/certs'. I tested this in a Python
>> shell:
>> import ssl
>> ssl.get_default_verify_paths()
>>
>> The ca-certificates recipe seems to be installing certificates to
>> ${D}${sysconfdir}/ssl/certs or /usr/share/ca-certificates/mozilla/
>> instead. I think that Python will need a way to find the system's
>> certificates. I can create a patch to do this but this seems to
>> couple the configuration in the ca-certificates and python recipes.
>>
>> Has anyone stumbled across this issue? Is there a standard way of
>> looking up where a system is storing its certificates?
>>
>> [1] https://www.python.org/dev/peps/pep-0476/
>>
>> Thanks for any insights---I'm learning much more about SSL
>> certificates than I expected today ;-).
>>
>> --Ash
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe] postgresql: Add explict getVar expansion parameter
Bitbake is likely to require this parameter in future, add
the default value.
Patch generated with the command:
sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *`
Signed-off-by: Richard Purdie
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc
b/meta-oe/recipes-support/postgresql/postgresql.inc
index c7aed9e..15fb7c7 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -84,14 +84,14 @@ python populate_packages_prepend() {
if name is None or name.strip() == "":
return
-fpack=d.getVar('PACKAGES') or ""
+fpack=d.getVar('PACKAGES', False) or ""
fpack="${PN}-" + name + " " + fpack
if dbg:
fpack="${PN}-" + name + "-dbg" + " " + fpack
d.setVar('PACKAGES', fpack)
conf=(d.getVar('PACKAGECONFIG', True) or "").split()
-pack=d.getVar('PACKAGES') or ""
+pack=d.getVar('PACKAGES', False) or ""
bb.debug(1, "PACKAGECONFIG=%s" % conf)
bb.debug(1, "PACKAGES1=%s" % pack )
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-networking] postfix: Add explict getVar expansion parameter
Bitbake is likely to require this parameter in future, add
the default value.
Patch generated with the command:
sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *`
Signed-off-by: Richard Purdie
diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc
b/meta-networking/recipes-daemons/postfix/postfix.inc
index fa75a78..cd768cc 100644
--- a/meta-networking/recipes-daemons/postfix/postfix.inc
+++ b/meta-networking/recipes-daemons/postfix/postfix.inc
@@ -232,7 +232,7 @@ pkg_postinst_${PN} () {
touch $D/etc/postfix/virtual_alias
postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias
-if ${@'true' if 'linuxstdbase' in d.getVar('DISTROOVERRIDES') else
'false'}; then
+if ${@'true' if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False)
else 'false'}; then
# /usr/lib/sendmial is required by LSB core test
[ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail
$D/usr/lib/
fi
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-multimedia] gst-ffmpeg: Add explict getVar expansion parameter
Bitbake is likely to require this parameter in future, add
the default value.
Patch generated with the command:
sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *`
Signed-off-by: Richard Purdie
diff --git
a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb
b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb
index 7bd7ec3..8909f37 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb
@@ -79,8 +79,8 @@ GSTREAMER_DEBUG ?= "--disable-debug"
FFMPEG_EXTRA_CONFIGURE = "--with-ffmpeg-extra-configure"
# pass --cpu for powerpc. get cpu name by stripping "ppc" or "ppc64"
# from DEFAULTTUNE
-FFMPEG_CPU_powerpc = "--cpu=${@d.getVar('DEFAULTTUNE')[3:]}"
-FFMPEG_CPU_powerpc64 = "--cpu=${@d.getVar('DEFAULTTUNE')[5:]}"
+FFMPEG_CPU_powerpc = "--cpu=${@d.getVar('DEFAULTTUNE', False)[3:]}"
+FFMPEG_CPU_powerpc64 = "--cpu=${@d.getVar('DEFAULTTUNE', False)[5:]}"
FFMPEG_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux ${FFMPEG_CPU} \
--cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
--ranlib='${RANLIB}' \
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
if it is possible, can the security fix be noted?
1.4:
CVE-2014-9403
On 07/06/2015 06:55 PM, rongqing...@windriver.com wrote:
From: Roy Li
Remove backport patch
Add CSocket submodule
Add the dependency on icu
Signed-off-by: Roy Li
---
...-Fix-NULL-pointer-dereference-in-webadmin.patch | 58 --
meta-networking/recipes-irc/znc/znc_git.bb | 12 ++---
2 files changed, 6 insertions(+), 64 deletions(-)
delete mode 100644
meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
diff --git
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
b/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
deleted file mode 100644
index 68e4414..000
---
a/meta-networking/recipes-irc/znc/znc/0001-Fix-NULL-pointer-dereference-in-webadmin.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Subject: [PATCH] Fix NULL pointer dereference in webadmin.
-
-Upstream-Status: Backport
-
-commit 2bd410ee5570cea127233f1133ea22f25174eb28 upstream
-
-Triggerable by any non-admin, if webadmin is loaded.
-
-The only affected version is 1.0
-
-Thanks to ChauffeR (Simone Esposito) for reporting this.
- modules/webadmin.cpp | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
-index b793c02..816f217 100644
a/modules/webadmin.cpp
-+++ b/modules/webadmin.cpp
-@@ -419,7 +419,7 @@ public:
- CIRCNetwork* pNetwork =
SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() ||
spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() ||
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
-@@ -448,7 +448,7 @@ public:
- CIRCNetwork* pNetwork =
SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() ||
spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() ||
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
-@@ -472,7 +472,7 @@ public:
- CIRCNetwork* pNetwork =
SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() ||
spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() ||
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
-@@ -486,7 +486,7 @@ public:
- CIRCNetwork* pNetwork =
SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() ||
spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() ||
!pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
---
-1.8.5.2.233.g932f7e4
-
diff --git a/meta-networking/recipes-irc/znc/znc_git.bb
b/meta-networking/recipes-irc/znc/znc_git.bb
index 2e35e4d..f5bed08 100644
--- a/meta-networking/recipes-irc/znc/znc_git.bb
+++ b/meta-networking/recipes-irc/znc/znc_git.bb
@@ -1,16 +1,16 @@
SUMMARY = "ZNC, an advanced IRC bouncer"
SECTION = "net"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-DEPENDS = "openssl"
+DEPENDS = "openssl zlib icu"
-PV = "1.0+git"
+PV = "1.6.0+git"
-SRCREV = "ef59c23068547c132cb678092fba9a21317fd5f2"
-SRC_URI = "git://github.com/znc/znc.git \
- file://0001-Fix-NULL-pointer-dereference-in-webadmin.patch \
+SRC_URI =
"git://github.com/znc/znc.git;rev=f47e8465efa4e1cd948b9caae93ac401b4355df8 \
+
git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket
\
"
+SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee"
S = "${WORKDIR}/git"
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] nodejs: update to 0.12.6
this update includes a security fix. No CVE assigned yet.
On 07/07/2015 12:43 AM, Jonathan Liu wrote:
Signed-off-by: Jonathan Liu
---
.../recipes-devtools/nodejs/{nodejs_0.12.5.bb => nodejs_0.12.6.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-devtools/nodejs/{nodejs_0.12.5.bb => nodejs_0.12.6.bb}
(95%)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.12.5.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_0.12.6.bb
similarity index 95%
rename from meta-oe/recipes-devtools/nodejs/nodejs_0.12.5.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_0.12.6.bb
index 5685721..73c0557 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_0.12.5.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.12.6.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \
file://enable-armv5e-build.patch \
file://no-registry.patch \
"
-SRC_URI[md5sum] = "aa6d22762e70b4f46293a17373788291"
-SRC_URI[sha256sum] =
"4bc1e25f4c62ac65324d3cf4aa9de2d801cd708757c3567b6ad2ced7df30cdd2"
+SRC_URI[md5sum] = "698ebd8ecd5c9c61091875bbd54401f4"
+SRC_URI[sha256sum] =
"7a3b5ac351973a9dee8edbf0684bc8d0dea44b231e42274ffb008141ffa19ad2"
S = "${WORKDIR}/node-v${PV}"
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] libssh2: upgrade 1.4.3 -> 1.6.0
is is possible to include a reference to the security fix?
1.5.0 release
Security Advisory: Using `SSH_MSG_KEXINIT` data unbounded, CVE-2015-1782
On 07/08/2015 12:40 AM, Li xin wrote:
Update the checksum of COPYING,since the date in it has been changed,
but the LICENSE has not been changed.
Signed-off-by: Li Xin
---
.../recipes-support/libssh2/{libssh2_1.4.3.bb => libssh2_1.6.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/libssh2/{libssh2_1.4.3.bb => libssh2_1.6.0.bb}
(60%)
diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb
b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
similarity index 60%
rename from meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb
rename to meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
index b537663..022482c 100644
--- a/meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb
+++ b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
@@ -5,11 +5,11 @@ SECTION = "libs"
DEPENDS = "zlib openssl"
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d00afe44f336a79a2ca7e1681ce14509"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca"
SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz";
-SRC_URI[md5sum] = "071004c60c5d6f90354ad1b701013a0b"
-SRC_URI[sha256sum] =
"eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d"
+SRC_URI[md5sum] = "00aabd6e714a5f42a4fb82ace20db1dd"
+SRC_URI[sha256sum] =
"5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215"
inherit autotools pkgconfig
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
On Wed, Jul 08, 2015 at 12:32:37PM +0200, Martin Jansa wrote:
> On Thu, Jul 02, 2015 at 09:01:14AM +, Bian, Naimeng wrote:
> > Hi Martin,
> >
> > I think I have fixed them and pushed them to github, please cherry-pick
> > them.
> >
> > - libldb
> >
> > https://github.com/bendaaron/meta-oe-dev/commit/c6cade4236226646fde99611c20fe3fcc6612e7a
>
> Hi Bian,
>
> it's still failing with this patch. I'll try to build it manually and
> provide more details.
find /usr/lib/python* -name \*tdb\*
=nothing=
ldb and tdb workdirs are here:
http://logs.nslu2-linux.org/buildlogs/oe/world/libldb.tar.bz2
http://logs.nslu2-linux.org/buildlogs/oe/world/libtdb.tar.bz2
> > - samba
> >
> > https://github.com/bendaaron/meta-oe-dev/commit/25430ee92bbb2820294cb9ce239d9d4dccc492ea
> >
> > Thanks
> > Bian
> >
> > > -Original Message-
> > > From: openembedded-devel-boun...@lists.openembedded.org
> > > [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf Of
> > > Bian,
> > > Naimeng
> > > Sent: Wednesday, June 24, 2015 3:05 PM
> > > To: openembedded-devel@lists.openembedded.org
> > > Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
> > >
> > > > -Original Message-
> > > > From: openembedded-devel-boun...@lists.openembedded.org
> > > > [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf
> > > > Of Martin Jansa
> > > > Sent: Tuesday, June 23, 2015 4:05 PM
> > > > To: openembedded-devel
> > > > Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
> > > >
> > > > I don't have access to that build anymore (because it's jenkins job
> > > > using tmpfs for TMPDIR, so after the build the TMPDIR is gone), but
> > > > it's failing only in
> > > > qemux86-64 builds, so I assume that it's finding host tdb or python
> > > > directories, because it's running on 12.04 Ubuntu x86-64.
> > > >
> > > > Try to install tdb on your build host if it allows you to reproduce
> > > > the issue, otherwise I'll try to reproduce it again in some next
> > > > jenkins build.
> > > >
> > >
> > > My host is CentOS6.5 x86-64, and although I installed tdb.so into my
> > > host, i
> > > still cannot reproduce it.
> > >
> > > And, I have exported
> > > PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} in
> > > waf-samba.bbclasss which is inherited by libldb. IMO, it should find
> > > modules
> > > in PYTHONPATH firstly.
> > >
> > > Thanks
> > > Bian
> > >
> > >
> > > > On Tue, Jun 23, 2015 at 7:47 AM, Bian, Naimeng
> > > > wrote:
> > > >
> > > > > > -Original Message-
> > > > > > From: openembedded-devel-boun...@lists.openembedded.org
> > > > > > [mailto:openembedded-devel-boun...@lists.openembedded.org] On
> > > > > > Behalf Of Martin Jansa
> > > > > > Sent: Friday, June 19, 2015 11:57 PM
> > > > > > To: openembedded-devel@lists.openembedded.org
> > > > > > Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
> > > > > >
> > > > > > On Wed, Jun 17, 2015 at 03:49:09PM +0800, Bian Naimeng wrote:
> > > > > > > libldb is required by samba4
> > > > > > >
> > > > > > > Signed-off-by: Bian Naimeng
> > > > > > > ---
> > > > > > > .../do-not-import-target-module-in-configure.patch | 32
> > > > > +++
> > > > > > > meta-oe/recipes-support/libldb/libldb_1.1.17.bb| 45
> > > > > > ++
> > > > > > > 2 files changed, 77 insertions(+) create mode 100644
> > > > > > > meta-oe/recipes-support/libldb/libldb/do-not-import-target-modul
> > > > > > > e- in-c onfigure.patch create mode 100644
> > > > > > > meta-oe/recipes-support/libldb/libldb_1.1.17.bb
> > > > > >
> > > > > > Fails to build in bitbake world:
> > > > > >
> > > > > > | Checking for system tdb >=
> > > > > > 1.2.13 : yes
> > > > > > | ERROR: Python module pytdb of version 1.2.13 not found, and
> > > > > > | bundling disabled
> > > > > > | WARNING: exit code 1 from a shell command.
> > > > > > | ERROR: Function failed: do_configure (log file is located at
> > > > > > | /home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux
> > > > > > | /l
> > > > > > | ibld
> > > > > > | b/1.1.17-r0/temp/log.do_configure.22697)
> > > > > > NOTE: recipe libldb-1.1.17-r0: task do_configure: Failed
> > > > > > ERROR: Task 25505
> > > > > >
> > > > > (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-s
> > > > > up
> > > > > port
> > > > > > /libldb/libldb_1.1.17.bb, do_configure) failed with exit code '1'
> > > > > >
> > > > >
> > > > > tdb.so is provided by libtdb which is DEPEND-ed by libldb, I think
> > > > > it should be installed into STAGING_DIR_HOST/PYTHON_SITEPACKAGES_DIR.
> > > > >
> > > > > Because I could not reproduce it in my building, would you mind
> > > > > telling me whether does tdb.so exist in
> > > > > STAGING_DIR_HOST/PYTHON_SITEPACKAGES_DIR/ while this error was caught.
> > > > >
> > > > > Thanks
> > > > > Bian
> > > > >
> > > > > > > diff --git
> > > > > > > a/meta-oe/recipes-supp
Re: [oe] [PATCH][meta-networking] ypbind-mt: set path of ypdomainname in ypbind script
On Wed, Jul 08, 2015 at 11:21:14AM +0800, Jian Liu wrote:
> The script ypbind will cause error if using ypdomainname command
> provided by busybox. So add RDEPENDCY on yp-tools and change
> the path of ypdomainname.
Missing meta-networking/ prefix
> Signed-off-by: Jian Liu
> ---
> recipes-support/nis/files/ypbind-yocto.init | 11 ++-
> recipes-support/nis/ypbind-mt_1.36.bb | 1 +
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/recipes-support/nis/files/ypbind-yocto.init
> b/recipes-support/nis/files/ypbind-yocto.init
> index da533a1..f97a3e1 100644
> --- a/recipes-support/nis/files/ypbind-yocto.init
> +++ b/recipes-support/nis/files/ypbind-yocto.init
> @@ -26,6 +26,7 @@
>
> YPBIND_BIN=/usr/sbin/ypbind
> pidfile=/var/run/ypbind.pid
> +YPDOMAINNAME_bin=/usr/bin/ypdomainname
>
> [ -f /etc/default/ypbind ] && . /etc/default/ypbind
>
> @@ -34,14 +35,14 @@ case "$1" in
> echo -n "Starting ypbind"
> ## If the domainname is not set, skip starting of ypbind
> ## and return with "program not configured"
> -/bin/ypdomainname &> /dev/null
> -if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
> +$YPDOMAINNAME_bin &> /dev/null
> +if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
> if [ -f /etc/defaultdomain ]; then
> XDOMAINNAME=`cat /etc/defaultdomain`
> - /bin/ypdomainname "$XDOMAINNAME"
> + $YPDOMAINNAME_bin "$XDOMAINNAME"
> fi
> - /bin/ypdomainname &> /dev/null
> - if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
> + $YPDOMAINNAME_bin &> /dev/null
> + if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
># Tell the user this has skipped
>echo -n " . . . . . . . . . . No domainname set"
> # service is not configured
> diff --git a/recipes-support/nis/ypbind-mt_1.36.bb
> b/recipes-support/nis/ypbind-mt_1.36.bb
> index 35ef16a..4fdef9f 100644
> --- a/recipes-support/nis/ypbind-mt_1.36.bb
> +++ b/recipes-support/nis/ypbind-mt_1.36.bb
> @@ -50,3 +50,4 @@ RPROVIDES_${PN} += "${PN}-systemd"
> RREPLACES_${PN} += "${PN}-systemd"
> RCONFLICTS_${PN} += "${PN}-systemd"
> SYSTEMD_SERVICE_${PN} = "ypbind.service"
> +RDEPENDS_${PN} += "yp-tools"
> --
> 1.8.5.2.233.g932f7e4
>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
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][meta-networking] systemd.bbclass: delete dangling symblink
On Wed, Jul 08, 2015 at 11:23:15AM +0800, Jian Liu wrote:
> If only systemd is enabled, scripts of sysvinit under "/etc/init.d/"
> will be deleted. But there may be some symblinks /etc/rc*/ that
> points to the files under "/etc/init.d/". We need to delete them.
Wrong ML
> Signed-off-by: Jian Liu
> ---
> meta/classes/systemd.bbclass | 29 +
> 1 file changed, 29 insertions(+)
>
> diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
> index c34884b..ff3e0f8 100644
> --- a/meta/classes/systemd.bbclass
> +++ b/meta/classes/systemd.bbclass
> @@ -184,6 +184,31 @@ do_install[postfuncs] += "rm_systemd_unitdir "
> python rm_sysvinit_initddir (){
> import shutil
> sysv_initddir = oe.path.join(d.getVar("D", True),
> (d.getVar('INIT_D_DIR', True) or "/etc/init.d"))
> +sysv_rcdirs = []
> +cpath = oe.cachedpath.CachedPath()
> +
> +def check_dangling_sym(file,inst_root):
> +if not cpath.islink(file):
> +return False
> +
> +rtarget = cpath.realpath(file, inst_root, True, assume_dir = True)
> +if not cpath.lexists(rtarget):
> +return True
> +
> +return False
> +
> +# delete dangling symblink under rc*
> +def rm_sysv_rcdirs():
> +dest = d.getVar("D", True)
> +rcdirs = "rc.d rc0.d rc1.d rc2.d rc3.d rc4.d rc5.d rc6.d rcS.d"
> +
> +for rcdir in rcdirs.split():
> +path = dest + "/etc/" + rcdir
> +for walk_root, walk_dirs, walk_files in cpath.walk(path):
> +for file in walk_files:
> +file = walk_root + "/" + file
> +if check_dangling_sym(file, walk_root):
> +sysv_rcdirs.append(file)
>
> if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and \
> not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d)
> and \
> @@ -193,5 +218,9 @@ python rm_sysvinit_initddir (){
> # If systemd_unitdir contains anything, delete sysv_initddir
> if (os.path.exists(systemd_unitdir) and os.listdir(systemd_unitdir)):
> shutil.rmtree(sysv_initddir)
> +
> +rm_sysv_rcdirs()
> +for rcdir in sysv_rcdirs:
> +os.remove(rcdir)
> }
> do_install[postfuncs] += "rm_sysvinit_initddir "
> --
> 1.8.5.2.233.g932f7e4
>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] libssh2: upgrade 1.4.3 -> 1.6.0
On Wed, Jul 08, 2015 at 03:40:15PM +0800, Li xin wrote:
> Update the checksum of COPYING,since the date in it has been changed,
> but the LICENSE has not been changed.
There already is patch for this on ML and in master-next.
> Signed-off-by: Li Xin
> ---
> .../recipes-support/libssh2/{libssh2_1.4.3.bb => libssh2_1.6.0.bb} | 6
> +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> rename meta-oe/recipes-support/libssh2/{libssh2_1.4.3.bb =>
> libssh2_1.6.0.bb} (60%)
>
> diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb
> b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
> similarity index 60%
> rename from meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb
> rename to meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
> index b537663..022482c 100644
> --- a/meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb
> +++ b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
> @@ -5,11 +5,11 @@ SECTION = "libs"
> DEPENDS = "zlib openssl"
>
> LICENSE = "BSD"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=d00afe44f336a79a2ca7e1681ce14509"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca"
>
> SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz";
> -SRC_URI[md5sum] = "071004c60c5d6f90354ad1b701013a0b"
> -SRC_URI[sha256sum] =
> "eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d"
> +SRC_URI[md5sum] = "00aabd6e714a5f42a4fb82ace20db1dd"
> +SRC_URI[sha256sum] =
> "5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215"
>
> inherit autotools pkgconfig
>
> --
> 1.8.4.2
>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
On Thu, Jul 02, 2015 at 09:01:14AM +, Bian, Naimeng wrote:
> Hi Martin,
>
> I think I have fixed them and pushed them to github, please cherry-pick them.
>
> - libldb
>
> https://github.com/bendaaron/meta-oe-dev/commit/c6cade4236226646fde99611c20fe3fcc6612e7a
Hi Bian,
it's still failing with this patch. I'll try to build it manually and
provide more details.
> - samba
>
> https://github.com/bendaaron/meta-oe-dev/commit/25430ee92bbb2820294cb9ce239d9d4dccc492ea
>
> Thanks
> Bian
>
> > -Original Message-
> > From: openembedded-devel-boun...@lists.openembedded.org
> > [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf Of
> > Bian,
> > Naimeng
> > Sent: Wednesday, June 24, 2015 3:05 PM
> > To: openembedded-devel@lists.openembedded.org
> > Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
> >
> > > -Original Message-
> > > From: openembedded-devel-boun...@lists.openembedded.org
> > > [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf
> > > Of Martin Jansa
> > > Sent: Tuesday, June 23, 2015 4:05 PM
> > > To: openembedded-devel
> > > Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
> > >
> > > I don't have access to that build anymore (because it's jenkins job
> > > using tmpfs for TMPDIR, so after the build the TMPDIR is gone), but
> > > it's failing only in
> > > qemux86-64 builds, so I assume that it's finding host tdb or python
> > > directories, because it's running on 12.04 Ubuntu x86-64.
> > >
> > > Try to install tdb on your build host if it allows you to reproduce
> > > the issue, otherwise I'll try to reproduce it again in some next jenkins
> > > build.
> > >
> >
> > My host is CentOS6.5 x86-64, and although I installed tdb.so into my host, i
> > still cannot reproduce it.
> >
> > And, I have exported
> > PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} in
> > waf-samba.bbclasss which is inherited by libldb. IMO, it should find modules
> > in PYTHONPATH firstly.
> >
> > Thanks
> > Bian
> >
> >
> > > On Tue, Jun 23, 2015 at 7:47 AM, Bian, Naimeng
> > > wrote:
> > >
> > > > > -Original Message-
> > > > > From: openembedded-devel-boun...@lists.openembedded.org
> > > > > [mailto:openembedded-devel-boun...@lists.openembedded.org] On
> > > > > Behalf Of Martin Jansa
> > > > > Sent: Friday, June 19, 2015 11:57 PM
> > > > > To: openembedded-devel@lists.openembedded.org
> > > > > Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
> > > > >
> > > > > On Wed, Jun 17, 2015 at 03:49:09PM +0800, Bian Naimeng wrote:
> > > > > > libldb is required by samba4
> > > > > >
> > > > > > Signed-off-by: Bian Naimeng
> > > > > > ---
> > > > > > .../do-not-import-target-module-in-configure.patch | 32
> > > > +++
> > > > > > meta-oe/recipes-support/libldb/libldb_1.1.17.bb| 45
> > > > > ++
> > > > > > 2 files changed, 77 insertions(+) create mode 100644
> > > > > > meta-oe/recipes-support/libldb/libldb/do-not-import-target-modul
> > > > > > e- in-c onfigure.patch create mode 100644
> > > > > > meta-oe/recipes-support/libldb/libldb_1.1.17.bb
> > > > >
> > > > > Fails to build in bitbake world:
> > > > >
> > > > > | Checking for system tdb >=
> > > > > 1.2.13 : yes
> > > > > | ERROR: Python module pytdb of version 1.2.13 not found, and
> > > > > | bundling disabled
> > > > > | WARNING: exit code 1 from a shell command.
> > > > > | ERROR: Function failed: do_configure (log file is located at
> > > > > | /home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux
> > > > > | /l
> > > > > | ibld
> > > > > | b/1.1.17-r0/temp/log.do_configure.22697)
> > > > > NOTE: recipe libldb-1.1.17-r0: task do_configure: Failed
> > > > > ERROR: Task 25505
> > > > >
> > > > (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-s
> > > > up
> > > > port
> > > > > /libldb/libldb_1.1.17.bb, do_configure) failed with exit code '1'
> > > > >
> > > >
> > > > tdb.so is provided by libtdb which is DEPEND-ed by libldb, I think
> > > > it should be installed into STAGING_DIR_HOST/PYTHON_SITEPACKAGES_DIR.
> > > >
> > > > Because I could not reproduce it in my building, would you mind
> > > > telling me whether does tdb.so exist in
> > > > STAGING_DIR_HOST/PYTHON_SITEPACKAGES_DIR/ while this error was caught.
> > > >
> > > > Thanks
> > > > Bian
> > > >
> > > > > > diff --git
> > > > > > a/meta-oe/recipes-support/libldb/libldb/do-not-import-target-mod
> > > > > > ul
> > > > > > e-in
> > > > > > -configure.patch
> > > > > > b/meta-oe/recipes-support/libldb/libldb/do-not-import-target-mod
> > > > > > ul
> > > > > > e-in
> > > > > > -configure.patch
> > > > > > new file mode 100644
> > > > > > index 000..b4d522a
> > > > > > --- /dev/null
> > > > > > +++ b/meta-oe/recipes-support/libldb/libldb/do-not-import-target
> > > > > > +++ -m
> > > > > > +++ odul
> > > > > > +++ e-in-configure.patch
> > > > > > @@ -0,0 +1,32 @@
>
Re: [oe] [PATCH][meta-networking][v2] znc: upgrade to 1.6.0
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Rongqing Li schreef op 07-07-15 om 09:31:
>
>
> On 2015年07月07日 15:24, Koen Kooi wrote: rongqing...@windriver.com schreef
> op 07-07-15 om 03:55:
From: Roy Li
Remove backport patch Add CSocket submodule Add the dependency on
icu
Signed-off-by: Roy Li ---
>
diff --git a/meta-networking/recipes-irc/znc/znc_git.bb
b/meta-networking/recipes-irc/znc/znc_git.bb index
2e35e4d..f5bed08 100644 ---
a/meta-networking/recipes-irc/znc/znc_git.bb +++
b/meta-networking/recipes-irc/znc/znc_git.bb @@ -1,16 +1,16 @@
SUMMARY = "ZNC, an advanced IRC bouncer" SECTION = "net" LICENSE =
"GPLv2" -LIC_FILES_CHKSUM =
"file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM =
"file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-DEPENDS = "openssl" +DEPENDS = "openssl zlib icu"
-PV = "1.0+git" +PV = "1.6.0+git"
>
> If it's the 1.6 release, just call it '1.6.0'
>
>
>> grep oe-core
>
>> ./meta/recipes-graphics/mesa/mesa_git.bb:PV = "10.5.4+git${SRCPV}"
>> ./meta/recipes-graphics/fstests/fstests_git.bb:PV = "0.1+git${SRCPV}"
>> ./meta/recipes-graphics/mx/mx-1.0_1.4.7.bb:PV = "1.4.7+git${SRCPV}"
>> ./meta/recipes-graphics/drm/libdrm_git.bb:PV = "2.4.40+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-lib/libxcb_git.bb:PV =
>> "1.1.90.1+gitr${SRCPV}"
>> ./meta/recipes-graphics/xorg-lib/libxext_git.bb:PV =
>> "1.0.99.1+gitr${SRCPV}"
>> ./meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb:PV =
>> "0.0+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb:PV =
>> "1.3.2+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb:PV =
>> "1.3.0+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb:PV =
>> "0.15.2+git${SRCPV}"
>> ./meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:PV =
>> "0.1.1+gitr${SRCPV}"
>> ./meta/recipes-graphics/libepoxy/libepoxy_git.bb:PV =
>> "1.2+git${SRCPV}"
>> ./meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb:PV =
>> "0.1+git${SRCPV}"
>> ./meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb:PV =
>> "1.1+git${SRCPV}" ./meta/recipes-devtools/qemu/qemu_git.bb:PV =
>> "1.3.0+git${SRCPV}"
>> ./meta/recipes-devtools/swabber/swabber-native_git.bb:PV =
>> "0.0+git${SRCPV}" ./meta/recipes-devtools/remake/remake_git.bb:PV =
>> "3.82+dbg-0.9+git${SRCPV}"
>> ./meta/recipes-devtools/mtd/mtd-utils_git.bb:PV = "1.5.1+git${SRCPV}"
>> ./meta/recipes-devtools/opkg-utils/opkg-utils_git.bb:PV =
>> "0.1.8+git${SRCPV}"
>> ./meta/recipes-devtools/bootchart2/bootchart2_git.bb:PV =
>> "0.14.6+git${SRCPV}"
>> ./meta/recipes-devtools/mkelfimage/mkelfimage_git.bb:PV =
>> "4.0+git${SRCPV}" ./meta/recipes-devtools/mmc/mmc-utils_git.bb:PV =
>> "0.1" ./meta/recipes-devtools/pseudo/pseudo_git.bb:PV =
>> "1.6.5+git${SRCPV}" ./meta/recipes-devtools/prelink/prelink_git.bb:PV =
>> "1.0+git${SRCPV}" ./meta/recipes-devtools/pkgconfig/pkgconfig.inc:PV =
>> "0.28+git${SRCPV}"
>> ./meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb:PV =
>> "4.0.1+git${SRCPV}"
>> ./meta/recipes-devtools/gnu-config/gnu-config_git.bb:PV =
>> "1.0+git${SRCPV}" ./meta/recipes-devtools/tcf-agent/tcf-agent_git.bb:PV
>> = "0.4.0+git${SRCPV}" ./meta/recipes-devtools/fdisk/gptfdisk_git.bb:PV
>> = "0.8.10+git${SRCPV}" ./meta/recipes-multimedia/x264/x264_git.bb:PV =
>> "r2491+git${SRCPV}"
>> ./meta/recipes-multimedia/libav/libpostproc_git.bb:PV =
>> "52.3.0+git${SRCPV}"
Your point being?
>
>
>
-SRCREV = "ef59c23068547c132cb678092fba9a21317fd5f2" -SRC_URI =
"git://github.com/znc/znc.git \ -
file://0001-Fix-NULL-pointer-dereference-in-webadmin.patch \
+SRC_URI =
"git://github.com/znc/znc.git;rev=f47e8465efa4e1cd948b9caae93ac401b4355df
8
\ +
git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;n
ame
>
=Csocket
\ " +SRCREV_Csocket = "07b4437396122650e5b8fb3d014e820a5decf4ee"
>
> Why are you using 2 different notations for SRCREV?
>
>
>
>> there are two different git repo
That's not a reason to use 2 different notations. Either put both in SRC_URI
or use two SRCREV_foo statements.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFVnO/FMkyGM64RGpERAr4DAJ96PYxPoMF3JR3Vc4QpMP2l9FhuAACfYPao
pdHU9MAwNQDfvcegqR7tRTY=
=GSXq
-END PGP SIGNATURE-
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libssh2: upgrade 1.4.3 -> 1.6.0
Update the checksum of COPYING,since the date in it has been changed,
but the LICENSE has not been changed.
Signed-off-by: Li Xin
---
.../recipes-support/libssh2/{libssh2_1.4.3.bb => libssh2_1.6.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/libssh2/{libssh2_1.4.3.bb => libssh2_1.6.0.bb}
(60%)
diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb
b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
similarity index 60%
rename from meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb
rename to meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
index b537663..022482c 100644
--- a/meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb
+++ b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
@@ -5,11 +5,11 @@ SECTION = "libs"
DEPENDS = "zlib openssl"
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d00afe44f336a79a2ca7e1681ce14509"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca"
SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz";
-SRC_URI[md5sum] = "071004c60c5d6f90354ad1b701013a0b"
-SRC_URI[sha256sum] =
"eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d"
+SRC_URI[md5sum] = "00aabd6e714a5f42a4fb82ace20db1dd"
+SRC_URI[sha256sum] =
"5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215"
inherit autotools pkgconfig
--
1.8.4.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
