Skip to contentSkip to conversation

One recipe, two gits with destsuffix, how to patch?

DISCUSSION Kalle Komierowski 2 participants 7 messages Jan 24, 2015 – May 19, 2015

lore
Share & tools
lore
#0 lore raw

Hi,

This is my first post to this list.

I'm working with the ti-compat-wireless recipe.
It contains two gits like this:

SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsuffix=wl18xx;name=wl18xx \
git://git.ti.com/wilink8-wlan/backports.git;branch=${BRANCH_backports};destsuffix=backports;name=backports \
file://wl18xx.patch \

Now I want to add the wl18xx.patch file, and this file ends up in the S and applying it fails since the git it should be applied to is under S/backports due to the destsuffix.

I tried to use the quilt and create new patches from the S but they fail to.

What would be the correct way of adding a patch so it applies to backports?

Thanks
BR
-Kalle Komierowski

#1 lore raw

Hi Kalle,

Quoted 9 lines · On Saturday 24 January 2015 08:34:56 Kalle Komierowski wrote:

I'm working with the ti-compat-wireless recipe.
It contains two gits like this:

SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsuffi x=wl18xx;name=wl18xx \
git://git.ti.com/wilink8-wlan/backports.git;branch=${BRANCH_backports};dest
suffix=backports;name=backports \ file://wl18xx.patch \

Quoted 7 lines

Now I want to add the wl18xx.patch file, and this file ends up in the S and applying it fails since the git it should be applied to is under S/backports due to the destsuffix.

I tried to use the quilt and create new patches from the S but they fail to.

What would be the correct way of adding a patch so it applies to backports?

You may find the patchdir option for the patch SRC_URI entry to be useful. I should imagine you'll want something like:
...
file://wl18xx.patch;patchdir=../backports
...

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#2 lore raw

Thanks Paul!

I was hoping it was as simple as that but I couldn't find info about it. Maybe if it was just called destsuffix like when it's used for gits.

BR
-Kalle Komierowski

Quoted 34 lines · Paul Eggleton

Hi Kalle,

Quoted 9 lines · On Saturday 24 January 2015 08:34:56 Kalle Komierowski wrote:

I'm working with the ti-compat-wireless recipe.
It contains two gits like this:

SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsuffi x=wl18xx;name=wl18xx \
git://git.ti.com/wilink8-wlan/backports.git;branch=${BRANCH_backports};dest
suffix=backports;name=backports \ file://wl18xx.patch \

Quoted 8 lines

Now I want to add the wl18xx.patch file, and this file ends up in the S and applying it fails since the git it should be applied to is under S/backports due to the destsuffix.

I tried to use the quilt and create new patches from the S but they fail to.

What would be the correct way of adding a patch so it applies to backports?

You may find the patchdir option for the patch SRC_URI entry to be useful. I should imagine you'll want something like:
...
file://wl18xx.patch;patchdir=../backports
...

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#3 lore raw
Quoted 33 lines · On Monday 26 January 2015 11:24:50 Kalle Komierowski wrote:
Quoted 22 lines · Paul Eggleton

Hi Kalle,

Quoted 19 lines · On Saturday 24 January 2015 08:34:56 Kalle Komierowski wrote:

I'm working with the ti-compat-wireless recipe.
It contains two gits like this:

SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsu ffi
x=wl18xx;name=wl18xx \
git://git.ti.com/wilink8-wlan/backports.git;branch=${BRANCH_backports};d
est
suffix=backports;name=backports \ file://wl18xx.patch \

Now I want to add the wl18xx.patch file, and this file ends up in the S and
applying it fails since the git it should be applied to is under S/backports due to the destsuffix.

I tried to use the quilt and create new patches from the S but they fail to.

Quoted 9 lines
Quoted 2 lines

What would be the correct way of adding a patch so it applies to backports?

You may find the patchdir option for the patch SRC_URI entry to be useful. I should imagine you'll want something like:
...
file://wl18xx.patch;patchdir=../backports
...

Quoted 4 lines

Thanks Paul!

I was hoping it was as simple as that but I couldn't find info about it. Maybe if it was just called destsuffix like when it's used for gits.

