Packages upgrade

PATCH In review Robert Yang 2 participants 10 messages Dec 22, 2014

lore

Share & tools

lore

Robert Yang

author

2014-12-22 05:28 UTC #0 lore raw

cover Packages upgrade

The following changes since commit c3598cf720e04ab27ab5d2817c09f2496b677560:

kernel-devsrc: Ensure we have a dependency on the actual source (2014-12-21 13:51:29 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/pu
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/pu

Robert Yang (7):
file: upgrade to 5.21
wget: upgrade to 1.16.1
wget: add PACKAGECONFIG for util-linux
rsync: upgrade to 3.1.1
logrotate: upgrade to 3.8.8
git: upgrade to 2.2.0
make: upgrade to 4.1

 .../recipes-devtools/file/file/debian-742262.patch |    4 +--
 .../file/{file_5.18.bb => file_5.21.bb}            |    4 +--
 .../git/{git_2.0.1.bb => git_2.2.0.bb}             |    4 +--
 .../make/{make_4.0.bb => make_4.1.bb}              |    4 +--
 .../rsync/{rsync_3.1.0.bb => rsync_3.1.1.bb}       |    4 +--
 .../disable-check-different-filesystems.patch      |   34 --------------------
 .../{logrotate_3.8.7.bb => logrotate_3.8.8.bb}     |    5 ++-
 meta/recipes-extended/wget/wget.inc                |    5 ++-
 .../wget/{wget_1.16.bb => wget_1.16.1.bb}          |    4 +--
 9 files changed, 18 insertions(+), 50 deletions(-)
 rename meta/recipes-devtools/file/{file_5.18.bb => file_5.21.bb} (86%)
 rename meta/recipes-devtools/git/{git_2.0.1.bb => git_2.2.0.bb} (61%)
 rename meta/recipes-devtools/make/{make_4.0.bb => make_4.1.bb} (71%)
 rename meta/recipes-devtools/rsync/{rsync_3.1.0.bb => rsync_3.1.1.bb} (83%)
 delete mode 100644 meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
 rename meta/recipes-extended/logrotate/{logrotate_3.8.7.bb => logrotate_3.8.8.bb} (89%)
 rename meta/recipes-extended/wget/{wget_1.16.bb => wget_1.16.1.bb} (45%)

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-12-22 05:28 UTC #1 lore raw

PATCH 1/7 file: upgrade to 5.21

* Upgrade to 5.21.
* The debian-742262.patch is still needed.

Signed-off-by Robert Yang <[email protected]>

---
 .../recipes-devtools/file/file/debian-742262.patch |    4 ++--
 .../file/{file_5.18.bb => file_5.21.bb}            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/file/{file_5.18.bb => file_5.21.bb} (86%)

meta/recipes-devtools/file/file/debian-742262.patch +2 -2

index d57258c..1ef485e 100644
@@ -9,10 +9,10 @@ Signed-off-by: Robert Yang <[email protected]>
 diff --git a/magic/Magdir/commands b/magic/Magdir/commands
 --- a/magic/Magdir/commands
 +++ b/magic/Magdir/commands
-@@ -50,6 +50,7 @@
+@@ -57,6 +57,7 @@
  0	string/wt	#!\ /usr/bin/awk	awk script text executable
  !:mime	text/x-awk
- 0	regex		=^\\s{0,100}BEGIN\\s{0,100}[{]	awk script text
+ 0	regex/4096	=^\\s{0,100}BEGIN\\s{0,100}[{]	awk or perl script text
 +!:strength - 12
  
  # AT&T Bell Labs' Plan 9 shell

meta/recipes-devtools/file/file_5.21.bb renamed from meta/recipes-devtools/file/file_5.18.bb +2 -2

similarity index 86%
rename from meta/recipes-devtools/file/file_5.18.bb
rename to meta/recipes-devtools/file/file_5.21.bb
index 9068b93..702ea87 100644
@@ -15,8 +15,8 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
            file://debian-742262.patch \
           "
 
-SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a"
-SRC_URI[sha256sum] = "6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07"
+SRC_URI[md5sum] = "549fe96e09041eabece9de2bb28ef923"
+SRC_URI[sha256sum] = "1a48741d3923c4cc73267109b8a396c0ce3aebe004181f3efb1b0a228d230bb6"
 
 inherit autotools

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-12-22 05:28 UTC #2 lore raw

PATCH 2/7 wget: upgrade to 1.16.1

In reply to Robert Yang

* upgrade to 1.16.1
* inherit pkgconfig to fix the error like:a
| configure.ac:41: error: possibly undefined macro: AC_MSG_NOTICE | configure.ac:89: error: possibly undefined macro: AS_IF

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-extended/wget/wget.inc                |    2 +-
 .../wget/{wget_1.16.bb => wget_1.16.1.bb}          |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/wget/{wget_1.16.bb => wget_1.16.1.bb} (45%)

meta/recipes-extended/wget/wget.inc +1 -1

index dc46841..f2e12ef 100644
@@ -7,7 +7,7 @@ DEPENDS = "gnutls zlib libpcre"
 
 INC_PR = "r16"
 
-inherit autotools gettext texinfo update-alternatives
+inherit autotools gettext texinfo update-alternatives pkgconfig
 
 EXTRA_OECONF = "--enable-ipv6 --with-ssl=gnutls --disable-rpath --disable-iri \
                 --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no"

meta/recipes-extended/wget/wget_1.16.1.bb renamed from meta/recipes-extended/wget/wget_1.16.bb +2 -2

similarity index 45%
rename from meta/recipes-extended/wget/wget_1.16.bb
rename to meta/recipes-extended/wget/wget_1.16.1.bb
index 257b534..ca6f0fe 100644
@@ -2,7 +2,7 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
            file://fix_makefile.patch \
           "
 
-SRC_URI[md5sum] = "293a37977c41b5522f781d3a3a078426"
-SRC_URI[sha256sum] = "b977fc10ac7a72d987d48136251aeb332f2dced1aabd50d6d56bdf72e2b79101"
+SRC_URI[md5sum] = "5d12410a398ec9907e105e8734561ba0"
+SRC_URI[sha256sum] = "3b834ce69366d4681f295307fce36ee14e122c4ee68a4d1291b62b0b26755a77"
 
 require wget.inc

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-12-22 05:28 UTC #3 lore raw

PATCH 3/7 wget: add PACKAGECONFIG for util-linux

In reply to Robert Yang

Fixed:
WARNING: QA Issue: wget rdepends on util-linux-libuuid, but it isn't a build dependency? [build-deps]

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-extended/wget/wget.inc |    3 +++
 1 file changed, 3 insertions(+)

meta/recipes-extended/wget/wget.inc +3 -0

index f2e12ef..049b898 100644
@@ -19,3 +19,6 @@ ALTERNATIVE_PRIORITY = "100"
 RRECOMMENDS_${PN} += "ca-certificates"
 
 BBCLASSEXTEND += "nativesdk"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux"

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-12-22 05:28 UTC #4 lore raw

PATCH 4/7 rsync: upgrade to 3.1.1

In reply to Robert Yang

Signed-off-by Robert Yang <[email protected]>

---
 .../rsync/{rsync_3.1.0.bb => rsync_3.1.1.bb}       |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/rsync/{rsync_3.1.0.bb => rsync_3.1.1.bb} (83%)

meta/recipes-devtools/rsync/rsync_3.1.1.bb renamed from meta/recipes-devtools/rsync/rsync_3.1.0.bb +2 -2

similarity index 83%
rename from meta/recipes-devtools/rsync/rsync_3.1.0.bb
rename to meta/recipes-devtools/rsync/rsync_3.1.1.bb
index a4a5c10..5ff8ae8 100644
@@ -3,8 +3,8 @@ require rsync.inc
 
 SRC_URI += "file://acinclude.m4"
 
-SRC_URI[md5sum] = "3be148772a33224771a8d4d2a028b132"
-SRC_URI[sha256sum] = "81ca23f77fc9b957eb9845a6024f41af0ff0c619b7f38576887c63fa38e2394e"
+SRC_URI[md5sum] = "43bd6676f0b404326eee2d63be3cdcfe"
+SRC_URI[sha256sum] = "7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621"
 
 PACKAGECONFIG ??= "acl attr"
 PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl,"

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-12-22 05:28 UTC #5 lore raw

PATCH 5/7 logrotate: upgrade to 3.8.8

In reply to Robert Yang

* Upgrade to 3.8.8.
* Remove disable-check-different-filesystems.patch which had been merged by upstream.

Signed-off-by Robert Yang <[email protected]>

---
 .../disable-check-different-filesystems.patch      |   34 --------------------
 .../{logrotate_3.8.7.bb => logrotate_3.8.8.bb}     |    5 ++-
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
 rename meta/recipes-extended/logrotate/{logrotate_3.8.7.bb => logrotate_3.8.8.bb} (89%)

meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch deleted +0 ~~-34~~

deleted file mode 100644
index 43068bd..0000000
@@ -1,34 +0,0 @@
-Disable the check for different filesystems
-
-The logrotate supports rotate log across different filesystems now, so
-disable the check for different filesystems.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Robert Yang <[email protected]>
----
- config.c |    8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
-
-diff --git a/config.c b/config.c
-index a85d1df..24575b3 100644
---- a/config.c
-+++ b/config.c
-@@ -1453,14 +1453,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
- 						dirName, strerror(errno));
- 					goto error;
- 					}
--
--					if (sb.st_dev != sb2.st_dev) {
--					message(MESS_ERROR,
--						"%s:%d olddir %s and log file %s "
--						"are on different devices\n", configFile,
--						lineNum, newlog->oldDir, newlog->files[i]);
--					goto error;
--					}
- 				}
- 				}
- 
--- 
-1.7.4.1
-

