[meta-oe][PATCH 1/3] zeromq: bump version 4.2.5 => 4.3.1

[meta-oe][PATCH 1/3] zeromq: bump version 4.2.5 => 4.3.1

[Vincent Prince]

Also, use cmake instead of autotools to build it.

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
 .../recipes-connectivity/zeromq/zeromq_4.2.5.bb    | 32 ----------------------
 .../recipes-connectivity/zeromq/zeromq_4.3.1.bb    | 26 ++++++++++++++++++
 2 files changed, 26 insertions(+), 32 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb
 create mode 100644 meta-oe/recipes-connectivity/zeromq/zeromq_4.3.1.bb

diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb
deleted file mode 100644
index 356348b..0000000
--- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework"
-HOMEPAGE = "http://www.zeromq.org"
-LICENSE = "LGPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1"
-
-PACKAGECONFIG ??= "libsodium"
-PACKAGECONFIG[libsodium] = "--with-libsodium, --without-libsodium, libsodium"
-
-SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \
-    file://run-ptest \
-"
-SRC_URI[md5sum] = "a1c95b34384257e986842f4d006957b8"
-SRC_URI[sha256sum] = "cc9090ba35713d59bb2f7d7965f877036c49c5558ea0c290b0dcc6f2a17e489f"
-
-S = "${WORKDIR}/zeromq-${PV}"
-
-#Uncomment to choose polling system manually. valid values are kqueue, epoll, devpoll, poll or select
-#EXTRA_OECONF += "--with-poller=kqueue"
-#CFLAGS_append = " -O0"
-#CXXFLAGS_append = " -O0"
-
-inherit autotools ptest pkgconfig
-
-do_compile_ptest () {
-    echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${B}/Makefile
-    oe_runmake buildtest-TESTS
-}
-
-do_install_ptest () {
-    install -d ${D}${PTEST_PATH}/tests
-    install -m 0755 ${B}/tests/.libs/test_* ${D}${PTEST_PATH}/tests
-}
diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.1.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.1.bb
new file mode 100644
index 0000000..6e13376
--- /dev/null
+++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.1.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework"
+HOMEPAGE = "http://www.zeromq.org"
+LICENSE = "LGPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1"
+
+PACKAGECONFIG ??= "libsodium"
+PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium"
+
+SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \
+    file://run-ptest \
+"
+SRC_URI[md5sum] = "64cbf3577afdbfda30358bc757a6ac83"
+SRC_URI[sha256sum] = "bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb"
+
+inherit cmake ptest pkgconfig
+
+EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTS=ON', '-DBUILD_TESTS=OFF', d)} \
+                 -DCMAKE_SKIP_RPATH=ON \
+"
+
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/tests
+    install -m 0755 ${B}/bin/test_* ${D}${PTEST_PATH}/tests
+}
+
+FILES_${PN}-doc += "${datadir}/zmq/*.txt"
-- 
2.7.4

[meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Vincent Prince]

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
 meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
index 9aff59c..2f99417 100644
--- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
+++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
@@ -4,8 +4,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
 DEPENDS = "zeromq"
 
-SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
-PV = "4.2.3+git${SRCPV}"
+SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
+PV = "4.3.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/zeromq/cppzmq.git"
 
@@ -13,6 +13,8 @@ S = "${WORKDIR}/git"
 
 inherit cmake
 
+EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF"
+
 PACKAGES = "${PN}-dev"
 
 RDEPENDS_${PN}-dev = "zeromq-dev"
-- 
2.7.4

[meta-oe][PATCH 3/3] czmq: bump version 4.1.1 => 4.2.0

[Vincent Prince]

Also, add curl and systemd to PACKAGECONFIG

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
 .../zeromq/{czmq_4.1.1.bb => czmq_4.2.0.bb}            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-connectivity/zeromq/{czmq_4.1.1.bb => czmq_4.2.0.bb} (56%)

diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb
similarity index 56%
rename from meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb
rename to meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb
index f2db004..4ec1c04 100644
--- a/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb
+++ b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb
@@ -1,15 +1,13 @@
-DESCRIPTION = "C bindings for ZeroMQ"
-HOMEPAGE = "http://www.zeromq.org"
+DESCRIPTION = "High-level C binding for 0MQ"
+HOMEPAGE = "http://czmq.zeromq.org/"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 DEPENDS = "zeromq"
 
-SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz \
-    file://0001-Problem-out-of-date-with-zproject.patch \
-"
+SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "6d3a6fdd25c2bb29897c53670dce97bf"
-SRC_URI[sha256sum] = "f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0"
+SRC_URI[md5sum] = "7e09997db6ac3b25e8ed104053040722"
+SRC_URI[sha256sum] = "cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb"
 
 inherit cmake
 
@@ -17,14 +15,16 @@ PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg"
 
 FILES_${PN} = "${bindir}/*"
 FILES_lib${BPN} = "${libdir}/*.so.*"
-FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir}"
+FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake"
 FILES_lib${BPN}-staticdev = "${libdir}/lib*.a"
 
 RDEPENDS_lib${BPN}-dev = "zeromq-dev"
 
-PACKAGECONFIG ??= "lz4 uuid"
+PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4"
 PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux"
+PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl"
+PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd"
 
 BBCLASSEXTEND = "nativesdk"
 
-- 
2.7.4

Re: [meta-oe][PATCH 3/3] czmq: bump version 4.1.1 => 4.2.0

[Vincent Prince]

I forgot to remove 0001-Problem-out-of-date-with-zproject.patch file, it
will fixed in v2.

Le mer. 3 avr. 2019 à 10:29, Vincent Prince <vincent.prince.fr@gmail.com> a
écrit :

> Also, add curl and systemd to PACKAGECONFIG
>
> Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
> ---
>  .../zeromq/{czmq_4.1.1.bb => czmq_4.2.0.bb}            | 18
> +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>  rename meta-oe/recipes-connectivity/zeromq/{czmq_4.1.1.bb =>
> czmq_4.2.0.bb} (56%)
>
> diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb
> b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb
> similarity index 56%
> rename from meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb
> rename to meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb
> index f2db004..4ec1c04 100644
> --- a/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb
> +++ b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb
> @@ -1,15 +1,13 @@
> -DESCRIPTION = "C bindings for ZeroMQ"
> -HOMEPAGE = "http://www.zeromq.org"
> +DESCRIPTION = "High-level C binding for 0MQ"
> +HOMEPAGE = "http://czmq.zeromq.org/"
>  LICENSE = "MPL-2.0"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
>  DEPENDS = "zeromq"
>
> -SRC_URI = "
> https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz
> \
> -    file://0001-Problem-out-of-date-with-zproject.patch \
> -"
> +SRC_URI = "
> https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz"
>
> -SRC_URI[md5sum] = "6d3a6fdd25c2bb29897c53670dce97bf"
> -SRC_URI[sha256sum] =
> "f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0"
> +SRC_URI[md5sum] = "7e09997db6ac3b25e8ed104053040722"
> +SRC_URI[sha256sum] =
> "cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb"
>
>  inherit cmake
>
> @@ -17,14 +15,16 @@ PACKAGES = "lib${BPN} lib${BPN}-dev
> lib${BPN}-staticdev ${PN} ${PN}-dbg"
>
>  FILES_${PN} = "${bindir}/*"
>  FILES_lib${BPN} = "${libdir}/*.so.*"
> -FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir}"
> +FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir}
> ${datadir}/cmake"
>  FILES_lib${BPN}-staticdev = "${libdir}/lib*.a"
>
>  RDEPENDS_lib${BPN}-dev = "zeromq-dev"
>
> -PACKAGECONFIG ??= "lz4 uuid"
> +PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES',
> 'systemd', d)}"
>  PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4"
>  PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux"
> +PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl"
> +PACKAGECONFIG[systemd] =
> ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd"
>
>  BBCLASSEXTEND = "nativesdk"
>
> --
> 2.7.4
>
>

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Adrian Bunk]

