On Sat, Jan 5, 2013 at 9:46 AM, David Nyström <[email protected]>wrote:
> > > On 01/05/2013 03:26 PM, lei yang wrote: > >> On Sat, Jan 5, 2013 at 5:55 AM, David Nyström <[email protected]> >> wrote: >> >>> On 01/05/2013 02:43 PM, [email protected] wrote: >>> >>>> >>>> From: Lei Yang <[email protected]> >>>> >>>> I know we have the patches in debian dir in the previous version, >>>> but I meet lots of patch error.so I change it to debian.org version >>>> >>>> The background I do this change is: >>>> I'm a kvm tester,without patches it will meet error when I do the >>>> migrate >>>> testing with -incoming "exec:nc -l 5200" it meets error: >>>> "nc: Protocol no available." >>>> >>>> You can reproduce it simplely with "nc -l 5200" on your board >>>> >>>> Lei >>>> >>>> Signed-off-by: Lei Yang <[email protected]> >>>> --- >>>> >>> >>> >>> [snip] >>> >>> >>> +do_compile() { >>>> + cd ${S} >>>> + while read line; do patch -p1 <debian/patches/$line; done >>>> <debian/patches/series >>>> >>> >>> >>> Is this line really needed ? >>> I cant seem to find any file called debian/patches/* in ${S}. >>> >>> >> Yes it needed, http://ftp.debian.org/debian/**pool/main/n/netcat-openbsd/ >> **netcat-openbsd_1.89-4.diff.gz<http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.89-4.diff.gz> >> will be download, and gunzip by bitbake automaticlly, then it find >> .diff (or patch) it will automatically apply(before I thought only >> .patch will be applied, now I find .diff will be applied ) then you >> will see the debian/patches dir created by .dff >> >> logs: >> lyang0@pek-lpgtest1:/**buildarea1/lyang0/kvm_rr$ ls >> build/netcat-openbsd-1.89-r0/**netcat-openbsd-1.89.orig/ >> atomicio.c atomicio.o Makefile nc.1 >> netcat.c.orig openbsd-compat/ .pc/ socks.o >> atomicio.h debian/ nc netcat.c >> netcat.o patches/ socks.c >> >> >> >>> + pkgrel=4 >>>> + oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${** >>>> pkgrel}\\\"\"" >>>> >>> >>> >>> I assume this has been tested with package_rpm as well. >>> >>> >>> >> Yes, I'm a tester .welcome any testing work to let me do freely >> >> lyang0@pek-lpgtest1:/**buildarea1/lyang0/kvm_rr$ cat >> build/netcat-openbsd-1.89-r0/**deploy-rpms/x86_64/netcat-**openbsd- >> netcat-openbsd-1.89-r0.x86_64.**rpm >> netcat-openbsd-dbg-1.89-r0.**x86_64.rpm >> netcat-openbsd-dev-1.89-r0.**x86_64.rpm >> >> > Thanks Lei, > I'll merge this as soon as I can, I seem to be unable to push at the > moment. I'll try to resolv this asap. > > > I think we should hold on this merge completely. netcat is already covered by meta-networking, so we should be consolidating patches and support there. If there are any specific meta-virt requirements for netcat, we should either use bbappends (and depend on meta-networking, or use the combo-layer tools to pull the support directly) or better yet get them merged into meta-networking. Cheers, Bruce > >> >> >> +} >>>> + >>>> +do_install() { >>>> + install -d ${D}${bindir} >>>> + install -m 755 ${S}/nc ${D}${bindir}/nc.${BPN} >>>> +} >>>> + >>>> +ALTERNATIVE_${PN} = "nc" >>>> +ALTERNATIVE_PRIORITY = "101" >>>> + >>>> +BBCLASSEXTEND = "nativesdk" >>>> diff --git >>>> a/recipes-networking/netcat/op**enbsd-netcat_1.6.bb<http://openbsd-netcat_1.6.bb> >>>> b/recipes-networking/netcat/op**enbsd-netcat_1.6.bb<http://openbsd-netcat_1.6.bb> >>>> deleted file mode 100644 >>>> index 1ae3f37..0000000 >>>> --- >>>> a/recipes-networking/netcat/op**enbsd-netcat_1.6.bb<http://openbsd-netcat_1.6.bb> >>>> +++ /dev/null >>>> @@ -1,29 +0,0 @@ >>>> -DESCRIPTION = "OpenBSD Netcat" >>>> -HOMEPAGE = >>>> "http://code.google.com/p/**openbsd-netcat/<http://code.google.com/p/openbsd-netcat/> >>>> " >>>> -SECTION = "console/network" >>>> -LICENSE = "BSD-3-Clause" >>>> -PR = "r0" >>>> - >>>> -SRCREV = "5" >>>> - >>>> -SRC_URI = >>>> "svn://openbsd-netcat.**googlecode.com/svn;module=**trunk;protocol=http<http://openbsd-netcat.googlecode.com/svn;module=trunk;protocol=http> >>>> " >>>> -S = "${WORKDIR}/trunk" >>>> - >>>> -inherit update-alternatives gettext >>>> - >>>> -do_configure[noexec] = "1" >>>> - >>>> -do_compile() { >>>> - cd ${S} >>>> - oe_runmake >>>> -} >>>> - >>>> -do_install() { >>>> - install -d ${D}${bindir} >>>> - install -m 755 ${S}/nc ${D}${bindir}/nc.${BPN} >>>> -} >>>> - >>>> -ALTERNATIVE_${PN} = "nc" >>>> -ALTERNATIVE_PRIORITY = "101" >>>> - >>>> -BBCLASSEXTEND = "nativesdk" >>>> >>>> >>> ______________________________**_________________ >>> meta-virtualization mailing list >>> meta-virtualization@**yoctoproject.org<[email protected]> >>> https://lists.yoctoproject.**org/listinfo/meta-**virtualization<https://lists.yoctoproject.org/listinfo/meta-virtualization> >>> >> ______________________________**_________________ >> meta-virtualization mailing list >> meta-virtualization@**yoctoproject.org<[email protected]> >> https://lists.yoctoproject.**org/listinfo/meta-**virtualization<https://lists.yoctoproject.org/listinfo/meta-virtualization> >> >> ______________________________**_________________ > meta-virtualization mailing list > meta-virtualization@**yoctoproject.org<[email protected]> > https://lists.yoctoproject.**org/listinfo/meta-**virtualization<https://lists.yoctoproject.org/listinfo/meta-virtualization> > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
_______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