meta/recipes-extended/logrotate/logrotate_3.8.8.bb renamed from meta/recipes-extended/logrotate/logrotate_3.8.7.bb +2 -3

similarity index 89%
rename from meta/recipes-extended/logrotate/logrotate_3.8.7.bb
rename to meta/recipes-extended/logrotate/logrotate_3.8.8.bb
index faa8e02..8d32938 100644
@@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
 
 SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \
            file://act-as-mv-when-rotate.patch \
-           file://disable-check-different-filesystems.patch \
            file://update-the-manual.patch \
             "
 
-SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
-SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
+SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca"
+SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f"
 
 PACKAGECONFIG ?= "\
     ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \

Signature · 1 line

1.7.9.5

Richard Purdie

2014-12-22 13:08 UTC #6 lore raw

Re: [PATCH 5/7] logrotate: upgrade to 3.8.8

Quoted 3 lines · Robert Yang

* Upgrade to 3.8.8.
* Remove disable-check-different-filesystems.patch which had been merged by upstream.

Are you sure? Autobuilder shows:

https://autobuilder.yoctoproject.org/main/builders/nightly-qa-logrotate/builds/136/steps/Running%20Sanity%20Tests/logs/stdio

Cheers,

Richard

Quoted 73 lines

Signed-off-by Robert Yang <[email protected]>