On Wed, Apr 03, 2019 at 10:28:42AM +0200, Vincent Prince wrote:
> Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
> ---
>  meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> index 9aff59c..2f99417 100644
> --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> @@ -4,8 +4,8 @@ LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
>  DEPENDS = "zeromq"
>  
> -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
> -PV = "4.2.3+git${SRCPV}"
> +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
> +PV = "4.3.1+git${SRCPV}"
>...

These are the actual releases, PV should not say +git${SRCPV}
for them.

Not a bug you introduced, but can be fixed now.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Vincent Prince]

Then, it would need to rename cppzmq_git.bb into cppzmq_4.3.1.git or can we
just remove +git${SRCPV} part of PV?

In following threads it seems first option should be chosen?
https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg120575.html
https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg121561.html

Le mer. 3 avr. 2019 à 10:56, Adrian Bunk <bunk@stusta.de> a écrit :

> On Wed, Apr 03, 2019 at 10:28:42AM +0200, Vincent Prince wrote:
> > Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
> > ---
> >  meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > index 9aff59c..2f99417 100644
> > --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > @@ -4,8 +4,8 @@ LICENSE = "MIT"
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
> >  DEPENDS = "zeromq"
> >
> > -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
> > -PV = "4.2.3+git${SRCPV}"
> > +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
> > +PV = "4.3.1+git${SRCPV}"
> >...
>
> These are the actual releases, PV should not say +git${SRCPV}
> for them.
>
> Not a bug you introduced, but can be fixed now.
>
> cu
> Adrian
>
> --
>
>        "Is there not promise of rain?" Ling Tan asked suddenly out
>         of the darkness. There had been need of rain for many days.
>        "Only a promise," Lao Er said.
>                                        Pearl S. Buck - Dragon Seed
>
>

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Vincent Prince]

I mean
https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg121560.html

Le mer. 3 avr. 2019 à 12:42, Vincent Prince <vincent.prince.fr@gmail.com> a
écrit :

> Then, it would need to rename cppzmq_git.bb into cppzmq_4.3.1.git or can
> we just remove +git${SRCPV} part of PV?
>
> In following threads it seems first option should be chosen?
>
> https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg120575.html
>
> https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg121561.html
>
> Le mer. 3 avr. 2019 à 10:56, Adrian Bunk <bunk@stusta.de> a écrit :
>
>> On Wed, Apr 03, 2019 at 10:28:42AM +0200, Vincent Prince wrote:
>> > Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
>> > ---
>> >  meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 6 ++++--
>> >  1 file changed, 4 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>> b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>> > index 9aff59c..2f99417 100644
>> > --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>> > +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>> > @@ -4,8 +4,8 @@ LICENSE = "MIT"
>> >  LIC_FILES_CHKSUM =
>> "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
>> >  DEPENDS = "zeromq"
>> >
>> > -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
>> > -PV = "4.2.3+git${SRCPV}"
>> > +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
>> > +PV = "4.3.1+git${SRCPV}"
>> >...
>>
>> These are the actual releases, PV should not say +git${SRCPV}
>> for them.
>>
>> Not a bug you introduced, but can be fixed now.
>>
>> cu
>> Adrian
>>
>> --
>>
>>        "Is there not promise of rain?" Ling Tan asked suddenly out
>>         of the darkness. There had been need of rain for many days.
>>        "Only a promise," Lao Er said.
>>                                        Pearl S. Buck - Dragon Seed
>>
>>

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Adrian Bunk]

On Wed, Apr 03, 2019 at 12:42:13PM +0200, Vincent Prince wrote:
> Then, it would need to rename cppzmq_git.bb into cppzmq_4.3.1.git or can we
> just remove +git${SRCPV} part of PV?
> 
> In following threads it seems first option should be chosen?
> https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg120575.html
>...

That is about putting PV in the recipe filename instead of "git",
in this case the discussion would be cppzmq_git.bb versus cppzmq_4.3.1.bb

I am not aware of anyone arguing against PV having a proper
version (without +git) for a release.

