All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/3] Package Upgrade: kmod, sysstat, tar
@ 2019-02-20  1:40 Chen Qi
  2019-02-20  1:40 ` [PATCH 1/3] kmod: upgrade to 26 Chen Qi
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Chen Qi @ 2019-02-20  1:40 UTC (permalink / raw)
  To: openembedded-core

The following changes since commit 8476abec290e253685ea33fa528936241a31537e:

  mc: upgrade 4.8.21 -> 4.8.22 (2019-02-19 16:14:58 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib ChenQi/PU-20190220
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/PU-20190220

Chen Qi (3):
  kmod: upgrade to 26
  sysstat: upgrade to 12.1.3
  tar: upgrade to 1.31

 .../sysstat/{sysstat_12.1.1.bb => sysstat_12.1.3.bb}    |  4 ++--
 meta/recipes-extended/tar/{tar_1.30.bb => tar_1.31.bb}  |  9 ++-------
 meta/recipes-kernel/kmod/kmod.inc                       |  4 ++--
 ...-to-calling-bswap_-instead-of-htobe-and-be-toh.patch | 17 +++++++++--------
 .../recipes-kernel/kmod/kmod/avoid_parallel_tests.patch | 15 ++++++++++-----
 meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch       | 13 +++++++------
 6 files changed, 32 insertions(+), 30 deletions(-)
 rename meta/recipes-extended/sysstat/{sysstat_12.1.1.bb => sysstat_12.1.3.bb} (53%)
 rename meta/recipes-extended/tar/{tar_1.30.bb => tar_1.31.bb} (88%)

-- 
1.9.1



^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH 1/3] kmod: upgrade to 26
  2019-02-20  1:40 [PATCH 0/3] Package Upgrade: kmod, sysstat, tar Chen Qi
@ 2019-02-20  1:40 ` Chen Qi
  2019-02-20  9:14   ` Adrian Bunk
  2019-02-20  1:40 ` [PATCH 2/3] sysstat: upgrade to 12.1.3 Chen Qi
  2019-02-20  1:40 ` [PATCH 3/3] tar: upgrade to 1.31 Chen Qi
  2 siblings, 1 reply; 6+ messages in thread
From: Chen Qi @ 2019-02-20  1:40 UTC (permalink / raw)
  To: openembedded-core

Refresh patches to avoid warning.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-kernel/kmod/kmod.inc                       |  4 ++--
 ...-to-calling-bswap_-instead-of-htobe-and-be-toh.patch | 17 +++++++++--------
 .../recipes-kernel/kmod/kmod/avoid_parallel_tests.patch | 15 ++++++++++-----
 meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch       | 13 +++++++------
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 29885fb..ceb66ad 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                    "
 inherit autotools gtk-doc pkgconfig manpages
 
-SRCREV = "aca4eca103d6699543f7ed663335c28c2e9908bb"
+SRCREV = "58133a96c894c043e48c74ddf0bfe8db90bac62f"
 # Lookout for PV bump too when SRCREV is changed
-PV = "25+git${SRCPV}"
+PV = "26+git${SRCPV}"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
            file://depmod-search.conf \
diff --git a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
index b722183..0ec20fa 100644
--- a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
+++ b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
@@ -1,4 +1,7 @@
-Subject: Change to calling bswap_* instead of htobe* and be*toh
+From 38d6871d9c98e0080426ea375e390728485b2bc2 Mon Sep 17 00:00:00 2001
+From: Ting Liu <b28495@freescale.com>
+Date: Tue, 10 Sep 2013 06:00:20 +0000
+Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
 
 We can't use htobe* and be*toh functions because they are not
 available on older versions of glibc, For example, shipped on Centos 5.5.
@@ -9,12 +12,13 @@ Upstream-Status: Inappropriate
 
 Signed-off-by: Ting Liu <b28495@freescale.com>
 Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+
 ---
  libkmod/libkmod-signature.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
-index 6fc06fc..912185a 100644
+index 48d0145..dd2c6fa 100644
 --- a/libkmod/libkmod-signature.c
 +++ b/libkmod/libkmod-signature.c
 @@ -18,6 +18,7 @@
@@ -23,9 +27,9 @@ index 6fc06fc..912185a 100644
  #include <endian.h>
 +#include <byteswap.h>
  #include <inttypes.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -127,7 +128,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
+ #ifdef ENABLE_OPENSSL
+ #include <openssl/cms.h>
+@@ -343,7 +344,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
  			modsig->hash >= PKEY_HASH__LAST ||
  			modsig->id_type >= PKEY_ID_TYPE__LAST)
  		return false;
@@ -34,6 +38,3 @@ index 6fc06fc..912185a 100644
  	if (sig_len == 0 ||
  	    size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len))
  		return false;
--- 
-1.9.1
-
diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
index 5f45fce..990c338 100644
--- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
+++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
@@ -1,3 +1,8 @@
+From be6f82c54f694617c646ca1f8b5bcf93694e20ad Mon Sep 17 00:00:00 2001
+From: Tudor Florea <tudor.florea@enea.com>
+Date: Fri, 6 Sep 2013 21:11:57 +0000
+Subject: [PATCH] kmod: avoid parallel-tests
+
 Avoid parallel-tests as it remove
 buildtest-TESTS and runtest-TESTS targets required by ptest.
 In automake 1.13.4 parallel-tests is assumed by defauls.
@@ -5,16 +10,16 @@ In order to have buildtest-TESTS and runtest-TESTS targets
 serial-tests is now required
 
 Signed-off-by: Tudor Florea <tudor.florea@enea.com>
-Upstream-Status: Inappropriate (disable feature incompatible with ptest) 
+Upstream-Status: Inappropriate (disable feature incompatible with ptest)
 
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac
-+++ git/configure.ac
+diff --git a/configure.ac b/configure.ac
+index ee72283..60980c0 100644
+--- a/configure.ac
++++ b/configure.ac
 @@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS
  AC_SYS_LARGEFILE
  AC_PREFIX_DEFAULT([/usr])
diff --git a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
index 5d9d40c..07e4a1f 100644
--- a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
+++ b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
@@ -1,4 +1,4 @@
-From bd43367eee868059770188fd9e9db38520dc6fff Mon Sep 17 00:00:00 2001
+From 5f55e6806cd8ae1a6c8ec1e6cb38ad292cfc1df9 Mon Sep 17 00:00:00 2001
 From: Robert Yang <liezhi.yang@windriver.com>
 Date: Wed, 22 Jan 2014 01:06:40 -0500
 Subject: [PATCH] libkmod/libkmod-internal.h: check whether O_CLOEXEC is
@@ -14,14 +14,15 @@ This problem was reported by "Ting Liu <b28495@freescale.com>"
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 
 Upstream-Status: Pending
+
 ---
- libkmod/libkmod-internal.h |    4 ++++
+ libkmod/libkmod-internal.h | 4 ++++
  1 file changed, 4 insertions(+)
 
-Index: git/libkmod/libkmod-internal.h
-===================================================================
---- git.orig/libkmod/libkmod-internal.h
-+++ git/libkmod/libkmod-internal.h
+diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
+index a65ddd1..a4f4b77 100644
+--- a/libkmod/libkmod-internal.h
++++ b/libkmod/libkmod-internal.h
 @@ -10,6 +10,10 @@
  
  #include "libkmod.h"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/3] sysstat: upgrade to 12.1.3
  2019-02-20  1:40 [PATCH 0/3] Package Upgrade: kmod, sysstat, tar Chen Qi
  2019-02-20  1:40 ` [PATCH 1/3] kmod: upgrade to 26 Chen Qi
@ 2019-02-20  1:40 ` Chen Qi
  2019-02-20  1:40 ` [PATCH 3/3] tar: upgrade to 1.31 Chen Qi
  2 siblings, 0 replies; 6+ messages in thread
From: Chen Qi @ 2019-02-20  1:40 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../recipes-extended/sysstat/{sysstat_12.1.1.bb => sysstat_12.1.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/sysstat/{sysstat_12.1.1.bb => sysstat_12.1.3.bb} (53%)

diff --git a/meta/recipes-extended/sysstat/sysstat_12.1.1.bb b/meta/recipes-extended/sysstat/sysstat_12.1.3.bb
similarity index 53%
rename from meta/recipes-extended/sysstat/sysstat_12.1.1.bb
rename to meta/recipes-extended/sysstat/sysstat_12.1.3.bb
index 027e710..5daf3f4 100644
--- a/meta/recipes-extended/sysstat/sysstat_12.1.1.bb
+++ b/meta/recipes-extended/sysstat/sysstat_12.1.3.bb
@@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
 
 SRC_URI += "file://0001-Include-needed-headers-explicitly.patch"
 
-SRC_URI[md5sum] = "43e27a92ebb4e6650cb2362b32b9d7d0"
-SRC_URI[sha256sum] = "64a286cabbf7939c32db5ca46009ae96509c85a2730905dc2f8f98ecc4a63937"
+SRC_URI[md5sum] = "0f9b73f60aba6fd49de346bc384902c3"
+SRC_URI[sha256sum] = "55498bf82755ba9fed3e7df61fd26f8f50dd3e7b3b229c731029a4c8ab51a1aa"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 3/3] tar: upgrade to 1.31
  2019-02-20  1:40 [PATCH 0/3] Package Upgrade: kmod, sysstat, tar Chen Qi
  2019-02-20  1:40 ` [PATCH 1/3] kmod: upgrade to 26 Chen Qi
  2019-02-20  1:40 ` [PATCH 2/3] sysstat: upgrade to 12.1.3 Chen Qi
