Skip to contentSkip to conversation

upgrade 4 recipes

PATCH In review Robert Yang 2 participants 7 messages Mar 20, 2014 – Mar 21, 2014

lore
Share & tools
lore
#0 lore raw

cover upgrade 4 recipes

Hi Saul and RP:

I've test these upgrade on my local AB, they worke well.

// Robert

The following changes since commit ef196434620522affc11b5b1b867386b5d14a4c3:

alsa-tools: fix build when x11 and gtk+ not available (2014-03-19 14:41:55 +0000)

are available in the git repository at:

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

Robert Yang (4):
file: upgrade from 5.16 to 5.17
wget: upgrade from 1.14 to 1.15
automake: upgrade from 1.14 to 1.14.1
mklibs-native: upgrade from 0.1.38 to 0.1.39

 .../{automake_1.14.bb => automake_1.14.1.bb}       |  4 +-
 .../file/{file_5.16.bb => file_5.17.bb}            |  4 +-
 ...bs-native_0.1.38.bb => mklibs-native_0.1.39.bb} |  8 +--
 meta/recipes-extended/wget/wget-1.14/fix_doc.patch | 71 ----------------------
 meta/recipes-extended/wget/wget.inc                |  1 +
 .../wget/{wget-1.14 => wget}/fix_makefile.patch    |  0
 meta/recipes-extended/wget/wget_1.14.bb            | 10 ---
 meta/recipes-extended/wget/wget_1.15.bb            |  7 +++
 8 files changed, 16 insertions(+), 89 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.14.bb => automake_1.14.1.bb} (89%)
 rename meta/recipes-devtools/file/{file_5.16.bb => file_5.17.bb} (86%)
 rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.38.bb => mklibs-native_0.1.39.bb} (73%)
 delete mode 100644 meta/recipes-extended/wget/wget-1.14/fix_doc.patch
 rename meta/recipes-extended/wget/{wget-1.14 => wget}/fix_makefile.patch (100%)
 delete mode 100644 meta/recipes-extended/wget/wget_1.14.bb
 create mode 100644 meta/recipes-extended/wget/wget_1.15.bb
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/4 file: upgrade from 5.16 to 5.17