> Le mer. 3 avr. 2019 à 10:56, Adrian Bunk <bunk@stusta.de> a écrit :
> > On Wed, Apr 03, 2019 at 10:28:42AM +0200, Vincent Prince wrote:
>...
> > > diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > > index 9aff59c..2f99417 100644
> > > --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > > +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > > @@ -4,8 +4,8 @@ LICENSE = "MIT"
> > >  LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
> > >  DEPENDS = "zeromq"
> > >
> > > -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
> > > -PV = "4.2.3+git${SRCPV}"
> > > +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
> > > +PV = "4.3.1+git${SRCPV}"
> > >...
> >
> > These are the actual releases, PV should not say +git${SRCPV}
> > for them.
> >
> > Not a bug you introduced, but can be fixed now.
> >
> > cu
> > Adrian

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Vincent Prince]

Adrien,

What I'm not sure to understand is in which case we use "_git.bb" instead
of having PV in filename.
If we use a release version, shouldn't we point to
https://github.com/zeromq/cppzmq/archive/v4.3.0.tar.gz?
And if we use git version, shouldn't we specify git commit hash to remove
any ambiguity between PV and SRCREV?
Do you know any convention is specified somewhere?

Regards,
Vincent

Le mer. 3 avr. 2019 à 13:15, Adrian Bunk <bunk@stusta.de> a écrit :

> On Wed, Apr 03, 2019 at 12:42:13PM +0200, Vincent Prince wrote:
> > Then, it would need to rename cppzmq_git.bb into cppzmq_4.3.1.git or
> can we
> > just remove +git${SRCPV} part of PV?
> >
> > In following threads it seems first option should be chosen?
> >
> https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg120575.html
> >...
>
> That is about putting PV in the recipe filename instead of "git",
> in this case the discussion would be cppzmq_git.bb versus cppzmq_4.3.1.bb
>
> I am not aware of anyone arguing against PV having a proper
> version (without +git) for a release.
>
> > Le mer. 3 avr. 2019 à 10:56, Adrian Bunk <bunk@stusta.de> a écrit :
> > > On Wed, Apr 03, 2019 at 10:28:42AM +0200, Vincent Prince wrote:
> >...
> > > > diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > > b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > > > index 9aff59c..2f99417 100644
> > > > --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > > > +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > > > @@ -4,8 +4,8 @@ LICENSE = "MIT"
> > > >  LIC_FILES_CHKSUM =
> "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
> > > >  DEPENDS = "zeromq"
> > > >
> > > > -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
> > > > -PV = "4.2.3+git${SRCPV}"
> > > > +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
> > > > +PV = "4.3.1+git${SRCPV}"
> > > >...
> > >
> > > These are the actual releases, PV should not say +git${SRCPV}
> > > for them.
> > >
> > > Not a bug you introduced, but can be fixed now.
> > >
> > > cu
> > > Adrian
>
> cu
> Adrian
>
> --
>
>        "Is there not promise of rain?" Ling Tan asked suddenly out
>         of the darkness. There had been need of rain for many days.
>        "Only a promise," Lao Er said.
>                                        Pearl S. Buck - Dragon Seed
>
>

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]

On Wed, Apr 03, 2019 at 01:36:24PM +0200, Vincent Prince wrote:
> Adrien,
> 
> What I'm not sure to understand is in which case we use "_git.bb" instead
> of having PV in filename.

The PV in filename is just another way for setting PV variable (instead
of setting it inside the recipe). This isn't relevant to what Adrian
requested and I would keep the filename as is.

> If we use a release version, shouldn't we point to
> https://github.com/zeromq/cppzmq/archive/v4.3.0.tar.gz?

Definitely don't use github archives, they are regenerated from time to
time with different checksums, either you can use developer uploaded
tarballs (some projects on github provides them as well) or use git
fetcher with the SRCREV pointing the the tag.

> And if we use git version, shouldn't we specify git commit hash to remove
> any ambiguity between PV and SRCREV?

With git bitbake fetcher (git:// in SRC_URI) you always need to specify
SRCREV, because that's the only thing which defines what "version" of
the source will be fetched.

PV in this case is only to give this SRCREV some human readable (and
sortable) versioning scheme. And that's what users will see when
installing/upgrading the built packages, so it's important to set it
correctly.

+git${SRCPV} in PV is usually used to signify that the SRCREV points to
commit a bit newer than the "base version" in this case 4.3.1 and in
this case this +git${SRCPV} is unnecessary if the SRCREV matches exactly
with 4.3.1 tag.

> Do you know any convention is specified somewhere?

I don't think it's spelled anywhere in wiki.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Vincent Prince]

