Patchwork [meta-networking] Add netcat-openbsd for virtualization (libvirt virt-test)

login
register
mail settings
Submitter lei.yang@windriver.com
Date Jan. 6, 2013, 8:20 a.m.
Message ID <1357460412-11889-1-git-send-email-lei.yang@windriver.com>
Download mbox | patch
Permalink /patch/42027/
State Superseded, archived
Headers show

Comments

lei.yang@windriver.com - Jan. 6, 2013, 8:20 a.m.
From: Lei Yang <lei.yang@windriver.com>

The netcat-openbsd in meta-virtualization layer has bugs.
This update version will fix "nc: Protocol no available." error.
As bruce point, we want to keep netcat in the meta-networking,
which meta-virtualization will depend on

Lei

Signed-off-by: Lei Yang <lei.yang@windriver.com>
---
 .../recipes-support/netcat/netcat-openbsd_1.89.bb  |   29 ++++++++++++++++++++
 meta-networking/recipes-support/netcat/netcat.inc  |    6 ++++
 .../recipes-support/netcat/netcat_0.7.1.bb         |   11 +++----
 3 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb
 create mode 100644 meta-networking/recipes-support/netcat/netcat.inc
David Nyström - Jan. 6, 2013, 11:58 a.m.
On 01/06/2013 09:20 AM, lei.yang@windriver.com wrote:
> From: Lei Yang <lei.yang@windriver.com>
>
> The netcat-openbsd in meta-virtualization layer has bugs.
> This update version will fix "nc: Protocol no available." error.
> As bruce point, we want to keep netcat in the meta-networking,
> which meta-virtualization will depend on
>
> Lei
>
> Signed-off-by: Lei Yang <lei.yang@windriver.com>
> ---
>   .../recipes-support/netcat/netcat-openbsd_1.89.bb  |   29 ++++++++++++++++++++
>   meta-networking/recipes-support/netcat/netcat.inc  |    6 ++++
>   .../recipes-support/netcat/netcat_0.7.1.bb         |   11 +++----
>   3 files changed, 40 insertions(+), 6 deletions(-)
>   create mode 100644 meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb
>   create mode 100644 meta-networking/recipes-support/netcat/netcat.inc
>
> diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb
> new file mode 100644
> index 0000000..9fe406c
> --- /dev/null
> +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb
> @@ -0,0 +1,29 @@
> +require netcat.inc
> +DESCRIPTION = "OpenBSD Netcat"
> +HOMEPAGE = "http://ftp.debian.org"
> +LICENSE = "BSD-3-Clause"
> +PR = "r0"
> +
> +SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_1.89.orig.tar.gz;name=netcat \
> +           ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_1.89-4.diff.gz;name=netcat-patch"
> +
> +SRC_URI[netcat.md5sum] = "7238ce15aae43069e96ba7faf03f153e"
> +SRC_URI[netcat.sha256sum] = "72e844dde8a2a7cba61971d493758dbea9ef0b164bccef15fd4a36490dc77f2b"
> +SRC_URI[netcat-patch.md5sum] = "00c65aa22243b76998174c733cbb64cc"
> +SRC_URI[netcat-patch.sha256sum] = "d5b6b2bd9788114bdcfbb71acad0263720b4fdc41529e287adf451b8610f84f1"
> +
> +S = "${WORKDIR}/${PN}-${PV}.orig"
> +
> +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}
> +}
> diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc
> new file mode 100644
> index 0000000..4098668
> --- /dev/null
> +++ b/meta-networking/recipes-support/netcat/netcat.inc
> @@ -0,0 +1,6 @@
> +SECTION = "console/network"
> +inherit update-alternatives gettext
> +
> +ALTERNATIVE_${PN} = "nc"
> +ALTERNATIVE_PRIORITY = "100"

This means that both versions of netcat have alt. prio 100. what happens 
when both are installed on the rootfs at the same time. where does the 
symlink point ?
What does bitbake make of this ?

