[meta-arm,v2] arm-bsp/edk2-firmware: fix destsuffix and PV for recursion error

Submitted by Khasim Mohammed on June 17, 2020, 8:17 a.m. | Patch ID: 173644

Details

Message ID 20200617081702.18172-1-khasim.mohammed@arm.com
State New
Headers show

Commit Message

Khasim Mohammed June 17, 2020, 8:17 a.m.
Use relative paths in destsuffix as the paths are relative
to ${WORKDIR} and turn the existing PV ?= into PV =

Change-Id: Ib9367a15dde611e5b74c11eeff330d0b5a3de75d
Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
---
 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
index c8fc70a..832b226 100644
--- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
+++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
@@ -1,6 +1,6 @@ 
 SRC_URI = "\
-    git://git.linaro.org/landing-teams/working/arm/edk2.git;name=edk2;destsuffix=${S}/edk2;nobranch=1 \
-    git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git;name=edk2-platforms;destsuffix=${S}/edk2/edk2-platforms;nobranch=1 \
+    git://git.linaro.org/landing-teams/working/arm/edk2.git;name=edk2;destsuffix=git/edk2;nobranch=1 \
+    git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git;name=edk2-platforms;destsuffix=git/edk2/edk2-platforms;nobranch=1 \
 "
 
 # TAGS and commit ID as per N1SDP-2020.03.26 release
@@ -16,4 +16,4 @@  EDK2_ARCH          = "AARCH64"
 
 COMPATIBLE_MACHINE = "n1sdp"
 
-PV ?= "201908+git${SRCPV}"
+PV = "201908+git${SRCPV}"

Comments

Ross Burton June 17, 2020, 1:11 p.m.
+1.

Ross

On Wed, 17 Jun 2020 at 09:17, Khasim Mohammed <khasim.mohammed@arm.com> wrote:
>
> Use relative paths in destsuffix as the paths are relative
> to ${WORKDIR} and turn the existing PV ?= into PV =
>
> Change-Id: Ib9367a15dde611e5b74c11eeff330d0b5a3de75d
> Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
> Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
> ---
>  meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
> index c8fc70a..832b226 100644
> --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
> +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
> @@ -1,6 +1,6 @@
>  SRC_URI = "\
> -    git://git.linaro.org/landing-teams/working/arm/edk2.git;name=edk2;destsuffix=${S}/edk2;nobranch=1 \
> -    git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git;name=edk2-platforms;destsuffix=${S}/edk2/edk2-platforms;nobranch=1 \
> +    git://git.linaro.org/landing-teams/working/arm/edk2.git;name=edk2;destsuffix=git/edk2;nobranch=1 \
> +    git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git;name=edk2-platforms;destsuffix=git/edk2/edk2-platforms;nobranch=1 \
>  "
>
>  # TAGS and commit ID as per N1SDP-2020.03.26 release
> @@ -16,4 +16,4 @@ EDK2_ARCH          = "AARCH64"
>
>  COMPATIBLE_MACHINE = "n1sdp"
>
> -PV ?= "201908+git${SRCPV}"
> +PV = "201908+git${SRCPV}"
> --
> 2.17.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#690): https://lists.yoctoproject.org/g/meta-arm/message/690
Mute This Topic: https://lists.yoctoproject.org/mt/74933537/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason June 18, 2020, 10:12 p.m.
On Wed, Jun 17, 2020 at 02:11:04PM +0100, Ross Burton wrote:
> +1.
> 
> Ross

You should probably add your "Reviewed-by" in the future. If you are
going to do the work, you should get some credit.  :)

Pulled in to master.

Thanks,
Jon

> 
> On Wed, 17 Jun 2020 at 09:17, Khasim Mohammed <khasim.mohammed@arm.com> wrote:
> >
> > Use relative paths in destsuffix as the paths are relative
> > to ${WORKDIR} and turn the existing PV ?= into PV =
> >
> > Change-Id: Ib9367a15dde611e5b74c11eeff330d0b5a3de75d
> > Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
> > Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
> > ---
> >  meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
> > index c8fc70a..832b226 100644
> > --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
> > +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
> > @@ -1,6 +1,6 @@
> >  SRC_URI = "\
> > -    git://git.linaro.org/landing-teams/working/arm/edk2.git;name=edk2;destsuffix=${S}/edk2;nobranch=1 \
> > -    git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git;name=edk2-platforms;destsuffix=${S}/edk2/edk2-platforms;nobranch=1 \
> > +    git://git.linaro.org/landing-teams/working/arm/edk2.git;name=edk2;destsuffix=git/edk2;nobranch=1 \
> > +    git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git;name=edk2-platforms;destsuffix=git/edk2/edk2-platforms;nobranch=1 \
> >  "
> >
> >  # TAGS and commit ID as per N1SDP-2020.03.26 release
> > @@ -16,4 +16,4 @@ EDK2_ARCH          = "AARCH64"
> >
> >  COMPATIBLE_MACHINE = "n1sdp"
> >
> > -PV ?= "201908+git${SRCPV}"
> > +PV = "201908+git${SRCPV}"
> > --
> > 2.17.1
> >
> > 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#708): https://lists.yoctoproject.org/g/meta-arm/message/708
Mute This Topic: https://lists.yoctoproject.org/mt/74933537/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-