Skip to contentSkip to conversation

Upgrade gawk and util-linux

PATCH New Chen Qi 1 participant 3 messages Jun 1, 2015

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover Upgrade gawk and util-linux

The following changes since commit 7ffe10df73cc20d10fcd41b121074445273bd60e:

license_class: license_create_manifest improvment (2015-05-09 22:26:02 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib ChenQi/PU-20150601
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/PU-20150601

Chen Qi (2):
util-linux: upgrade to 2.26.2
gawk: upgrade to 4.1.3

 .../{util-linux_2.26.1.bb => util-linux_2.26.2.bb} |  4 +-
 ...-in-extension-Makefile.am-when-removing-..patch | 56 --------------
 ...dd-DESTDIR-prefix-to-remaining-pkgextensi.patch | 86 ----------------------
 .../gawk/{gawk-4.1.1 => gawk-4.1.3}/run-ptest      |  0
 .../gawk/{gawk_4.1.1.bb => gawk_4.1.3.bb}          |  6 +-
 5 files changed, 4 insertions(+), 148 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux_2.26.1.bb => util-linux_2.26.2.bb} (86%)
 delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.1/Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch
 delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.1/extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch
 rename meta/recipes-extended/gawk/{gawk-4.1.1 => gawk-4.1.3}/run-ptest (100%)
 rename meta/recipes-extended/gawk/{gawk_4.1.1.bb => gawk_4.1.3.bb} (80%)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/2 util-linux: upgrade to 2.26.2

---
 .../util-linux/{util-linux_2.26.1.bb => util-linux_2.26.2.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux_2.26.1.bb => util-linux_2.26.2.bb} (86%)
meta/recipes-core/util-linux/util-linux_2.26.2.bb renamed from meta/recipes-core/util-linux/util-linux_2.26.1.bb +2 -2
similarity index 86%
rename from meta/recipes-core/util-linux/util-linux_2.26.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.26.2.bb
index 58bc90d..fc7dc6e 100644
@@ -15,8 +15,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://fix-parallel-build.patch \
             ${OLDHOST} \
 "
-SRC_URI[md5sum] = "2308850946766677f3fabe0685e85de8"
-SRC_URI[sha256sum] = "22dc1c957262e2cbdfb4d524a63d5cd4f219d3ac9b5eab570fc771076799bb6e"
+SRC_URI[md5sum] = "9bdf368c395f1b70325d0eb22c7f48fb"
+SRC_URI[sha256sum] = "0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666"
 
 CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
 
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/2 gawk: upgrade to 4.1.3

In reply to Chen Qi

The following two patches are removed because they have been merged in the new version.

Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch

---
 ...-in-extension-Makefile.am-when-removing-..patch | 56 --------------
 ...dd-DESTDIR-prefix-to-remaining-pkgextensi.patch | 86 ----------------------
 .../gawk/{gawk-4.1.1 => gawk-4.1.3}/run-ptest      |  0
 .../gawk/{gawk_4.1.1.bb => gawk_4.1.3.bb}          |  6 +-
 4 files changed, 2 insertions(+), 146 deletions(-)
 delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.1/Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch
 delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.1/extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch
 rename meta/recipes-extended/gawk/{gawk-4.1.1 => gawk-4.1.3}/run-ptest (100%)
 rename meta/recipes-extended/gawk/{gawk_4.1.1.bb => gawk_4.1.3.bb} (80%)
meta/recipes-extended/gawk/gawk-4.1.1/Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch deleted +0 -56
deleted file mode 100644
index b8b1fca..0000000
@@ -1,56 +0,0 @@
-From 976f73ab03569bb836aa5c949be1c1cc973b2d2e Mon Sep 17 00:00:00 2001
-From: "Arnold D. Robbins" <[email protected]>
-Date: Fri, 11 Apr 2014 07:42:16 +0300
-Subject: [PATCH] Use $(DESTDIR) in extension/Makefile.am when removing .la
- files.
-
-commit 976f73ab03569bb836aa5c949be1c1cc973b2d2e upstream.
-
-[PG: note there was no Author SOB or long log in original.]
-Upstream-Status: Backport [ gawk-4.1.1-3-g976f73ab0356 ]
-Signed-off-by: Paul Gortmaker <[email protected]>
----
-
-diff --git a/extension/ChangeLog b/extension/ChangeLog
-index afd64ff764b6..f3a1c7a81e7d 100644
---- a/extension/ChangeLog
-+++ b/extension/ChangeLog
-@@ -1,3 +1,9 @@
-+2014-04-11         Arnold D. Robbins     <[email protected]>
-+
-+	* Makefile.am (install-data-hook): Use $(DESTDIR) when removing
-+	the .la files. Thanks to Lars Wendler <[email protected]>
-+	for the report and fix.
-+
- 2014-04-08         Arnold D. Robbins     <[email protected]>
- 
- 	* 4.1.1: Release tar ball made.
-diff --git a/extension/Makefile.am b/extension/Makefile.am
-index 9c49bb81abb2..11826e2b315e 100644
---- a/extension/Makefile.am
-+++ b/extension/Makefile.am
-@@ -100,7 +100,7 @@ testext_la_LIBADD     = $(MY_LIBS)
- 
- install-data-hook:
- 	for i in $(pkgextension_LTLIBRARIES) ; do \
--		$(RM) $(pkgextensiondir)/$$i ; \
-+		$(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \
- 	done
- 
- # Keep the uninstall check working:
-diff --git a/extension/Makefile.in b/extension/Makefile.in
-index 040cdb8f4e23..d81b16960935 100644
---- a/extension/Makefile.in
-+++ b/extension/Makefile.in
-@@ -1231,7 +1231,7 @@ uninstall-man: uninstall-man3
- 
- install-data-hook:
- 	for i in $(pkgextension_LTLIBRARIES) ; do \
--		$(RM) $(pkgextensiondir)/$$i ; \
-+		$(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \
- 	done
- 
- # Keep the uninstall check working:
--- 
-1.9.1
-
meta/recipes-extended/gawk/gawk-4.1.1/extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch deleted +0 -86

86 lines not on this page · raw message

meta/recipes-extended/gawk/gawk-4.1.3/run-ptest renamed from meta/recipes-extended/gawk/gawk-4.1.1/run-ptest +0 -0
similarity index 100%
rename from meta/recipes-extended/gawk/gawk-4.1.1/run-ptest
rename to meta/recipes-extended/gawk/gawk-4.1.3/run-ptest
meta/recipes-extended/gawk/gawk_4.1.3.bb renamed from meta/recipes-extended/gawk/gawk_4.1.1.bb +2 -4
similarity index 80%
rename from meta/recipes-extended/gawk/gawk_4.1.1.bb
rename to meta/recipes-extended/gawk/gawk_4.1.3.bb
index 0a1811b..d1a88e4 100644
@@ -17,12 +17,10 @@ PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr"
 
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
            file://run-ptest \
-           file://Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch \
-           file://extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch \
 "
 
-SRC_URI[md5sum] = "45f5b09aa87b4744c4c53bf274e96ed0"
-SRC_URI[sha256sum] = "556464bd2e4bc5a0fad4526b59623e4be40b4c2f4c663dfaaf246af6e2ec1d62"
+SRC_URI[md5sum] = "55d37f4069502677f25d1340df8eec97"
+SRC_URI[sha256sum] = "524effa5b9ecd4ed940f2581c5d3c1df4e4bd7e6f768aa033c1916f47dfc6e29"
 
 inherit autotools gettext texinfo update-alternatives
 
Signature · 1 line
1.9.1