[PATCH 0/3] meta: 3 fixes

[PATCH 0/3] meta: 3 fixes

[Robert Yang]

The following changes since commit f0189829498e30231d826c9f55aad73e622d076e:

  qemu: Update to upstream patches (2015-09-14 11:22:02 +0100)

are available in the git repository at:

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

Robert Yang (3):
  subversion: 1.8.13 -> 1.8.14 since 1.8.13.tar.gz was gone
  nspr: fix SRC_URI
  mkelfimage: fix owner for /usr/sbin/mkelfImage

 meta/recipes-devtools/mkelfimage/mkelfimage_git.bb |    1 +
 .../disable_macos.patch                            |    0
 .../libtool2.patch                                 |    0
 ...erf.m4-Regex-modified-to-allow-D-in-paths.patch |    0
 .../{subversion_1.8.13.bb => subversion_1.8.14.bb} |    4 ++--
 meta/recipes-support/nspr/nspr_4.10.8.bb           |    2 +-
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/disable_macos.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/libtool2.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/serf.m4-Regex-modified-to-allow-D-in-paths.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion_1.8.13.bb => subversion_1.8.14.bb} (96%)

-- 
1.7.9.5

[PATCH 1/3] subversion: 1.8.13 -> 1.8.14 since 1.8.13.tar.gz was gone

[Robert Yang]

The subversion-1.8.13.tar.bz2 is gone from ftp, so upgrade to 1.8.14.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../disable_macos.patch                            |    0
 .../libtool2.patch                                 |    0
 ...erf.m4-Regex-modified-to-allow-D-in-paths.patch |    0
 .../{subversion_1.8.13.bb => subversion_1.8.14.bb} |    4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/disable_macos.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/libtool2.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion-1.8.13 => subversion}/serf.m4-Regex-modified-to-allow-D-in-paths.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion_1.8.13.bb => subversion_1.8.14.bb} (96%)

diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch b/meta/recipes-devtools/subversion/subversion/disable_macos.patch
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch
rename to meta/recipes-devtools/subversion/subversion/disable_macos.patch
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch b/meta/recipes-devtools/subversion/subversion/libtool2.patch
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch
rename to meta/recipes-devtools/subversion/subversion/libtool2.patch
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch b/meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
rename to meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch
diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb b/meta/recipes-devtools/subversion/subversion_1.8.14.bb
similarity index 96%
rename from meta/recipes-devtools/subversion/subversion_1.8.13.bb
rename to meta/recipes-devtools/subversion/subversion_1.8.14.bb
index f843b95..115ae16 100644
--- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.8.14.bb
@@ -14,8 +14,8 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://disable_macos.patch \
            file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \
 "
-SRC_URI[md5sum] = "4413417b529d7bdf82f74e50df02e88b"
-SRC_URI[sha256sum] = "1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579"
+SRC_URI[md5sum] = "fe476ba26d6835eba4393780ea907361"
+SRC_URI[sha256sum] = "7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1c2f0119e478700b5428e26386cff923"
 
-- 
1.7.9.5

[PATCH 2/3] nspr: fix SRC_URI

[Robert Yang]

Fixed:
WARNING: Failed to fetch URL ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.8/src/nspr-4.10.8.tar.gz, attempting MIRRORS if available

Its ftp:// doesn't work with wget, but http:// works.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/nspr/nspr_4.10.8.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/nspr/nspr_4.10.8.bb b/meta/recipes-support/nspr/nspr_4.10.8.bb
index 944994e..bc60018 100644
--- a/meta/recipes-support/nspr/nspr_4.10.8.bb
+++ b/meta/recipes-support/nspr/nspr_4.10.8.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d
                     file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99"
 SECTION = "libs/network"
 
-SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
+SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
            file://remove-rpath-from-tests.patch \
            file://fix-build-on-x86_64.patch \
            file://remove-srcdir-from-configure-in.patch \
-- 
1.7.9.5

