[meta-virtualization] [PATCH] Update the netcat with debian patches to fix some error

lei yang yanglei.fage at gmail.com
Sat Jan 5 05:14:06 PST 2013


On Sat, Jan 5, 2013 at 3:38 AM, David Nyström <david.c.nystrom at gmail.com> wrote:
>
> On 01/05/2013 09:45 AM, lei.yang at windriver.com wrote:
>>
>> From: Lei Yang <lei.yang at windriver.com>
>>
>> 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
>
>
> Hi Lei,
>
> Thanks for the patch, your .patch file needs an upstream status, if its to
> be kept in the meta-virt layer.
>
> please see:
> https://wiki.yoctoproject.org/wiki/Best_Known_Methods_(BKMs)_for_Package_Updating#Patch_Upstreaming
>
>
>>
>> Lei
>>
>> Signed-off-by: Lei Yang <lei.yang at windriver.com>
>> ---
>>   recipes-extended/libvirt/libvirt_1.0.0.bb          |    2 +-
>>   .../netcat-openbsd/netcat-openbsd_1.89-4.patch     | 2793
>> ++++++++++++++++++++
>>   recipes-networking/netcat/netcat-openbsd_1.89.bb   |   32 +
>>   recipes-networking/netcat/openbsd-netcat_1.6.bb    |   29 -
>>   4 files changed, 2826 insertions(+), 30 deletions(-)
>>   create mode 100644
>> recipes-networking/netcat/netcat-openbsd/netcat-openbsd_1.89-4.patch
>>   create mode 100644 recipes-networking/netcat/netcat-openbsd_1.89.bb
>>   delete mode 100644 recipes-networking/netcat/openbsd-netcat_1.6.bb
>>
>> diff --git a/recipes-extended/libvirt/libvirt_1.0.0.bb
>> b/recipes-extended/libvirt/libvirt_1.0.0.bb
>> index 5374237..90d7dbb 100644
>> --- a/recipes-extended/libvirt/libvirt_1.0.0.bb
>> +++ b/recipes-extended/libvirt/libvirt_1.0.0.bb
>> @@ -11,7 +11,7 @@ DEPENDS = "bridge-utils gnutls libxml2 lvm2 avahi parted
>> curl libpcap util-linux
>>   # These might be included by PACKAGECONFIG
>>   #RRECOMMENDS+= "polkit qemu yajl libnl lxc netcf"
>>
>> -RDEPENDS_libvirt-libvirtd += "bridge-utils iptables pm-utils dnsmasq
>> openbsd-netcat"
>> +RDEPENDS_libvirt-libvirtd += "bridge-utils iptables pm-utils dnsmasq
>> netcat-openbsd"
>>   RDEPENDS_libvirt-libvirtd_append_x86-64 = " dmidecode"
>>   RDEPENDS_libvirt-libvirtd_append_x86 = " dmidecode"
>>
>
> [snip]
>
>
>> diff --git a/recipes-networking/netcat/netcat-openbsd_1.89.bb
>> b/recipes-networking/netcat/netcat-openbsd_1.89.bb
>> new file mode 100644
>> index 0000000..392a3fd
>> --- /dev/null
>> +++ b/recipes-networking/netcat/netcat-openbsd_1.89.bb
>> @@ -0,0 +1,32 @@
>> +DESCRIPTION = "OpenBSD Netcat"
>> +HOMEPAGE = "http://ftp.debian.org"
>> +SECTION = "console/network"
>> +LICENSE = "BSD-3-Clause"
>> +PR = "r0"
>> +
>> +SRC_URI =
>> "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.89.orig.tar.gz
>> \
>> +           file://netcat-openbsd_1.89-4.patch"
>
>
> Hmm,
> I suspect there is no difference between above .patch file and upstream:
> http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.89-4.diff.gz
>
> Please reference the patch from this location to keep code size in meta-virt
> low.
>


Yes, the patch comes from
http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.89-4.diff.gz
I don't know how to put two http location in one bb, do you have an
examle? or use wget in bb? seems not

and How could I fill the upstream status, should be pending? since
it's not in openbsd-netcat.googlecode.com now


Lei



>
>> +SRC_URI[md5sum] = "7238ce15aae43069e96ba7faf03f153e"
>> +SRC_URI[sha256sum] =
>> "72e844dde8a2a7cba61971d493758dbea9ef0b164bccef15fd4a36490dc77f2b"
>> +
>> +S = "${WORKDIR}/${PN}-${PV}.orig"
>> +inherit update-alternatives gettext
>> +
>> +do_configure[noexec] = "1"
>> +
>> +do_compile() {
>> +       cd ${S}
>> +       while read line; do patch -p1 <debian/patches/$line; done
>> <debian/patches/series
>> +       pkgrel=4
>> +       oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\""
>> +}
>> +
>> +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/openbsd-netcat_1.6.bb
>> b/recipes-networking/netcat/openbsd-netcat_1.6.bb
>> deleted file mode 100644
>> index 1ae3f37..0000000
>> --- a/recipes-networking/netcat/openbsd-netcat_1.6.bb
>> +++ /dev/null
>> @@ -1,29 +0,0 @@
>> -DESCRIPTION = "OpenBSD Netcat"
>> -HOMEPAGE = "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"
>> -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 at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



More information about the meta-virtualization mailing list