@ 2019-02-20  1:40 ` Chen Qi
  2 siblings, 0 replies; 6+ messages in thread
From: Chen Qi @ 2019-02-20  1:40 UTC (permalink / raw)
  To: openembedded-core

Remove the musl specific do_install, as it's not suitable for this
version.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/tar/{tar_1.30.bb => tar_1.31.bb} | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
 rename meta/recipes-extended/tar/{tar_1.30.bb => tar_1.31.bb} (88%)

diff --git a/meta/recipes-extended/tar/tar_1.30.bb b/meta/recipes-extended/tar/tar_1.31.bb
similarity index 88%
rename from meta/recipes-extended/tar/tar_1.30.bb
rename to meta/recipes-extended/tar/tar_1.31.bb
index bd24f47..a785042 100644
--- a/meta/recipes-extended/tar/tar_1.30.bb
+++ b/meta/recipes-extended/tar/tar_1.31.bb
@@ -11,8 +11,8 @@ SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \
            file://musl_dirent.patch \
 "
 
-SRC_URI[md5sum] = "8404e4c1fc5a3000228ab2b8ad674a65"
-SRC_URI[sha256sum] = "87592b86cb037c554375f5868bdd3cc57748aef38d6cb741c81065f0beac63b7"
+SRC_URI[md5sum] = "77afa35b696c8d760331fa0e12c2fac9"
+SRC_URI[sha256sum] = "577bd4463eea103bdfc662fc385789e2228dbeb399a1d0b98571ed9ce044f763"
 
 inherit autotools gettext texinfo
 
@@ -43,11 +43,6 @@ do_install_append_class-target() {
     fi
 }
 
-do_install_append_libc-musl() {
-    rm -f ${D}${libdir}/charset.alias
-    rmdir ${D}${libdir}
-}
-
 PACKAGES =+ "${PN}-rmt"
 
 FILES_${PN}-rmt = "${base_sbindir}/rmt*"
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] kmod: upgrade to 26
  2019-02-20  1:40 ` [PATCH 1/3] kmod: upgrade to 26 Chen Qi
@ 2019-02-20  9:14   ` Adrian Bunk
  2019-02-20 11:38     ` Richard Purdie
  0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2019-02-20  9:14 UTC (permalink / raw)
  To: Chen Qi; +Cc: openembedded-core

On Wed, Feb 20, 2019 at 09:40:35AM +0800, Chen Qi wrote:
>...
> --- a/meta/recipes-kernel/kmod/kmod.inc
> +++ b/meta/recipes-kernel/kmod/kmod.inc
> @@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
>                     "
>  inherit autotools gtk-doc pkgconfig manpages
>  
> -SRCREV = "aca4eca103d6699543f7ed663335c28c2e9908bb"
> +SRCREV = "58133a96c894c043e48c74ddf0bfe8db90bac62f"
>  # Lookout for PV bump too when SRCREV is changed
> -PV = "25+git${SRCPV}"
> +PV = "26+git${SRCPV}"
>...

Shouldn't this be PV = "26" when the commit is exactly the release?

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



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] kmod: upgrade to 26
  2019-02-20  9:14   ` Adrian Bunk
@ 2019-02-20 11:38     ` Richard Purdie
  0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2019-02-20 11:38 UTC (permalink / raw)
  To: Adrian Bunk, Chen Qi; +Cc: openembedded-core

On Wed, 2019-02-20 at 11:14 +0200, Adrian Bunk wrote:
> On Wed, Feb 20, 2019 at 09:40:35AM +0800, Chen Qi wrote:
> > ...
> > --- a/meta/recipes-kernel/kmod/kmod.inc
> > +++ b/meta/recipes-kernel/kmod/kmod.inc
> > @@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = "
> > file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> >                     "
> >  inherit autotools gtk-doc pkgconfig manpages
> >  
> > -SRCREV = "aca4eca103d6699543f7ed663335c28c2e9908bb"
> > +SRCREV = "58133a96c894c043e48c74ddf0bfe8db90bac62f"
> >  # Lookout for PV bump too when SRCREV is changed
> > -PV = "25+git${SRCPV}"
> > +PV = "26+git${SRCPV}"
> > ...
> 
> Shouldn't this be PV = "26" when the commit is exactly the release?

Well spotted. I was going to ask for a v2 but messed up the patch
merging by confusing two patches. End result was I merged a fix for it,
thanks.

Cheers,

Richard



^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-02-20 11:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-20  1:40 [PATCH 0/3] Package Upgrade: kmod, sysstat, tar Chen Qi
2019-02-20  1:40 ` [PATCH 1/3] kmod: upgrade to 26 Chen Qi
2019-02-20  9:14   ` Adrian Bunk
2019-02-20 11:38     ` Richard Purdie
2019-02-20  1:40 ` [PATCH 2/3] sysstat: upgrade to 12.1.3 Chen Qi
2019-02-20  1:40 ` [PATCH 3/3] tar: upgrade to 1.31 Chen Qi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.