[PATCH 3/3] mkelfimage: fix owner for /usr/sbin/mkelfImage

[Robert Yang]

Fixed:
packages-split/mkelfimage/usr/sbin/mkelfImage is owned by uid 15220, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

This is because its Makefile uses cp -a to install mkelfImage.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/mkelfimage/mkelfimage_git.bb |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
index 2845b8c..e1c33a6 100644
--- a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
+++ b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
@@ -30,6 +30,7 @@ inherit autotools-brokensep
 do_install_append() {
 	rmdir ${D}${datadir}/mkelfImage/elf32-i386
 	rmdir ${D}${datadir}/mkelfImage
+	chown root:root ${D}/${sbindir}/mkelfImage
 }
 
 BBCLASSEXTEND = "native"
-- 
1.7.9.5

Re: [PATCH 1/3] subversion: 1.8.13 -> 1.8.14 since 1.8.13.tar.gz was gone

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

On 16 September 2015 at 08:52, Robert Yang <liezhi.yang@windriver.com>
wrote:

> The subversion-1.8.13.tar.bz2 is gone from ftp, so upgrade to 1.8.14.
>

The FTP server only contains the latest release for each release series so
if they release a 1.8.15 the day after we ship Jethro we'd need to upgrade
subversion again.

The subversion archive is at http://archive.apache.org/dist/subversion/ and
includes all historical releases.  The recipe should use this URL instead.

Ross

[-- Attachment #2: Type: text/html, Size: 1085 bytes --]

Re: [PATCH 1/3] subversion: 1.8.13 -> 1.8.14 since 1.8.13.tar.gz was gone

[Robert Yang]

On 09/16/2015 09:16 PM, Burton, Ross wrote:
>
> On 16 September 2015 at 08:52, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     The subversion-1.8.13.tar.bz2 is gone from ftp, so upgrade to 1.8.14.
>
>
> The FTP server only contains the latest release for each release series so if
> they release a 1.8.15 the day after we ship Jethro we'd need to upgrade
> subversion again.
>
> The subversion archive is at http://archive.apache.org/dist/subversion/ and
> includes all historical releases.  The recipe should use this URL instead.

Thanks, I updated it in the repo:

   git://git.openembedded.org/openembedded-core-contrib rbt/3fixes

commit 967c17d861ce2b9835e3ab12d5b172b059291dd7
Author: Robert Yang <liezhi.yang@windriver.com>
Date:   Wed Sep 16 07:05:47 2015 -0700

     subversion: fix SRC_URI

     Fixed:
     WARNING: Failed to fetch URL 
http://www.apache.org/dist/subversion/subversion-1.8.13.tar.bz2, attempting 
MIRRORS if available

     Ross:
     The FTP server only contains the latest release for each release series,
     the subversion archive is at http://archive.apache.org/dist/subversion/
     and includes all historical releases. The recipe should use this URL
     instead.

     Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb 
b/meta/recipes-devtools/subversion/subversion_1.8.13.bb
index f843b95..eb1f0f2 100644
--- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.8.13.bb
@@ -9,7 +9,7 @@ BBCLASSEXTEND = "native"

  inherit gettext pythonnative

-SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
+SRC_URI = "http://archive.apache.org/dist/${BPN}/${BP}.tar.bz2 \
             file://libtool2.patch \
             file://disable_macos.patch \
             file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \

// Robert

>
> Ross

Re: [PATCH 1/3] subversion: 1.8.13 -> 1.8.14 since 1.8.13.tar.gz was gone

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

On 16 September 2015 at 15:12, Robert Yang <liezhi.yang@windriver.com>
wrote:

> -SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
> +SRC_URI = "http://archive.apache.org/dist/${BPN}/${BP}.tar.bz2 \
>

Looking at http://www.apache.org/dist/apr/ ($APACHE_MIRROR/apr) it appears
that this latest-release-only applies to every project they release, so we
should change APACHE_MIRROR instead of just the subversion recipe.

Ross

[-- Attachment #2: Type: text/html, Size: 1074 bytes --]