Martin,

Thanks for precisions, I will update PV to 4.3.1 in V2
By the way, it's first time I submit a patch series, should  changelog be
in each patch for should I use --cover option to put them all in 0/3?

Best regards

Le mer. 3 avr. 2019 à 14:03, Martin Jansa <martin.jansa@gmail.com> a écrit :

> On Wed, Apr 03, 2019 at 01:36:24PM +0200, Vincent Prince wrote:
> > Adrien,
> >
> > What I'm not sure to understand is in which case we use "_git.bb"
> instead
> > of having PV in filename.
>
> The PV in filename is just another way for setting PV variable (instead
> of setting it inside the recipe). This isn't relevant to what Adrian
> requested and I would keep the filename as is.
>
> > If we use a release version, shouldn't we point to
> > https://github.com/zeromq/cppzmq/archive/v4.3.0.tar.gz?
>
> Definitely don't use github archives, they are regenerated from time to
> time with different checksums, either you can use developer uploaded
> tarballs (some projects on github provides them as well) or use git
> fetcher with the SRCREV pointing the the tag.
>
> > And if we use git version, shouldn't we specify git commit hash to remove
> > any ambiguity between PV and SRCREV?
>
> With git bitbake fetcher (git:// in SRC_URI) you always need to specify
> SRCREV, because that's the only thing which defines what "version" of
> the source will be fetched.
>
> PV in this case is only to give this SRCREV some human readable (and
> sortable) versioning scheme. And that's what users will see when
> installing/upgrading the built packages, so it's important to set it
> correctly.
>
> +git${SRCPV} in PV is usually used to signify that the SRCREV points to
> commit a bit newer than the "base version" in this case 4.3.1 and in
> this case this +git${SRCPV} is unnecessary if the SRCREV matches exactly
> with 4.3.1 tag.
>
> > Do you know any convention is specified somewhere?
>
> I don't think it's spelled anywhere in wiki.
>

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2625 bytes --]

On Wed, Apr 03, 2019 at 02:31:13PM +0200, Vincent Prince wrote:
> Martin,
> 
> Thanks for precisions, I will update PV to 4.3.1 in V2
> By the way, it's first time I submit a patch series, should  changelog be
> in each patch for should I use --cover option to put them all in 0/3?

If you mean changelog for review changes made to individual commits,
then it's best to include them in commit message, but bellow --- so that
it doesn't end in the final commit message once it's applied.

