* [PATCH 1/3] curlpp: use libcurlpp as curlpp's provider
2014-11-07 8:08 [PATCH 0/3][meta-networking]fix install package "curlpp pimd ssmping" to image failed Hongxu Jia
@ 2014-11-07 8:08 ` Hongxu Jia
2014-11-07 14:18 ` Martin Jansa
2014-11-07 8:08 ` [PATCH 2/3] pimd: add do_install to pimd Hongxu Jia
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Hongxu Jia @ 2014-11-07 8:08 UTC (permalink / raw)
To: openembedded-devel
The package curlpp does not exist, so we use libcurlpp as the provider.
It avoids the do_rootfs failure while IMAGE_INSTALL += "curlpp"
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb b/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb
index 48f5178..3134335 100644
--- a/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb
+++ b/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb
@@ -74,6 +74,7 @@ pkg_postinst_${PN}() {
}
PACKAGES =+ "libcurlpp libcurlpp-dev libcurlpp-staticdev"
+RPROVIDES_lib${BPN} = "${PN}"
FILES_lib${BPN} = "${libdir}/lib*.so.* \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/3] curlpp: use libcurlpp as curlpp's provider
2014-11-07 8:08 ` [PATCH 1/3] curlpp: use libcurlpp as curlpp's provider Hongxu Jia
@ 2014-11-07 14:18 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2014-11-07 14:18 UTC (permalink / raw)
To: Hongxu Jia; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1002 bytes --]
On Fri, Nov 07, 2014 at 04:08:06PM +0800, Hongxu Jia wrote:
> The package curlpp does not exist, so we use libcurlpp as the provider.
> It avoids the do_rootfs failure while IMAGE_INSTALL += "curlpp"
Why don't you fix your IMAGE_INSTALL instead?
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb b/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb
> index 48f5178..3134335 100644
> --- a/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb
> +++ b/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb
> @@ -74,6 +74,7 @@ pkg_postinst_${PN}() {
> }
>
> PACKAGES =+ "libcurlpp libcurlpp-dev libcurlpp-staticdev"
> +RPROVIDES_lib${BPN} = "${PN}"
>
> FILES_lib${BPN} = "${libdir}/lib*.so.* \
> "
> --
> 1.9.1
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] pimd: add do_install to pimd
2014-11-07 8:08 [PATCH 0/3][meta-networking]fix install package "curlpp pimd ssmping" to image failed Hongxu Jia
2014-11-07 8:08 ` [PATCH 1/3] curlpp: use libcurlpp as curlpp's provider Hongxu Jia
@ 2014-11-07 8:08 ` Hongxu Jia
2014-11-07 8:08 ` [PATCH 3/3] ssmping: add do_install to ssmping Hongxu Jia
2014-11-11 2:40 ` [PATCH 0/3][meta-networking]fix install package "curlpp pimd ssmping" to image failed Joe MacDonald
3 siblings, 0 replies; 6+ messages in thread
From: Hongxu Jia @ 2014-11-07 8:08 UTC (permalink / raw)
To: openembedded-devel
The previous do_install is empty and do nothing.
Unset variables datadir and mandir, use pimd's default set.
So it could install doc files correctly.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta-networking/recipes-support/pimd/pimd_2.1.8.bb | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/meta-networking/recipes-support/pimd/pimd_2.1.8.bb b/meta-networking/recipes-support/pimd/pimd_2.1.8.bb
index da097ce..f032361 100644
--- a/meta-networking/recipes-support/pimd/pimd_2.1.8.bb
+++ b/meta-networking/recipes-support/pimd/pimd_2.1.8.bb
@@ -8,3 +8,10 @@ SRC_URI[md5sum] = "a12448bc7c9bfcebf51a13ebf1ffa962"
SRC_URI[sha256sum] = "01016940543a0a6131d4e6c91b595d47e187012c59a298eec14c3dbc38564b3a"
CFLAGS += "-I ${S}/include "
+
+do_install() {
+ unset datadir
+ unset mandir
+ oe_runmake 'DESTDIR=${D}' install
+}
+
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] ssmping: add do_install to ssmping
2014-11-07 8:08 [PATCH 0/3][meta-networking]fix install package "curlpp pimd ssmping" to image failed Hongxu Jia
2014-11-07 8:08 ` [PATCH 1/3] curlpp: use libcurlpp as curlpp's provider Hongxu Jia
2014-11-07 8:08 ` [PATCH 2/3] pimd: add do_install to pimd Hongxu Jia
@ 2014-11-07 8:08 ` Hongxu Jia
2014-11-11 2:40 ` [PATCH 0/3][meta-networking]fix install package "curlpp pimd ssmping" to image failed Joe MacDonald
3 siblings, 0 replies; 6+ messages in thread
From: Hongxu Jia @ 2014-11-07 8:08 UTC (permalink / raw)
To: openembedded-devel
The previous do_install is empty and do nothing.
Tweak install doc dir, so the man doc could be installed to /usr/share/man
rather than /usr/locale/man.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../files/0001-Makefile-tweak-install-dir.patch | 35 ++++++++++++++++++++++
.../recipes-support/ssmping/ssmping_0.9.1.bb | 8 ++++-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
diff --git a/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch b/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
new file mode 100644
index 0000000..0cb981c
--- /dev/null
+++ b/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
@@ -0,0 +1,35 @@
+From 693cfce5431e191a3955fd56fa822927d92c9e43 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Fri, 7 Nov 2014 14:27:00 +0800
+Subject: [PATCH] Makefile: tweak install dir
+
+For oe-core, the man doc should be installed to /usr/share/man
+rather than /usr/locale/man.
+
+Upstream-Status: inappropriate (oe specific)
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b5d12f8..9b2663c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,9 +14,9 @@ install: ssmping asmping ssmpingd mcfirst
+ install -D asmping $(DESTDIR)$(PREFIX)/bin/asmping
+ install -D ssmpingd $(DESTDIR)$(PREFIX)/bin/ssmpingd
+ install -D mcfirst $(DESTDIR)$(PREFIX)/bin/mcfirst
+- install -D ssmping.1 $(DESTDIR)$(PREFIX)/man/man1/ssmping.1
+- install -D asmping.1 $(DESTDIR)$(PREFIX)/man/man1/asmping.1
+- install -D mcfirst.1 $(DESTDIR)$(PREFIX)/man/man1/mcfirst.1
++ install -D ssmping.1 $(DESTDIR)$(PREFIX)/share/man/man1/ssmping.1
++ install -D asmping.1 $(DESTDIR)$(PREFIX)/share/man/man1/asmping.1
++ install -D mcfirst.1 $(DESTDIR)$(PREFIX)/share/man/man1/mcfirst.1
+
+ clean:
+ rm -f $(OBJ) joinch.o joingrp.o ssmping asmping ssmpingd mcfirst
+--
+1.9.1
+
diff --git a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
index 06d6d28..0eaa7ca 100644
--- a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
+++ b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
@@ -3,8 +3,14 @@ HOMEPAGE = "http://www.venaas.no/multicast/ssmping/"
LICENSE = "ISC"
LIC_FILES_CHKSUM = "file://asmping.c;beginline=2;endline=11;md5=1ca8d1a1ca931e5cfe604ebf20a78b71"
-SRC_URI = "http://www.venaas.no/multicast/ssmping/${BP}.tar.gz"
+SRC_URI = "http://www.venaas.no/multicast/ssmping/${BP}.tar.gz \
+ file://0001-Makefile-tweak-install-dir.patch \
+"
SRC_URI[md5sum] = "ad8e3d13f6d72918f73be7e7975d7fad"
SRC_URI[sha256sum] = "22103a37eaa28489169a0927bc01e0596c3485fc4d29fc8456c07fd2c70fca6d"
CFLAGS += "-D_GNU_SOURCE "
+
+do_install() {
+ oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install
+}
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/3][meta-networking]fix install package "curlpp pimd ssmping" to image failed
2014-11-07 8:08 [PATCH 0/3][meta-networking]fix install package "curlpp pimd ssmping" to image failed Hongxu Jia
` (2 preceding siblings ...)
2014-11-07 8:08 ` [PATCH 3/3] ssmping: add do_install to ssmping Hongxu Jia
@ 2014-11-11 2:40 ` Joe MacDonald
3 siblings, 0 replies; 6+ messages in thread
From: Joe MacDonald @ 2014-11-11 2:40 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1820 bytes --]
I merged two of the three of these. I didn't bring in the curlpp change
since, as Martin pointed out, it looks like a change to solve a problem
that isn't in meta-openembedded. It may be as simple as updating your
own IMAGE_INSTALL_append, it may be correcting dependency names in some
layer that is external to meta-openembedded, but whatever it is, I can't
find anything inside meta-openembedded that depends on curlpp (as
named), so I don't think it's worth breaking convention here.
Thanks for the other updates, though.
-J.
[[oe] [PATCH 0/3][meta-networking]fix install package "curlpp pimd ssmping" to image failed] On 14.11.07 (Fri 16:08) Hongxu Jia wrote:
> vim local.conf
> ...
> IMAGE_INSTALL_append = " curlpp pimd ssmping"
> ...
>
> bitbake core-image-minimal
>
> //Hongxu
>
> The following changes since commit 34ca3aeef1a8ff74de548c427fff8dc94f4b720a:
>
> vpnc: use nativeperl to run perl scripts (2014-11-04 16:02:44 -0500)
>
> are available in the git repository at:
>
> git://git.pokylinux.org/poky-contrib hongxu/fix-mete-networking
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-mete-networking
>
> Hongxu Jia (3):
> curlpp: use libcurlpp as curlpp's provider
> pimd: add do_install to pimd
> ssmping: add do_install to ssmping
>
> .../recipes-support/curlpp/curlpp_0.7.3.bb | 1 +
> meta-networking/recipes-support/pimd/pimd_2.1.8.bb | 7 +++++
> .../files/0001-Makefile-tweak-install-dir.patch | 35 ++++++++++++++++++++++
> .../recipes-support/ssmping/ssmping_0.9.1.bb | 8 ++++-
> 4 files changed, 50 insertions(+), 1 deletion(-)
> create mode 100644 meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
>
> --
> 1.9.1
>
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread