Skip to contentSkip to conversation

upgrade 3 recipes

PATCH Superseded Hongxu Jia 2 participants 9 messages Aug 23, 2017 – Aug 24, 2017

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover upgrade 3 recipes

The following changes since commit ac2a6d2b5d69937577effcb8bb2149651bac0176:

json-spirit: Add -latomic to LDFLAGS (2017-08-13 13:21:04 +0200)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib hongxu/upgrade-20180823
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/upgrade-20180823

Hongxu Jia (3):
netcf: upgrade to latest 0.2.8
gnulib: upgrade to 2017-08-20.18
collectd: 5.7.1 -> 5.7.2

 .../recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb}    | 11 ++++++-----
 .../collectd/{collectd_5.7.1.bb => collectd_5.7.2.bb}         |  4 ++--
 .../gnulib/{gnulib_git.bb => gnulib_2017-08-20.18.bb}         |  5 ++---
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename meta-networking/recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb} (88%)
 rename meta-oe/recipes-extended/collectd/{collectd_5.7.1.bb => collectd_5.7.2.bb} (96%)
 rename meta-oe/recipes-support/gnulib/{gnulib_git.bb => gnulib_2017-08-20.18.bb} (86%)
Signature · 1 line
2.8.1
author
#1 lore raw

PATCH 1/3 netcf: upgrade to latest 0.2.8

Fix compile failure while gnulib upgraded to 2017-08-20.18
...

| In file included from ../../../git/gnulib/lib/printf-args.h:41:0,
|                  from ../../../git/gnulib/lib/printf-parse.h:29,
|                  from ../../../git/gnulib/lib/printf-parse.c:36:
| ./wchar.h:571:6: error: #if with no expression
|  # if

...

Update HOMEPAGE, SRC_URI since the formers are obsolete.

Update SRCREV, although version not change, but the former was two years ago.

---
 .../recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb}    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 rename meta-networking/recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb} (88%)
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +6 -5
similarity index 88%
rename from meta-networking/recipes-support/netcf/netcf_git.bb
rename to meta-networking/recipes-support/netcf/netcf_0.2.8.bb
index a7a5000..902eb15 100644
@@ -1,15 +1,14 @@
 SUMMARY = "netcf"
 DESCRIPTION = "netcf is a cross-platform network configuration library."
-HOMEPAGE = "https://fedorahosted.org/netcf/"
+HOMEPAGE = "https://pagure.io/netcf"
 SECTION = "libs"
 LICENSE = "LGPLv2.1"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f"
 
-SRCREV = "9158278ad35b46ce9a49b2e887483c6d8c287994"
-PV = "0.2.8+git${SRCPV}"
+SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4"
 
-SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
+SRC_URI = "git://pagure.io/netcf.git;protocol=https \
 "
 
 DEPENDS += "augeas libnl libxslt libxml2 gnulib"
@@ -23,6 +22,8 @@ EXTRA_OECONF_append_class-target = " --with-driver=redhat"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
 
+EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
+
 do_configure_prepend() {
     currdir=`pwd`
     cd ${S}
Signature · 1 line
2.8.1
#2 lore raw

Re: [meta-networking][PATCH 1/3] netcf: upgrade to latest 0.2.8

Quoted 30 lines · Hongxu Jia

Fix compile failure while gnulib upgraded to 2017-08-20.18
...

| In file included from ../../../git/gnulib/lib/printf-args.h:41:0,
|                  from ../../../git/gnulib/lib/printf-parse.h:29,
|                  from ../../../git/gnulib/lib/printf-parse.c:36:
| ./wchar.h:571:6: error: #if with no expression
|  # if

...

Update HOMEPAGE, SRC_URI since the formers are obsolete.

Update SRCREV, although version not change, but the former was two years ago.

---
 .../recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb}    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 rename meta-networking/recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb} (88%)
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +0 -0
similarity index 88%
rename from meta-networking/recipes-support/netcf/netcf_git.bb
rename to meta-networking/recipes-support/netcf/netcf_0.2.8.bb
index a7a5000..902eb15 100644
@@ -1,15 +1,14 @@
 SUMMARY = "netcf"
 DESCRIPTION = "netcf is a cross-platform network configuration library."

meta-networking/recipes-support/netcf/netcf_0.2.8.bb line 10

Quoted 10 lines
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +2 -4
-HOMEPAGE = "https://fedorahosted.org/netcf/"
+HOMEPAGE = "https://pagure.io/netcf"
 SECTION = "libs"
 LICENSE = "LGPLv2.1"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f"
 
-SRCREV = "9158278ad35b46ce9a49b2e887483c6d8c287994"
-PV = "0.2.8+git${SRCPV}"

this will make version go backward

Quoted 24 lines
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +4 -2
+SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4"
 
-SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
+SRC_URI = "git://pagure.io/netcf.git;protocol=https \
 "
 
 DEPENDS += "augeas libnl libxslt libxml2 gnulib"
@@ -23,6 +22,8 @@ EXTRA_OECONF_append_class-target = " --with-driver=redhat"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
 
+EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
+
 do_configure_prepend() {
     currdir=`pwd`
     cd ${S}
--

2.8.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

author
#3 lore raw

PATCH v2 1/1 netcf: upgrade to latest 0.2.8

Fix compile failure while gnulib upgraded to 2017-08-20.18
...

| In file included from ../../../git/gnulib/lib/printf-args.h:41:0,
|                  from ../../../git/gnulib/lib/printf-parse.h:29,
|                  from ../../../git/gnulib/lib/printf-parse.c:36:
| ./wchar.h:571:6: error: #if with no expression
|  # if

...

Update HOMEPAGE, SRC_URI since the formers are obsolete.

Update SRCREV, although version not change, but the former was two years ago.

---
 .../recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb}     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
 rename meta-networking/recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb} (88%)
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +6 -4
similarity index 88%
rename from meta-networking/recipes-support/netcf/netcf_git.bb
rename to meta-networking/recipes-support/netcf/netcf_0.2.8.bb
index a7a5000..0b53add 100644
@@ -1,15 +1,15 @@
 SUMMARY = "netcf"
 DESCRIPTION = "netcf is a cross-platform network configuration library."
-HOMEPAGE = "https://fedorahosted.org/netcf/"
+HOMEPAGE = "https://pagure.io/netcf"
 SECTION = "libs"
 LICENSE = "LGPLv2.1"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f"
 
-SRCREV = "9158278ad35b46ce9a49b2e887483c6d8c287994"
+SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4"
 PV = "0.2.8+git${SRCPV}"
 
-SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
+SRC_URI = "git://pagure.io/netcf.git;protocol=https \
 "
 
 DEPENDS += "augeas libnl libxslt libxml2 gnulib"
@@ -23,6 +23,8 @@ EXTRA_OECONF_append_class-target = " --with-driver=redhat"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
 
+EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
+
 do_configure_prepend() {
     currdir=`pwd`
     cd ${S}
Signature · 1 line
2.8.1
#4 lore raw

Re: [meta-networking][PATCH V2] netcf: upgrade to latest 0.2.8

Quoted 31 lines · Hongxu Jia

Fix compile failure while gnulib upgraded to 2017-08-20.18
...

| In file included from ../../../git/gnulib/lib/printf-args.h:41:0,
|                  from ../../../git/gnulib/lib/printf-parse.h:29,
|                  from ../../../git/gnulib/lib/printf-parse.c:36:
| ./wchar.h:571:6: error: #if with no expression
|  # if

...

Update HOMEPAGE, SRC_URI since the formers are obsolete.

Update SRCREV, although version not change, but the former was two years ago.

---
 .../recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb}     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
 rename meta-networking/recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb} (88%)
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +0 -1
similarity index 88%
rename from meta-networking/recipes-support/netcf/netcf_git.bb
rename to meta-networking/recipes-support/netcf/netcf_0.2.8.bb
index a7a5000..0b53add 100644
@@ -1,15 +1,15 @@
 SUMMARY = "netcf"
 DESCRIPTION = "netcf is a cross-platform network configuration library."
-HOMEPAGE = "https://fedorahosted.org/netcf/"

meta-networking/recipes-support/netcf/netcf_0.2.8.bb line 10

Quoted 10 lines
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +3 -2
+HOMEPAGE = "https://pagure.io/netcf"
 SECTION = "libs"
 LICENSE = "LGPLv2.1"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f"
 
-SRCREV = "9158278ad35b46ce9a49b2e887483c6d8c287994"
+SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4"
 PV = "0.2.8+git${SRCPV}"

you can change it to

PV .= "+git${SRCPV}"

Quoted 18 lines
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +3 -2
-SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
+SRC_URI = "git://pagure.io/netcf.git;protocol=https \
 "
 
 DEPENDS += "augeas libnl libxslt libxml2 gnulib"
@@ -23,6 +23,8 @@ EXTRA_OECONF_append_class-target = " --with-driver=redhat"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
 
+EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
+
 do_configure_prepend() {
     currdir=`pwd`
     cd ${S}
--

2.8.1

author
#5 lore raw

Re: [meta-networking][PATCH V2] netcf: upgrade to latest 0.2.8

Quoted 39 lines · Khem Raj
Quoted 38 lines · Hongxu Jia

Fix compile failure while gnulib upgraded to 2017-08-20.18
...

| In file included from ../../../git/gnulib/lib/printf-args.h:41:0,
|                  from ../../../git/gnulib/lib/printf-parse.h:29,
|                  from ../../../git/gnulib/lib/printf-parse.c:36:
| ./wchar.h:571:6: error: #if with no expression
|  # if

...

Update HOMEPAGE, SRC_URI since the formers are obsolete.

Update SRCREV, although version not change, but the former was two years ago.

---
  .../recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb}     | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

rename meta-networking/recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb} (88%)

meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +2 -2
similarity index 88%
rename from meta-networking/recipes-support/netcf/netcf_git.bb
rename to meta-networking/recipes-support/netcf/netcf_0.2.8.bb
index a7a5000..0b53add 100644
@@ -1,15 +1,15 @@
  SUMMARY = "netcf"
  DESCRIPTION = "netcf is a cross-platform network configuration library."
-HOMEPAGE = "https://fedorahosted.org/netcf/"
+HOMEPAGE = "https://pagure.io/netcf"
  SECTION = "libs"
  LICENSE = "LGPLv2.1"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f"
 
Quoted 6 lines

meta-networking/recipes-support/netcf/netcf_0.2.8.bb line 10

Quoted 3 lines
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +1 -1
-SRCREV = "9158278ad35b46ce9a49b2e887483c6d8c287994"
+SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4"
  PV = "0.2.8+git${SRCPV}"

you can change it to

PV .= "+git${SRCPV}"

Why? Since the PR Server used, will make version go backward?

//Hongxu

Quoted 17 lines
Quoted 17 lines
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +3 -2
-SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
+SRC_URI = "git://pagure.io/netcf.git;protocol=https \
  "
 
  DEPENDS += "augeas libnl libxslt libxml2 gnulib"
@@ -23,6 +23,8 @@ EXTRA_OECONF_append_class-target = " --with-driver=redhat"
  PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
  PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts,"
 
+EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
+
  do_configure_prepend() {
      currdir=`pwd`
      cd ${S}
--

2.8.1

#6 lore raw

Re: [meta-networking][PATCH V2] netcf: upgrade to latest 0.2.8

Quoted 53 lines · Hongxu Jia
Quoted 52 lines · Khem Raj
Quoted 36 lines · Hongxu Jia

Fix compile failure while gnulib upgraded to 2017-08-20.18
...

| In file included from ../../../git/gnulib/lib/printf-args.h:41:0,
|                  from ../../../git/gnulib/lib/printf-parse.h:29,
|                  from ../../../git/gnulib/lib/printf-parse.c:36:
| ./wchar.h:571:6: error: #if with no expression
|  # if

...

Update HOMEPAGE, SRC_URI since the formers are obsolete.

Update SRCREV, although version not change, but the former was two years ago.

---
  .../recipes-support/netcf/{netcf_git.bb => netcf_0.2.8.bb}     | 10
++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

rename meta-networking/recipes-support/netcf/{netcf_git.bb =>
netcf_0.2.8.bb} (88%)

meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +0 -0
similarity index 88%
rename from meta-networking/recipes-support/netcf/netcf_git.bb
rename to meta-networking/recipes-support/netcf/netcf_0.2.8.bb
index a7a5000..0b53add 100644
@@ -1,15 +1,15 @@
  SUMMARY = "netcf"
  DESCRIPTION = "netcf is a cross-platform network configuration

library."

meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +0 -1
-HOMEPAGE = "https://fedorahosted.org/netcf/"

meta-networking/recipes-support/netcf/netcf_0.2.8.bb line 10

Quoted 10 lines
meta-networking/recipes-support/netcf/netcf_0.2.8.bb renamed from meta-networking/recipes-support/netcf/netcf_git.bb +3 -2
+HOMEPAGE = "https://pagure.io/netcf"
  SECTION = "libs"
  LICENSE = "LGPLv2.1"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f"
 
-SRCREV = "9158278ad35b46ce9a49b2e887483c6d8c287994"
+SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4"
  PV = "0.2.8+git${SRCPV}"

you can change it to

Quoted 4 lines
Quoted 1 line

PV .= "+git${SRCPV}"

Why? Since the PR Server used, will make version go backward?

since the recipe is not upgraded base PR should remains same for upgradability reasons.

author
#7 lore raw

PATCH 2/3 gnulib: upgrade to 2017-08-20.18

In reply to Hongxu Jia

Get version number by invoking:
...

$ ${S}/build-aux/git-version-gen --version
git-version-gen 2017-08-20.18
...

The gnulib 2017-08-20.18 fixed CVE-2017-7476.

---
 .../gnulib/{gnulib_git.bb => gnulib_2017-08-20.18.bb}                | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/gnulib/{gnulib_git.bb => gnulib_2017-08-20.18.bb} (86%)
meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb renamed from meta-oe/recipes-support/gnulib/gnulib_git.bb +2 -3
similarity index 86%
rename from meta-oe/recipes-support/gnulib/gnulib_git.bb
rename to meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb
index c7c7ae8..b505ac1 100644
@@ -10,9 +10,8 @@ HOMEPAGE = "http://www.gnu.org/software/gnulib/"
 SECTION = "devel"
 LICENSE = "LGPLv2+"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=e4cf3810f33a067ea7ccd2cd889fed21"
-SRCREV = "b6b3ed1fa4c6de12908a9f01d1689f156c3cd441"
-PV = "0.1.496+git${SRCPV}"
+LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5"
+SRCREV = "b23000de1e47c7d580e0e220966dd1ee42a5e5bc"
 
 SRC_URI = "git://git.sv.gnu.org/gnulib;protocol=git \
 "
Signature · 1 line
2.8.1
author
#8 lore raw

PATCH 3/3 collectd: 5.7.1 -> 5.7.2

In reply to Hongxu Jia

The 5.7.2 fixed CVE-2017-7401.

---
 .../collectd/{collectd_5.7.1.bb => collectd_5.7.2.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-extended/collectd/{collectd_5.7.1.bb => collectd_5.7.2.bb} (96%)
meta-oe/recipes-extended/collectd/collectd_5.7.2.bb renamed from meta-oe/recipes-extended/collectd/collectd_5.7.1.bb +2 -2
similarity index 96%
rename from meta-oe/recipes-extended/collectd/collectd_5.7.1.bb
rename to meta-oe/recipes-extended/collectd/collectd_5.7.2.bb
index b7789c7..c156ea1 100644
@@ -13,8 +13,8 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \
            file://0001-fix-to-build-with-glibc-2.25.patch \
            file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \
 "
-SRC_URI[md5sum] = "dc36141ed3058c4919bbd54b87c07873"
-SRC_URI[sha256sum] = "7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501"
+SRC_URI[md5sum] = "5da2b69c286a064db35c6cc1e758b039"
+SRC_URI[sha256sum] = "9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592"
 
 inherit autotools pythonnative update-rc.d pkgconfig systemd
 
Signature · 1 line
2.8.1