Cover letter is useful to describe reasoning behind the whole series,
but each commit should make sense individually (especially because cover
letter doesn't end in git history).

Regards,
> 
> Best regards
> 
> Le mer. 3 avr. 2019 à 14:03, Martin Jansa <martin.jansa@gmail.com> a écrit :
> 
> > On Wed, Apr 03, 2019 at 01:36:24PM +0200, Vincent Prince wrote:
> > > Adrien,
> > >
> > > What I'm not sure to understand is in which case we use "_git.bb"
> > instead
> > > of having PV in filename.
> >
> > The PV in filename is just another way for setting PV variable (instead
> > of setting it inside the recipe). This isn't relevant to what Adrian
> > requested and I would keep the filename as is.
> >
> > > If we use a release version, shouldn't we point to
> > > https://github.com/zeromq/cppzmq/archive/v4.3.0.tar.gz?
> >
> > Definitely don't use github archives, they are regenerated from time to
> > time with different checksums, either you can use developer uploaded
> > tarballs (some projects on github provides them as well) or use git
> > fetcher with the SRCREV pointing the the tag.
> >
> > > And if we use git version, shouldn't we specify git commit hash to remove
> > > any ambiguity between PV and SRCREV?
> >
> > With git bitbake fetcher (git:// in SRC_URI) you always need to specify
> > SRCREV, because that's the only thing which defines what "version" of
> > the source will be fetched.
> >
> > PV in this case is only to give this SRCREV some human readable (and
> > sortable) versioning scheme. And that's what users will see when
> > installing/upgrading the built packages, so it's important to set it
> > correctly.
> >
> > +git${SRCPV} in PV is usually used to signify that the SRCREV points to
> > commit a bit newer than the "base version" in this case 4.3.1 and in
> > this case this +git${SRCPV} is unnecessary if the SRCREV matches exactly
> > with 4.3.1 tag.
> >
> > > Do you know any convention is specified somewhere?
> >
> > I don't think it's spelled anywhere in wiki.
> >

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Khem Raj]

On Wed, Apr 3, 2019 at 1:30 AM Vincent Prince
<vincent.prince.fr@gmail.com> wrote:
>
> Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
> ---
>  meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> index 9aff59c..2f99417 100644
> --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> @@ -4,8 +4,8 @@ LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
>  DEPENDS = "zeromq"
>
> -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
> -PV = "4.2.3+git${SRCPV}"
> +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
> +PV = "4.3.1+git${SRCPV}"
>
>  SRC_URI = "git://github.com/zeromq/cppzmq.git"
>
> @@ -13,6 +13,8 @@ S = "${WORKDIR}/git"
>
>  inherit cmake
>
> +EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF"
> +

explaining why tests are disabled would be helpful for future changes
where someone might
want to enable it and if its an optimization then turn it into
packageconfig knob.

>  PACKAGES = "${PN}-dev"
>
>  RDEPENDS_${PN}-dev = "zeromq-dev"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Vincent Prince]

Hi Khem,

To be honest I disabled it because I don't have much time to add ptest
stuff and I had a failure with it.
I'll try to rework that part and at least put it in a packageconfig knob as
suggested.

Thanks for review,
Vincent

Le mer. 3 avr. 2019 à 18:52, Khem Raj <raj.khem@gmail.com> a écrit :

> On Wed, Apr 3, 2019 at 1:30 AM Vincent Prince
> <vincent.prince.fr@gmail.com> wrote:
> >
> > Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
> > ---
> >  meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > index 9aff59c..2f99417 100644
> > --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
> > @@ -4,8 +4,8 @@ LICENSE = "MIT"
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
> >  DEPENDS = "zeromq"
> >
> > -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
> > -PV = "4.2.3+git${SRCPV}"
> > +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
> > +PV = "4.3.1+git${SRCPV}"
> >
> >  SRC_URI = "git://github.com/zeromq/cppzmq.git"
> >
> > @@ -13,6 +13,8 @@ S = "${WORKDIR}/git"
> >
> >  inherit cmake
> >
> > +EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF"
> > +
>
> explaining why tests are disabled would be helpful for future changes
> where someone might
> want to enable it and if its an optimization then turn it into
> packageconfig knob.
>
> >  PACKAGES = "${PN}-dev"
> >
> >  RDEPENDS_${PN}-dev = "zeromq-dev"
> > --
> > 2.7.4
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Vincent Prince]

I just look at cppzmq, and version is only 4.3.0 and not 4.3.1, my mistake.

By the way, 4.3.0 version uses googletest for tests and I disabled it
because cmake fetcher hangs,
Moreover, master version uses another test framework (catch), so it will be
quite some work to add googletest support then remove it for next version.

Khem, do you think I can keep EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF"
for now with this explanation in commit log?
Will send v3 after your decision,

Thanks,
Vincent


Le mer. 3 avr. 2019 à 21:33, Vincent Prince <vincent.prince.fr@gmail.com> a
écrit :