---
 .../disable-check-different-filesystems.patch      |   34 --------------------
 .../{logrotate_3.8.7.bb => logrotate_3.8.8.bb}     |    5 ++-
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
 rename meta/recipes-extended/logrotate/{logrotate_3.8.7.bb => logrotate_3.8.8.bb} (89%)

meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch deleted +0 ~~-34~~

deleted file mode 100644
index 43068bd..0000000
@@ -1,34 +0,0 @@
-Disable the check for different filesystems
-
-The logrotate supports rotate log across different filesystems now, so
-disable the check for different filesystems.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Robert Yang <[email protected]>
----
- config.c |    8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
-
-diff --git a/config.c b/config.c
-index a85d1df..24575b3 100644
---- a/config.c
-+++ b/config.c
-@@ -1453,14 +1453,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
- 						dirName, strerror(errno));
- 					goto error;
- 					}
--
--					if (sb.st_dev != sb2.st_dev) {
--					message(MESS_ERROR,
--						"%s:%d olddir %s and log file %s "
--						"are on different devices\n", configFile,
--						lineNum, newlog->oldDir, newlog->files[i]);
--					goto error;
--					}
- 				}
- 				}
- 
--- 
-1.7.4.1
-

meta/recipes-extended/logrotate/logrotate_3.8.8.bb renamed from meta/recipes-extended/logrotate/logrotate_3.8.7.bb +2 -3

similarity index 89%
rename from meta/recipes-extended/logrotate/logrotate_3.8.7.bb
rename to meta/recipes-extended/logrotate/logrotate_3.8.8.bb
index faa8e02..8d32938 100644
@@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
 
 SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \
            file://act-as-mv-when-rotate.patch \
-           file://disable-check-different-filesystems.patch \
            file://update-the-manual.patch \
             "
 
-SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
-SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
+SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca"
+SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f"
 
 PACKAGECONFIG ?= "\
     ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-12-22 14:57 UTC #7 lore raw

Re: [PATCH 5/7] logrotate: upgrade to 3.8.8

Quoted 7 lines · Richard Purdie

Quoted 3 lines · Robert Yang
* Upgrade to 3.8.8.
* Remove disable-check-different-filesystems.patch which had been merged by upstream.
Are you sure? Autobuilder shows:

Sorry, I had submitted the patches to the upstream two years ago, and remembered that got some feed back, but clearly not got merged, I will talk with the upstream.

I've updated the patch for 3.8.8 atm, and pushed all the packages upagrade to the repo:

git://git.openembedded.org/openembedded-core-contrib rbt/pu

I've done some testing on it, rotate the log from /var/log/ to /home/root, it works well.

// Robert

Quoted 84 lines