> +
> diff --git a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
> index c5ab85d..e09202b 100644
> --- a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
> +++ b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
> @@ -1,21 +1,20 @@
> +require netcat.inc
>   DESCRIPTION = "GNU Netcat"
>   HOMEPAGE = "http://netcat.sourceforge.net"
> -SECTION = "console/network"
>   LICENSE = "GPLv2"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>
> -PR = "r0"
> +PR = "r1"
>
>   SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2"
>
>   SRC_URI[md5sum] = "0a29eff1736ddb5effd0b1ec1f6fe0ef"
>   SRC_URI[sha256sum] = "b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb"
>
> -inherit autotools update-alternatives gettext
> +inherit autotools
>
>   do_install_append() {
> -	mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN}
> +        install -d ${D}${bindir}
> +        mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN}
>   }
>
> -ALTERNATIVE_${PN} = "nc"
> -ALTERNATIVE_PRIORITY = "100"
>
Martin Jansa - Jan. 6, 2013, 12:06 p.m.
On Sun, Jan 06, 2013 at 12:58:47PM +0100, David Nyström wrote:
> On 01/06/2013 09:20 AM, lei.yang@windriver.com wrote:
> > +SECTION = "console/network"
> > +inherit update-alternatives gettext
> > +
> > +ALTERNATIVE_${PN} = "nc"
> > +ALTERNATIVE_PRIORITY = "100"
> 
> This means that both versions of netcat have alt. prio 100. what happens 
> when both are installed on the rootfs at the same time. where does the 
> symlink point ?

The one installed later (at least for opkg implementation). 
So it's better to change it to different number.

Cheers,
lei yang - Jan. 6, 2013, 2:27 p.m.
On Sun, Jan 6, 2013 at 4:06 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Sun, Jan 06, 2013 at 12:58:47PM +0100, David Nyström wrote:
>> On 01/06/2013 09:20 AM, lei.yang@windriver.com wrote:
>> > +SECTION = "console/network"
>> > +inherit update-alternatives gettext
>> > +
>> > +ALTERNATIVE_${PN} = "nc"
>> > +ALTERNATIVE_PRIORITY = "100"
>>
>> This means that both versions of netcat have alt. prio 100. what happens
>> when both are installed on the rootfs at the same time. where does the
>> symlink point ?
>
> The one installed later (at least for opkg implementation).
> So it's better to change it to different number.
>

Thanks, I will update this

Lei


> Cheers,
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb
new file mode 100644
index 0000000..9fe406c
--- /dev/null
+++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb
@@ -0,0 +1,29 @@ 
+require netcat.inc
+DESCRIPTION = "OpenBSD Netcat"
+HOMEPAGE = "http://ftp.debian.org"
+LICENSE = "BSD-3-Clause"
+PR = "r0"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_1.89.orig.tar.gz;name=netcat \
+           ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_1.89-4.diff.gz;name=netcat-patch"
+
+SRC_URI[netcat.md5sum] = "7238ce15aae43069e96ba7faf03f153e"
+SRC_URI[netcat.sha256sum] = "72e844dde8a2a7cba61971d493758dbea9ef0b164bccef15fd4a36490dc77f2b"
+SRC_URI[netcat-patch.md5sum] = "00c65aa22243b76998174c733cbb64cc"
+SRC_URI[netcat-patch.sha256sum] = "d5b6b2bd9788114bdcfbb71acad0263720b4fdc41529e287adf451b8610f84f1"
+
+S = "${WORKDIR}/${PN}-${PV}.orig"
+
+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}
+}
diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc
new file mode 100644
index 0000000..4098668
--- /dev/null
+++ b/meta-networking/recipes-support/netcat/netcat.inc
@@ -0,0 +1,6 @@ 
+SECTION = "console/network"
+inherit update-alternatives gettext
+
+ALTERNATIVE_${PN} = "nc"
+ALTERNATIVE_PRIORITY = "100"
+
diff --git a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
index c5ab85d..e09202b 100644
--- a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
+++ b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
@@ -1,21 +1,20 @@ 
+require netcat.inc
 DESCRIPTION = "GNU Netcat"
 HOMEPAGE = "http://netcat.sourceforge.net"
-SECTION = "console/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "0a29eff1736ddb5effd0b1ec1f6fe0ef"
 SRC_URI[sha256sum] = "b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb"
 
-inherit autotools update-alternatives gettext
+inherit autotools
 
 do_install_append() {
-	mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN}
+        install -d ${D}${bindir}
+        mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN}
 }
 
-ALTERNATIVE_${PN} = "nc"
-ALTERNATIVE_PRIORITY = "100"