[oe,PATCHv2,for-dora] php: update SRC_URI for new download location

Message ID 1391086167-31517-1-git-send-email-chase.maupin@ti.com
State Accepted
Commit dcf37be559313c63c7d87d6106cc206f664abbbb
Headers show

Commit Message

Chase Maupin Jan. 30, 2014, 12:49 p.m.
* The old downloads location of http://www.php.net/distributions
  now points to a listing of all distributions and the mirrors or
  download locations where the sources can be downloaded.
* The new download location is http://museum.php.net/..... where
  the rest of the URL is based on the major version on PHP being
  downloaded.  This is a change from the previous download server
  which had a flattened directory structure so that all versions
  were available in a single location.
* To account for this change in the directory structure a variable
  called PHP_MAJVER is used based off of the PV to point the
  SRC_URI to the proper subdirectory.
* This issue wsa first noted by Joshua Vanderpool at
  Joshua.Vanderpool@raymondcorp.com and there was discussion at
  http://lists.openembedded.org/pipermail/openembedded-devel/2014-January/093757.html
* This patch has been commited to that master branch

Signed-off-by: Chase Maupin <chase.maupin@ti.com>
---
* Updated in version 2
    * Remove the bump of INC_PR as per suggestion of
      Koen Kooi [koen@dominion.thruhere.net]
---
 meta-oe/recipes-devtools/php/php.inc |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Dorairaj, Sanjay Jan. 30, 2014, 1:35 p.m. | #1
Hi All,

We are getting build error when using populate_sdk for our RDK builds. Has
anyone seen this? 

For generating sdk we use  "bitbake -c populate_sdk rdk-generic-image"
command ,  we are getting below error:

===========================================================================
==========================
NOTE: Applying patch 'relocatable_sdk.patch'
(../meta-linaro/meta-linaro/recipes-devtools/qemu/files/relocatable_sdk.pat
ch)
ERROR: Command Error: exit status: 1  Output:
Applying patch relocatable_sdk.patch
can't find file to patch at input line 13
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Upstream-Status: Inappropriate [SDK specific]
|
|In order to be able to change the dynamic loader path when relocating
|binaries, the interp section has to be made big enough to accomodate
|the new path (4096 is the maximum path length in Linux).
|
|Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
|
|Index: qemu-1.4.0/ldscripts/i386.ld
|===================================================================
|--- qemu-1.4.0.orig/ldscripts/i386.ld  2013-02-15 15:05:35.000000000 -0800
|+++ qemu-1.4.0/ldscripts/i386.ld       2013-02-28 22:55:36.138816418 -0800
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: qemu-1.4.0/ldscripts/x86_64.ld
|===================================================================
|--- qemu-1.4.0.orig/ldscripts/x86_64.ld        2013-02-15
15:05:35.000000000 -0800
|+++ qemu-1.4.0/ldscripts/x86_64.ld     2013-02-28 22:55:36.138816418 -0800
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
Patch relocatable_sdk.patch does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch
ERROR: Logfile of failure stored in:
/home/ridish/RDK-RI-NICO-2/build-qemux86/tmp/work/i686-nativesdk-rdksdk-lin
ux/nativesdk-qemu/1.6.0+gitAUTOINC+0169c51155-r2/temp/log.do_patch.15188
ERROR: Task 1574 
(virtual:nativesdk:/home/ridish/RDK-RI-NICO-2/meta-linaro/meta-linaro/recip
es-devtools/qemu/qemu_git.bb, do_patch) failed with exit code '1'


Regards,


Sanjay


>
Nicolas Dechesne Jan. 30, 2014, 9:07 p.m. | #2
hi,

On Thu, Jan 30, 2014 at 10:52 AM, Ridish RA <Ridish.RA@lntinfotech.com> wrote:
> I think I got the root cause of the issue, meta-linaro that we have depends on openembedded-core dylan-qt5.1, but Nicolas recently updated
> openembedded-core to dora. And I think this is the root cause of the issue of the relocatable patch being not able to apply?
>
> So do we have meta-linaro layer based openembedded-core dora?
>

yes, the problem is a misalignment between oe-core and meta-linaro.
meta-linaro is using a recent qemu upstream commit, and the list of
patches from oe-core no longer works with meta-linaro qemu_git recipe.
the 2 commits in upstream qemu responsible for the misalignment are:

53db78543e473bdf7650a406767d0901c6e26480
964c6fa16f50a607f9da5068d6bf15ccc93872c0

I am cc'ing riku and koen since that needs fixing in meta-linaro
(nativesdk-qemu does not build).

for now, it's safe to follow Khem's suggestion and use the OE-core qemu.

Patch

diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 5345f2a..d5e53c0 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -9,7 +9,11 @@  DEPENDS_virtclass-native = "zlib-native libxml2-native"
 
 INC_PR = "r5"
 
-SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
+# The new PHP downloads server groups PHP releases by major version so find
+# the major version of the PHP recipe.
+PHP_MAJVER = "${@d.getVar('PV',1).split('.')[0]}"
+
+SRC_URI = "http://museum.php.net/php${PHP_MAJVER}/php-${PV}.tar.bz2"
 
 S = "${WORKDIR}/php-${PV}"