https://autobuilder.yoctoproject.org/main/builders/nightly-qa-logrotate/builds/136/steps/Running%20Sanity%20Tests/logs/stdio

Cheers,

Richard

Quoted 73 lines

Signed-off-by Robert Yang <[email protected]>

---
  .../disable-check-different-filesystems.patch      |   34 --------------------
  .../{logrotate_3.8.7.bb => logrotate_3.8.8.bb}     |    5 ++-
  2 files changed, 2 insertions(+), 37 deletions(-)

delete mode 100644 meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch rename meta/recipes-extended/logrotate/{logrotate_3.8.7.bb => logrotate_3.8.8.bb} (89%)

meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch deleted +0 ~~-34~~

deleted file mode 100644
index 43068bd..0000000
@@ -1,34 +0,0 @@
-Disable the check for different filesystems
-
-The logrotate supports rotate log across different filesystems now, so
-disable the check for different filesystems.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Robert Yang <[email protected]>
----
- config.c |    8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
-
-diff --git a/config.c b/config.c
-index a85d1df..24575b3 100644
---- a/config.c
-+++ b/config.c
-@@ -1453,14 +1453,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
- 						dirName, strerror(errno));
- 					goto error;
- 					}
--
--					if (sb.st_dev != sb2.st_dev) {
--					message(MESS_ERROR,
--						"%s:%d olddir %s and log file %s "
--						"are on different devices\n", configFile,
--						lineNum, newlog->oldDir, newlog->files[i]);
--					goto error;
--					}
- 				}
- 				}
-
---
-1.7.4.1
-

meta/recipes-extended/logrotate/logrotate_3.8.8.bb renamed from meta/recipes-extended/logrotate/logrotate_3.8.7.bb +2 -4

similarity index 89%
rename from meta/recipes-extended/logrotate/logrotate_3.8.7.bb
rename to meta/recipes-extended/logrotate/logrotate_3.8.8.bb
index faa8e02..8d32938 100644
@@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
 
  SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \
             file://act-as-mv-when-rotate.patch \
-           file://disable-check-different-filesystems.patch \
             file://update-the-manual.patch \
              "
 
-SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
-SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
+SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca"
+SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f"
 
  PACKAGECONFIG ?= "\
      ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
--

1.7.9.5

Robert Yang

author

2014-12-22 05:28 UTC #8 lore raw

PATCH 6/7 git: upgrade to 2.2.0

In reply to Robert Yang

Signed-off-by Robert Yang <[email protected]>

---
 .../git/{git_2.0.1.bb => git_2.2.0.bb}             |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/git/{git_2.0.1.bb => git_2.2.0.bb} (61%)

meta/recipes-devtools/git/git_2.2.0.bb renamed from meta/recipes-devtools/git/git_2.0.1.bb +2 -2

similarity index 61%
rename from meta/recipes-devtools/git/git_2.0.1.bb
rename to meta/recipes-devtools/git/git_2.2.0.bb
index dbf32e1..7341d98 100644
@@ -1,7 +1,7 @@
 require git.inc
 
-SRC_URI[md5sum] = "981f5937840716cb563be1cc6292c8d7"
-SRC_URI[sha256sum] = "02609a06fb40db1f6a968867c0e82bcb959b85902747830de0fda53228712daf"
+SRC_URI[md5sum] = "2d5bbcc3e887cc4ba499f80420e2d5f7"
+SRC_URI[sha256sum] = "bea9548f5a39daaf7c3873b6a5be47d7f92cbf42d32957e1be955a2e0e7b83b4"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-12-22 05:28 UTC #9 lore raw

PATCH 7/7 make: upgrade to 4.1

In reply to Robert Yang

Signed-off-by Robert Yang <[email protected]>

---
 .../make/{make_4.0.bb => make_4.1.bb}              |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/make/{make_4.0.bb => make_4.1.bb} (71%)

meta/recipes-devtools/make/make_4.1.bb renamed from meta/recipes-devtools/make/make_4.0.bb +2 -2

similarity index 71%
rename from meta/recipes-devtools/make/make_4.0.bb
rename to meta/recipes-devtools/make/make_4.1.bb
index 38d328c..a1b0d7c 100644
@@ -6,7 +6,7 @@ require make.inc
 
 EXTRA_OECONF += "--without-guile"
 
-SRC_URI[md5sum] = "571d470a7647b455e3af3f92d79f1c18"
-SRC_URI[sha256sum] = "e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb"
+SRC_URI[md5sum] = "57a7a224a822f94789a587ccbcedff69"
+SRC_URI[sha256sum] = "0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5"
 
 BBCLASSEXTEND = "native nativesdk"

Signature · 1 line

1.7.9.5