> Hi Khem,
>
> To be honest I disabled it because I don't have much time to add ptest
> stuff and I had a failure with it.
> I'll try to rework that part and at least put it in a packageconfig knob
> as suggested.
>
> Thanks for review,
> Vincent
>
> Le mer. 3 avr. 2019 à 18:52, Khem Raj <raj.khem@gmail.com> a écrit :
>
>> On Wed, Apr 3, 2019 at 1:30 AM Vincent Prince
>> <vincent.prince.fr@gmail.com> wrote:
>> >
>> > Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
>> > ---
>> >  meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 6 ++++--
>> >  1 file changed, 4 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>> b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>> > index 9aff59c..2f99417 100644
>> > --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>> > +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>> > @@ -4,8 +4,8 @@ LICENSE = "MIT"
>> >  LIC_FILES_CHKSUM =
>> "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
>> >  DEPENDS = "zeromq"
>> >
>> > -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
>> > -PV = "4.2.3+git${SRCPV}"
>> > +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
>> > +PV = "4.3.1+git${SRCPV}"
>> >
>> >  SRC_URI = "git://github.com/zeromq/cppzmq.git"
>> >
>> > @@ -13,6 +13,8 @@ S = "${WORKDIR}/git"
>> >
>> >  inherit cmake
>> >
>> > +EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF"
>> > +
>>
>> explaining why tests are disabled would be helpful for future changes
>> where someone might
>> want to enable it and if its an optimization then turn it into
>> packageconfig knob.
>>
>> >  PACKAGES = "${PN}-dev"
>> >
>> >  RDEPENDS_${PN}-dev = "zeromq-dev"
>> > --
>> > 2.7.4
>> >
>> > --
>> > _______________________________________________
>> > Openembedded-devel mailing list
>> > Openembedded-devel@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>

Re: [meta-oe][PATCH 2/3] cppzmq: bump version 4.2.3 => 4.3.1

[Khem Raj]

Sure, go ahead.

On Thu, Apr 4, 2019 at 2:12 AM Vincent Prince <vincent.prince.fr@gmail.com>
wrote:

> I just look at cppzmq, and version is only 4.3.0 and not 4.3.1, my mistake.
>
> By the way, 4.3.0 version uses googletest for tests and I disabled it
> because cmake fetcher hangs,
> Moreover, master version uses another test framework (catch), so it will
> be quite some work to add googletest support then remove it for next
> version.
>
> Khem, do you think I can keep EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF"
> for now with this explanation in commit log?
> Will send v3 after your decision,
>
> Thanks,
> Vincent
>
>
> Le mer. 3 avr. 2019 à 21:33, Vincent Prince <vincent.prince.fr@gmail.com>
> a écrit :
>
>> Hi Khem,
>>
>> To be honest I disabled it because I don't have much time to add ptest
>> stuff and I had a failure with it.
>> I'll try to rework that part and at least put it in a packageconfig knob
>> as suggested.
>>
>> Thanks for review,
>> Vincent
>>
>> Le mer. 3 avr. 2019 à 18:52, Khem Raj <raj.khem@gmail.com> a écrit :
>>
>>> On Wed, Apr 3, 2019 at 1:30 AM Vincent Prince
>>> <vincent.prince.fr@gmail.com> wrote:
>>> >
>>> > Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
>>> > ---
>>> >  meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 6 ++++--
>>> >  1 file changed, 4 insertions(+), 2 deletions(-)
>>> >
>>> > diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>>> b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>>> > index 9aff59c..2f99417 100644
>>> > --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>>> > +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
>>> > @@ -4,8 +4,8 @@ LICENSE = "MIT"
>>> >  LIC_FILES_CHKSUM =
>>> "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94"
>>> >  DEPENDS = "zeromq"
>>> >
>>> > -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6"
>>> > -PV = "4.2.3+git${SRCPV}"
>>> > +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4"
>>> > +PV = "4.3.1+git${SRCPV}"
>>> >
>>> >  SRC_URI = "git://github.com/zeromq/cppzmq.git"
>>> >
>>> > @@ -13,6 +13,8 @@ S = "${WORKDIR}/git"
>>> >
>>> >  inherit cmake
>>> >
>>> > +EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF"
>>> > +
>>>
>>> explaining why tests are disabled would be helpful for future changes
>>> where someone might
>>> want to enable it and if its an optimization then turn it into
>>> packageconfig knob.
>>>
>>> >  PACKAGES = "${PN}-dev"
>>> >
>>> >  RDEPENDS_${PN}-dev = "zeromq-dev"
>>> > --
>>> > 2.7.4
>>> >
>>> > --
>>> > _______________________________________________
>>> > Openembedded-devel mailing list
>>> > Openembedded-devel@lists.openembedded.org
>>> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>>