On Tue, Jan 20, 2015 at 03:42:12PM +0800, Kai Kang wrote: > Some updates for lksctp-tools: > > * add ptest subpackage > * only blacklist lksctp-tools when gold ld is used. Refer to: > https://bugs.gentoo.org/show_bug.cgi?id=530318 > * update licenses and add homepage. > > Signed-off-by: Kai Kang <[email protected]> > --- > .../lksctp-tools/lksctp-tools/run-ptest | 5 +++++ > .../lksctp-tools/lksctp-tools/v4test.sh | 11 +++++++++++ > .../lksctp-tools/lksctp-tools/v6test.sh | 11 +++++++++++ > .../lksctp-tools/lksctp-tools_1.0.16.bb | 21 > +++++++++++++++++---- > 4 files changed, 44 insertions(+), 4 deletions(-) > create mode 100644 > meta-networking/recipes-support/lksctp-tools/lksctp-tools/run-ptest > create mode 100644 > meta-networking/recipes-support/lksctp-tools/lksctp-tools/v4test.sh > create mode 100644 > meta-networking/recipes-support/lksctp-tools/lksctp-tools/v6test.sh
OE @ ~/meta-openembedded $ pwam 87065 2015-01-20 16:08:10 URL:http://patchwork.openembedded.org/patch/87065/mbox/ [4796] -> "pw-am-87065.patch" [1] Applying: lksctp-tools: add ptest subpackage and other updates /OE/meta-openembedded/.git/rebase-apply/patch:21: new blank line at EOF. + error: patch failed: meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb:16 error: meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb: patch does not apply Patch failed at 0001 lksctp-tools: add ptest subpackage and other updates The copy of the patch that failed is found in: /OE/meta-openembedded/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". most likely because the change was based on commit older than OE @ ~/meta-openembedded $ git log meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb commit 96a92761c0a1bb2317fa4ea422c32e4473405103 Author: Martin Jansa <[email protected]> Date: Sat Dec 6 08:01:57 2014 +0100 PNBLACKLIST: use weak assignments please rebase before sending > > diff --git > a/meta-networking/recipes-support/lksctp-tools/lksctp-tools/run-ptest > b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/run-ptest > new file mode 100644 > index 0000000..e67f18e > --- /dev/null > +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/run-ptest > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +sh v4test.sh > +sh v6test.sh > + > diff --git > a/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v4test.sh > b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v4test.sh > new file mode 100644 > index 0000000..5130856 > --- /dev/null > +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v4test.sh > @@ -0,0 +1,11 @@ > +#!/bin/sh > +echo "v4test starting:" > +for t in $(find -maxdepth 1 -type f \! -name test\*_v6 -name test\*); do > + echo "$t"; > + if $t; then > + echo "PASS: $t"; echo ""; > + else > + echo "FAIL: $t"; echo ""; > + fi > + sleep 1; > +done > diff --git > a/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v6test.sh > b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v6test.sh > new file mode 100644 > index 0000000..3a667df > --- /dev/null > +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v6test.sh > @@ -0,0 +1,11 @@ > +#!/bin/sh > +echo "v6test starting:" > +for t in $(find -maxdepth 1 -name test\*_v6); do > + echo "$t"; > + if $t; then > + echo "PASS: $t"; echo ""; > + else > + echo "FAIL: $t"; echo ""; > + fi > + sleep 1; > +done > diff --git > a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb > b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb > index e2551e1..b756dd7 100644 > --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb > +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb > @@ -1,13 +1,18 @@ > SUMMARY = "The Linux Kernel Stream Control Transmission Protocol (lksctp) > project" > +HOMEPAGE = "http://lksctp.org"; > SECTION = "libs" > -LICENSE = "LGPLv2" > +LICENSE = "LGPLv2.1 & GPLv2" > > LIC_FILES_CHKSUM = " \ > file://COPYING.lib;md5=0a1b79af951c42a9c8573533fbba9a92 \ > file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ > " > > -SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz" > +SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz \ > + file://run-ptest \ > + file://v4test.sh \ > + file://v6test.sh \ > + " > > SRC_URI[md5sum] = "708bb0b5a6806ad6e8d13c55b067518e" > SRC_URI[sha256sum] = > "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae351f26" > @@ -16,13 +21,21 @@ SRC_URI[sha256sum] = > "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae > #| > /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: > error: symbol sctp_connectx has undefined version > #| collect2: error: ld returned 1 exit status > #| make[4]: *** [libsctp.la] Error 1 > -PNBLACKLIST[lksctp-tools] = "BROKEN: fails to link against sctp_connectx > symbol" > +PNBLACKLIST[lksctp-tools] = "${@base_contains('DISTRO_FEATURES', > 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" > > S = "${WORKDIR}/${BP}" > > BBCLASSEXTEND = "native" > > -inherit autotools pkgconfig binconfig > +inherit autotools pkgconfig binconfig ptest > + > +do_install_ptest () { > + install -m 0755 ${WORKDIR}/v4test.sh ${D}${PTEST_PATH} > + install -m 0755 ${WORKDIR}/v6test.sh ${D}${PTEST_PATH} > + for testcase in `find ${B}/src/apps/.libs ${B}/src/func_tests/.libs > -maxdepth 1 -type f -executable`; do > + install $testcase ${D}${PTEST_PATH} > + done > +} > > SOLIBVERSION="${PV}" > SOLIBMAJORVERSION="1" > -- > 2.1.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
