[yocto] [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Move patch in inc file

[Gary Thomas]

On 2013-11-13 08:54, Philipp Wagner wrote:
> Am 13.11.2013 16:47, schrieb Andrei Gherzan:
>> In order to avoid duplicated code, move sl030raspberrypii2ckernel.patch
>> in linux-raspberrypi.inc.
>
> I'm not convinced this is a good idea. Maybe it's the case for this patch, but most patches probably don't apply for all kernel versions the same. Hopefully this patch goes
> upstream at some point (what's the status of that anyway), and then it's not needed any more.

I agree - putting patches in .inc is probably going to just cause problems later on.

>>
>> Change-Id: I8c3e7a70224672a8def6518baecd4ef86bbb15c4
>> Signed-off-by: Andrei Gherzan <andrei at gherzan.ro>
>> ---
>>   recipes-kernel/linux/linux-raspberrypi.inc       | 2 ++
>>   recipes-kernel/linux/linux-raspberrypi_3.11.0.bb | 4 +---
>>   recipes-kernel/linux/linux-raspberrypi_3.2.27.bb | 4 +---
>>   recipes-kernel/linux/linux-raspberrypi_3.6.11.bb | 4 +---
>>   recipes-kernel/linux/linux-raspberrypi_3.8.13.bb | 4 +---
>>   5 files changed, 6 insertions(+), 12 deletions(-)
>>
>> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
>> index e756b57..3397bcb 100644
>> --- a/recipes-kernel/linux/linux-raspberrypi.inc
>> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
>> @@ -11,6 +11,8 @@ PV_append = "+git${SRCREV}"
>>
>>   S = "${WORKDIR}/git"
>>
>> +SRC_URI += "file://sl030raspberrypii2ckernel.patch"
>> +
>>   # NOTE: For now we pull in the default config from the RPi kernel GIT tree.
>>   KERNEL_DEFCONFIG = "bcmrpi_defconfig"
>>
>> diff --git a/recipes-kernel/linux/linux-raspberrypi_3.11.0.bb b/recipes-kernel/linux/linux-raspberrypi_3.11.0.bb
>> index 1ae39b2..b197289 100644
>> --- a/recipes-kernel/linux/linux-raspberrypi_3.11.0.bb
>> +++ b/recipes-kernel/linux/linux-raspberrypi_3.11.0.bb
>> @@ -1,6 +1,4 @@
>>   SRCREV = "d7474694bdc9836af17f4b4d839509f9aad7ffa7"
>> -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \
>> -           file://sl030raspberrypii2ckernel.patch \
>> -          "
>> +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y"
>>
>>   require linux-raspberrypi.inc
>> diff --git a/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb b/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb
>> index cc4ee38..7c593a8 100644
>> --- a/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb
>> +++ b/recipes-kernel/linux/linux-raspberrypi_3.2.27.bb
>> @@ -1,6 +1,4 @@
>>   SRCREV = "ada8b4415ff44d535d63e4291a0eca733bc2ad0f"
>> -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27 \
>> -           file://sl030raspberrypii2ckernel.patch \
>> -          "
>> +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.2.27"
>>
>>   require linux-raspberrypi.inc
>> diff --git a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb b/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
>> index 5314f5d..5f173f9 100644
>> --- a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
>> +++ b/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
>> @@ -1,6 +1,4 @@
>>   SRCREV = "cbd6672e7e1b2dc5026f5dc7929a13a9a68f2a62"
>> -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \
>> -           file://sl030raspberrypii2ckernel.patch \
>> -          "
>> +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y"
>>
>>   require linux-raspberrypi.inc
>> diff --git a/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb b/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb
>> index dc8cf0a..613c172 100644
>> --- a/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb
>> +++ b/recipes-kernel/linux/linux-raspberrypi_3.8.13.bb
>> @@ -1,6 +1,4 @@
>>   SRCREV = "d996a1b91b2bf3dc06f4f4f822a56f4496457aa1"
>> -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y \
>> -           file://sl030raspberrypii2ckernel.patch \
>> -          "
>> +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.8.y"
>>
>>   require linux-raspberrypi.inc
>>
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------