---
 meta/recipes-devtools/file/{file_5.16.bb => file_5.17.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/file/{file_5.16.bb => file_5.17.bb} (86%)
meta/recipes-devtools/file/file_5.17.bb renamed from meta/recipes-devtools/file/file_5.16.bb +2 -2
similarity index 86%
rename from meta/recipes-devtools/file/file_5.16.bb
rename to meta/recipes-devtools/file/file_5.17.bb
index 46dbf88..4ed0820 100644
@@ -15,8 +15,8 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
            file://dump \
            file://filesystems"
 
-SRC_URI[md5sum] = "359c0cf41c3d438d17b4d293f3b950dc"
-SRC_URI[sha256sum] = "48bcac7726c37a8a0bc7ffa16b58993575657dd7b382039380fb3b74ab389261"
+SRC_URI[md5sum] = "e19c47e069ced7b01ccb4db402cc01d3"
+SRC_URI[sha256sum] = "3feb97141b387b64da30aee485852925312c0e74219380a5ed451f14a90c83ca"
 
 inherit autotools
 
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/4 wget: upgrade from 1.14 to 1.15

In reply to Robert Yang

* Removed:
- fix_doc.patch (backport)
* Add the HOMEPAGE.

---
 meta/recipes-extended/wget/wget-1.14/fix_doc.patch | 71 ----------------------
 meta/recipes-extended/wget/wget.inc                |  1 +
 .../wget/{wget-1.14 => wget}/fix_makefile.patch    |  0
 meta/recipes-extended/wget/wget_1.14.bb            | 10 ---
 meta/recipes-extended/wget/wget_1.15.bb            |  7 +++
 5 files changed, 8 insertions(+), 81 deletions(-)
 delete mode 100644 meta/recipes-extended/wget/wget-1.14/fix_doc.patch
 rename meta/recipes-extended/wget/{wget-1.14 => wget}/fix_makefile.patch (100%)
 delete mode 100644 meta/recipes-extended/wget/wget_1.14.bb
 create mode 100644 meta/recipes-extended/wget/wget_1.15.bb
meta/recipes-extended/wget/wget-1.14/fix_doc.patch deleted +0 -71
deleted file mode 100644
index 91a5ff7..0000000
@@ -1,71 +0,0 @@
-Fix documentation build errors with Texinfo 5 and Perl 5.18
-
-wget.pod around line 2105: Expected text after =item, not a number
-wget.pod around line 2110: Expected text after =item, not a number
-wget.pod around line 2116: Expected text after =item, not a number
-wget.pod around line 2121: Expected text after =item, not a number
-wget.pod around line 2126: Expected text after =item, not a number
-wget.pod around line 2131: Expected text after =item, not a number
-wget.pod around line 2136: Expected text after =item, not a number
-wget.pod around line 2141: Expected text after =item, not a number
-wget.texi:879: @itemx must follow @item
-wget.texi:980: @itemx must follow @item
-wget.texi:3097: @itemx must follow @item
-wget.texi:3608: warning: @itemx should not begin @table
-
-Upstream-Status: Backport
-Signed-off-by: Jonathan Liu <[email protected]>
-
-diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
-index 86c4b18..9db6de1 100755
---- a/doc/texi2pod.pl
-+++ b/doc/texi2pod.pl
-@@ -291,7 +291,7 @@ while(<$inf>) {
- 	if (defined $1) {
-             my $thing = $1;
-             if ($ic =~ /\@asis/) {
--                $_ = "\n=item $thing\n";
-+                $_ = "\n=item C<$thing>\n";
-             } else {
-                 # Entity escapes prevent munging by the <> processing below.
-                 $_ = "\n=item $ic\&LT;$thing\&GT;\n";
-diff --git a/doc/wget.texi b/doc/wget.texi
-index 7efdc72..2b045fd 100644
---- a/doc/wget.texi
-+++ b/doc/wget.texi
-@@ -876,7 +876,7 @@ recommendation to block many unrelated users from a web site due to the
- actions of one.
- 
- @cindex proxy
--@itemx --no-proxy
-+@item --no-proxy
- Don't use proxies, even if the appropriate @code{*_proxy} environment
- variable is defined.
- 
-@@ -977,7 +977,7 @@ are outside the range of @sc{ascii} characters (that is, greater than
- whose encoding does not match the one used locally.
- 
- @cindex IPv6
--@itemx -4
-+@item -4
- @itemx --inet4-only
- @itemx -6
- @itemx --inet6-only
-@@ -3094,7 +3094,7 @@ display properly---the same as @samp{-p}.
- Change setting of passive @sc{ftp}, equivalent to the
- @samp{--passive-ftp} option.
- 
--@itemx password = @var{string}
-+@item password = @var{string}
- Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. 
- This command can be overridden using the @samp{ftp_password} and 
- @samp{http_password} command for @sc{ftp} and @sc{http} respectively.
-@@ -3605,7 +3605,7 @@ In addition to the environment variables, proxy location and settings
- may be specified from within Wget itself.
- 
- @table @samp
--@itemx --no-proxy
-+@item --no-proxy
- @itemx proxy = on/off
- This option and the corresponding command may be used to suppress the
- use of proxy, even if the appropriate environment variables are set.
meta/recipes-extended/wget/wget.inc +1 -0
index 22d8e54..4eeef70 100644
@@ -1,4 +1,5 @@
 SUMMARY = "Console URL download utility supporting HTTP, FTP, etc"
+HOMEPAGE = "https://www.gnu.org/software/wget/"
 SECTION = "console/network"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
meta/recipes-extended/wget/wget/fix_makefile.patch renamed from meta/recipes-extended/wget/wget-1.14/fix_makefile.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/wget/wget-1.14/fix_makefile.patch
rename to meta/recipes-extended/wget/wget/fix_makefile.patch
meta/recipes-extended/wget/wget_1.14.bb deleted +0 -10
deleted file mode 100644
index b12c147..0000000
@@ -1,10 +0,0 @@
-PR = "${INC_PR}.0"
-
-SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
-           file://fix_makefile.patch \
-           file://fix_doc.patch \
-          "
-SRC_URI[md5sum] = "12edc291dba8127f2e9696e69f36299e"
-SRC_URI[sha256sum] = "f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269"
-
-require wget.inc
meta/recipes-extended/wget/wget_1.15.bb new file +7 -0
new file mode 100644
index 0000000..c2fcca7
@@ -0,0 +1,7 @@
+SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
+           file://fix_makefile.patch \
+          "
+SRC_URI[md5sum] = "506df41295afc6486662cc47470b4618"
+SRC_URI[sha256sum] = "52126be8cf1bddd7536886e74c053ad7d0ed2aa89b4b630f76785bac21695fcd"
+
+require wget.inc
Signature · 1 line
1.8.3.1
#3 lore raw

PATCH 3/4 automake: upgrade from 1.14 to 1.14.1

In reply to Robert Yang
---
 .../automake/{automake_1.14.bb => automake_1.14.1.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.14.bb => automake_1.14.1.bb} (89%)
meta/recipes-devtools/automake/automake_1.14.1.bb renamed from meta/recipes-devtools/automake/automake_1.14.bb +2 -2
similarity index 89%
rename from meta/recipes-devtools/automake/automake_1.14.bb
rename to meta/recipes-devtools/automake/automake_1.14.1.bb
index de6fcfa..be73d19 100644
@@ -22,8 +22,8 @@ SRC_URI += " file://python-libdir.patch \
             file://py-compile-compile-only-optimized-byte-code.patch \
             file://buildtest.patch"
 
-SRC_URI[md5sum] = "a3c0d9298c6112f5f2c26c639ccaaed7"
-SRC_URI[sha256sum] = "7847424d4204d1627c129e9c15b81e145836afa2a1bf9003ffe10aa26ea75755"
+SRC_URI[md5sum] = "d052a3e884631b9c7892f2efce542d75"
+SRC_URI[sha256sum] = "814c2333f350ce00034a1fe718e0e4239998ceea7b0aff67e9fd273ed6dfc23b"
 
 do_install_append () {
     install -d ${D}${datadir}
Signature · 1 line
1.8.3.1
#4 lore raw

PATCH 4/4 mklibs-native: upgrade from 0.1.38 to 0.1.39

In reply to Robert Yang

* Fix the HOMEPAGE
* Fix the SRC_URI, .tar.gz has gone, only .tar.xz now.

---
 .../mklibs/{mklibs-native_0.1.38.bb => mklibs-native_0.1.39.bb}   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.38.bb => mklibs-native_0.1.39.bb} (73%)
meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb renamed from meta/recipes-devtools/mklibs/mklibs-native_0.1.38.bb +4 -4
similarity index 73%
rename from meta/recipes-devtools/mklibs/mklibs-native_0.1.38.bb
rename to meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb
index fd04c97..ff8d500 100644
@@ -1,18 +1,18 @@
 SUMMARY = "Shared library optimisation tool"
 DESCRIPTION = "mklibs produces cut-down shared libraries that contain only the routines required by a particular set of executables."
-HOMEPAGE = "https://code.launchpad.net/mklibs"
+HOMEPAGE = "https://launchpad.net/mklibs"
 SECTION = "devel"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=98d31037b13d896e33890738ef01af64"
 DEPENDS = "python-native dpkg-native"
 
-SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.gz \
+SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.xz \
 	file://ac_init_fix.patch\
 	file://fix_STT_GNU_IFUNC.patch\
 "
 
-SRC_URI[md5sum] = "e597b01548204874feef396403615d9f"
-SRC_URI[sha256sum] = "e7fe79db2673bb26c98c63fd8b40dcb44b9b94c4bc52a8c4c8112a5cbaf29bf4"
+SRC_URI[md5sum] = "38a579a531401eb76f4bab4ccfb774a2"
+SRC_URI[sha256sum] = "fa2881ab4fe72b0504878357f1fc6b17920459b56e8a60dfb083ca28fb64e733"
 
 inherit autotools gettext native pythonnative
 
Signature · 1 line
1.8.3.1
#5 lore raw
In reply to Robert Yang
Quoted 1 line · Robert Yang

I've test these upgrade on my local AB, they worke well.

We're past feature freeze so these need to wait until 1.7 unless there is some pressing reason to include them?

Cheers,

Richard

#6 lore raw
Quoted 6 lines · Richard Purdie
Quoted 1 line · Robert Yang

I've test these upgrade on my local AB, they worke well.

We're past feature freeze so these need to wait until 1.7 unless there is some pressing reason to include them?

No, there is no reason, I will re-send in 1.7.

// Robert

Quoted 6 lines

Cheers,

Richard