destsuffix and patchdir aren't quite the same though - destsuffix controls where the git repository is unpacked, whereas patchdir is the directory that the patch is applied in rather than where the patch file itself is written to.

(Oddly, as it happens, patchdir is in the documentation and destsuffix isn't - Scott, we'll have to take care of that.)

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#4 lore raw

Hi again,

I just modified my recipe with the patchdir.
SRC_URI = "
xxxxx.patch;patchdir=backports/

I can see that the patches are copied to the destination where I want them but for some reason they all fail when yocto tries to apply them. If I go manually to the destination git and type "git am xxxxx.patch" the all apply with no problem, I also tried to "patch -p1 < xxxxx.patch" and that worked to. Maybe I should play a bit with the striplevel? But I do think that yocto should be able to handle it from the point where I gave it the patchdir=..

BR
-Kalle Komierowski

Quoted 54 lines · Paul Eggleton
Quoted 33 lines · On Monday 26 January 2015 11:24:50 Kalle Komierowski wrote:
Quoted 22 lines · On January 26, 2015, Paul Eggleton <<[email protected]>> wrote:

Hi Kalle,

Quoted 19 lines · On Saturday 24 January 2015 08:34:56 Kalle Komierowski wrote:

I'm working with the ti-compat-wireless recipe.
It contains two gits like this:

SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx.git;branch=${BRANCH_wl18xx};destsu ffi
x=wl18xx;name=wl18xx \
git://git.ti.com/wilink8-wlan/backports.git;branch=${BRANCH_backports};d
est
suffix=backports;name=backports \ file://wl18xx.patch \

Now I want to add the wl18xx.patch file, and this file ends up in the S and
applying it fails since the git it should be applied to is under S/backports due to the destsuffix.

I tried to use the quilt and create new patches from the S but they fail to.

Quoted 10 lines
Quoted 3 lines

What would be the correct way of adding a patch so it applies to backports?

You may find the patchdir option for the patch SRC_URI entry to be useful. I should imagine you'll want something like:
...
file://wl18xx.patch;patchdir=../backports
...

Quoted 5 lines

Thanks Paul!

I was hoping it was as simple as that but I couldn't find info about it. Maybe if it was just called destsuffix like when it's used for gits.

destsuffix and patchdir aren't quite the same though - destsuffix controls where the git repository is unpacked, whereas patchdir is the directory that the patch is applied in rather than where the patch file itself is written to.

(Oddly, as it happens, patchdir is in the documentation and destsuffix isn't - Scott, we'll have to take care of that.)

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#5 lore raw
Quoted 11 lines · On Tuesday 27 January 2015 10:29:12 Kalle Komierowski wrote:

I just modified my recipe with the patchdir.
SRC_URI = "
xxxxx.patch;patchdir=backports/

I can see that the patches are copied to the destination where I want them but for some reason they all fail when yocto tries to apply them. If I go manually to the destination git and type "git am xxxxx.patch" the all apply with no problem, I also tried to "patch -p1 < xxxxx.patch" and that worked to. Maybe I should play a bit with the striplevel? But I do think that yocto should be able to handle it from the point where I gave it the patchdir=..

The default striplevel is 1. If the patch is formatted typically, suspect this means that you'd need patchdir to be set to ../backports - does that not work?

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
author
#6 lore raw

Hi Paul,

Sorry for the late, or veeery late reply, but your suggestion here seems to do the work.

Thanks for the help!

BR
Kalle

Quoted 18 lines · Paul Eggleton
Quoted 11 lines · On Tuesday 27 January 2015 10:29:12 Kalle Komierowski wrote:

I just modified my recipe with the patchdir.
SRC_URI = "
xxxxx.patch;patchdir=backports/

I can see that the patches are copied to the destination where I want them but for some reason they all fail when yocto tries to apply them. If I go manually to the destination git and type "git am xxxxx.patch" the all apply with no problem, I also tried to "patch -p1 < xxxxx.patch" and that worked to. Maybe I should play a bit with the striplevel? But I do think that yocto should be able to handle it from the point where I gave it the patchdir=..

The default striplevel is 1. If the patch is formatted typically, suspect this means that you'd need patchdir to be set to ../backports - does that not work?

Cheers,
Paul