diff mbox series

[meta-ti,master/scarthgap,v2] linux: Manage the kernel patches using the BSP system

Message ID 20240719151018.8521-1-reatmon@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,master/scarthgap,v2] linux: Manage the kernel patches using the BSP system | expand

Commit Message

Ryan Eatmon July 19, 2024, 3:10 p.m. UTC
Applying the patches to all kernels is not going to work.  Each kernel
might need different patches to address reproducibility issues.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
v2: Fix BSP tag for bsp-ti-6_6

 meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Comments

Denys Dmytriyenko July 24, 2024, 9:35 p.m. UTC | #1
On Fri, Jul 19, 2024 at 10:10:18AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> Applying the patches to all kernels is not going to work.  Each kernel
> might need different patches to address reproducibility issues.

Can you also backport this to scarthgap, as these patches fon't apply cleanly 
to bb.org and currently break Beagle builds. Thanks.


> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
> v2: Fix BSP tag for bsp-ti-6_6
> 
>  meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
> index f24fbe51..1831ba66 100644
> --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
> +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
> @@ -13,8 +13,12 @@ EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}"
>  KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
>  KERNEL_DTBVENDORED = "1"
>  
> -SRC_URI:append = " \
> -file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
> -file://0001-vt-conmakehash-improve-reproducibility.patch \
> -file://0001-pnmtologo-use-relocatable-file-name.patch \
> +KERNEL_PATCHES = ""
> +
> +KERNEL_PATCHES:bsp-ti-6_6 = " \
> +    file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
> +    file://0001-vt-conmakehash-improve-reproducibility.patch \
> +    file://0001-pnmtologo-use-relocatable-file-name.patch \
>  "
> +
> +SRC_URI:append = " ${KERNEL_PATCHES} "
> -- 
> 2.17.1
Ryan Eatmon July 25, 2024, 1:18 a.m. UTC | #2
On 7/24/2024 4:35 PM, Denys Dmytriyenko wrote:
> On Fri, Jul 19, 2024 at 10:10:18AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>> Applying the patches to all kernels is not going to work.  Each kernel
>> might need different patches to address reproducibility issues.
> 
> Can you also backport this to scarthgap, as these patches fon't apply cleanly
> to bb.org and currently break Beagle builds. Thanks.

It is staged in next waiting for a CICD run.


> 
>> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>> ---
>> v2: Fix BSP tag for bsp-ti-6_6
>>
>>   meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc | 12 ++++++++----
>>   1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
>> index f24fbe51..1831ba66 100644
>> --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
>> +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
>> @@ -13,8 +13,12 @@ EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}"
>>   KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
>>   KERNEL_DTBVENDORED = "1"
>>   
>> -SRC_URI:append = " \
>> -file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
>> -file://0001-vt-conmakehash-improve-reproducibility.patch \
>> -file://0001-pnmtologo-use-relocatable-file-name.patch \
>> +KERNEL_PATCHES = ""
>> +
>> +KERNEL_PATCHES:bsp-ti-6_6 = " \
>> +    file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
>> +    file://0001-vt-conmakehash-improve-reproducibility.patch \
>> +    file://0001-pnmtologo-use-relocatable-file-name.patch \
>>   "
>> +
>> +SRC_URI:append = " ${KERNEL_PATCHES} "
>> -- 
>> 2.17.1
Ryan Eatmon July 28, 2024, 3:44 p.m. UTC | #3
On 7/24/2024 8:18 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
> 
> On 7/24/2024 4:35 PM, Denys Dmytriyenko wrote:
>> On Fri, Jul 19, 2024 at 10:10:18AM -0500, Ryan Eatmon via 
>> lists.yoctoproject.org wrote:
>>> Applying the patches to all kernels is not going to work.  Each kernel
>>> might need different patches to address reproducibility issues.
>>
>> Can you also backport this to scarthgap, as these patches fon't apply 
>> cleanly
>> to bb.org and currently break Beagle builds. Thanks.
> 
> It is staged in next waiting for a CICD run.

Finally promoted.  It is now on scarthgap.

> 
>>
>>> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>>> ---
>>> v2: Fix BSP tag for bsp-ti-6_6
>>>
>>>   meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc | 12 ++++++++----
>>>   1 file changed, 8 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc 
>>> b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
>>> index f24fbe51..1831ba66 100644
>>> --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
>>> +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
>>> @@ -13,8 +13,12 @@ EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}"
>>>   KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
>>>   KERNEL_DTBVENDORED = "1"
>>> -SRC_URI:append = " \
>>> -file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
>>> -file://0001-vt-conmakehash-improve-reproducibility.patch \
>>> -file://0001-pnmtologo-use-relocatable-file-name.patch \
>>> +KERNEL_PATCHES = ""
>>> +
>>> +KERNEL_PATCHES:bsp-ti-6_6 = " \
>>> +    
>>> file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
>>> +    file://0001-vt-conmakehash-improve-reproducibility.patch \
>>> +    file://0001-pnmtologo-use-relocatable-file-name.patch \
>>>   "
>>> +
>>> +SRC_URI:append = " ${KERNEL_PATCHES} "
>>> -- 
>>> 2.17.1
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17906): https://lists.yoctoproject.org/g/meta-ti/message/17906
> Mute This Topic: https://lists.yoctoproject.org/mt/107436568/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
index f24fbe51..1831ba66 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
@@ -13,8 +13,12 @@  EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}"
 KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
 KERNEL_DTBVENDORED = "1"
 
-SRC_URI:append = " \
-file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
-file://0001-vt-conmakehash-improve-reproducibility.patch \
-file://0001-pnmtologo-use-relocatable-file-name.patch \
+KERNEL_PATCHES = ""
+
+KERNEL_PATCHES:bsp-ti-6_6 = " \
+    file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
+    file://0001-vt-conmakehash-improve-reproducibility.patch \
+    file://0001-pnmtologo-use-relocatable-file-name.patch \
 "
+
+SRC_URI:append = " ${KERNEL_PATCHES} "