[PATCH] linux-custom: Add support for kernels >= 4.17

[PATCH] linux-custom: Add support for kernels >= 4.17

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Upstream changed deb-pkg, and it no longer spits out a debian.tar.gz
archive. Take the debian folder generated by deb-pkg instead.

A second change is required because upstream now sets the target package
architecture as well, but dpkg-gencontrol will not like this in a cross
environment (host != package arch). Trick it.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-kernel/linux/files/build-kernel.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh
index 2cee28f..3f39d43 100644
--- a/meta/recipes-kernel/linux/files/build-kernel.sh
+++ b/meta/recipes-kernel/linux/files/build-kernel.sh
@@ -51,8 +51,14 @@ mkdir -p ${REPACK_DIR}
 mkdir -p ${REPACK_LINUX_IMAGE_DIR}
 mkdir -p ${REPACK_LINUX_HEADERS_DIR}
 
+cp -a debian ${REPACK_DIR}
+
+# dpkg-gencontrol performs cross-incompatible checks on the
+# Architecture field; trick it to accept the control file
+sed -i "s/Architecture: .*/Architecture: any/" ${REPACK_DIR}/debian/control
+
 cd ..
-tar xzf linux-${PV}_${PV}-1.debian.tar.gz -C ${REPACK_DIR}
+
 dpkg-deb -R linux-image-${PV}_${PV}-1_*.deb ${REPACK_LINUX_IMAGE_DIR}
 dpkg-deb -R linux-headers-${PV}_${PV}-1_*.deb ${REPACK_LINUX_HEADERS_DIR}
 
-- 
2.16.4

Re: [PATCH] linux-custom: Add support for kernels >= 4.17

[Maxim Yu. Osipov]

Hi Jan,

Should we include your two last linux-custom patches into the release (I 
planned to release isar today evening)?

Regards,
Maxim.


On 9/30/18 7:55 PM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Upstream changed deb-pkg, and it no longer spits out a debian.tar.gz
> archive. Take the debian folder generated by deb-pkg instead.
> 
> A second change is required because upstream now sets the target package
> architecture as well, but dpkg-gencontrol will not like this in a cross
> environment (host != package arch). Trick it.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta/recipes-kernel/linux/files/build-kernel.sh | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh
> index 2cee28f..3f39d43 100644
> --- a/meta/recipes-kernel/linux/files/build-kernel.sh
> +++ b/meta/recipes-kernel/linux/files/build-kernel.sh
> @@ -51,8 +51,14 @@ mkdir -p ${REPACK_DIR}
>   mkdir -p ${REPACK_LINUX_IMAGE_DIR}
>   mkdir -p ${REPACK_LINUX_HEADERS_DIR}
>   
> +cp -a debian ${REPACK_DIR}
> +
> +# dpkg-gencontrol performs cross-incompatible checks on the
> +# Architecture field; trick it to accept the control file
> +sed -i "s/Architecture: .*/Architecture: any/" ${REPACK_DIR}/debian/control
> +
>   cd ..
> -tar xzf linux-${PV}_${PV}-1.debian.tar.gz -C ${REPACK_DIR}
> +
>   dpkg-deb -R linux-image-${PV}_${PV}-1_*.deb ${REPACK_LINUX_IMAGE_DIR}
>   dpkg-deb -R linux-headers-${PV}_${PV}-1_*.deb ${REPACK_LINUX_HEADERS_DIR}
>   
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov

Re: [PATCH] linux-custom: Add support for kernels >= 4.17

[Jan Kiszka]

On 01.10.18 09:46, Maxim Yu. Osipov wrote:
> Hi Jan,
> 
> Should we include your two last linux-custom patches into the release (I planned 
> to release isar today evening)?

Yes, I think so. I've tested both with jailhouse-images for 4.14 and 4.19-rc, so 
I feel rather confident that they work as desired. I'll do a 4.4-cip check this 
morning as well and scream out loudly if that should break unexpectedly.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH] linux-custom: Add support for kernels >= 4.17

[Jan Kiszka]

On 01.10.18 09:54, Jan Kiszka wrote:
> On 01.10.18 09:46, Maxim Yu. Osipov wrote:
>> Hi Jan,
>>
>> Should we include your two last linux-custom patches into the release (I 
>> planned to release isar today evening)?
> 
> Yes, I think so. I've tested both with jailhouse-images for 4.14 and 4.19-rc, so 
> I feel rather confident that they work as desired. I'll do a 4.4-cip check this 
> morning as well and scream out loudly if that should break unexpectedly.

4.4-build completed successfully as well.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH] linux-custom: Add support for kernels >= 4.17

[Jan Kiszka]

On 01.10.18 10:19, Jan Kiszka wrote:
> On 01.10.18 09:54, Jan Kiszka wrote:
>> On 01.10.18 09:46, Maxim Yu. Osipov wrote:
>>> Hi Jan,
>>>
>>> Should we include your two last linux-custom patches into the release (I 
>>> planned to release isar today evening)?
>>
>> Yes, I think so. I've tested both with jailhouse-images for 4.14 and 4.19-rc, 
>> so I feel rather confident that they work as desired. I'll do a 4.4-cip check 
>> this morning as well and scream out loudly if that should break unexpectedly.
> 
> 4.4-build completed successfully as well.

BTW, do you have a kernel build as part of your CI? If not, should we add this? 
Ideally there would even be a build of latest linus-master to catch issues like 
these here.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH] linux-custom: Add support for kernels >= 4.17

[Maxim Yu. Osipov]

On 10/1/18 11:50 AM, Jan Kiszka wrote:
> On 01.10.18 10:19, Jan Kiszka wrote:
>> On 01.10.18 09:54, Jan Kiszka wrote:
>>> On 01.10.18 09:46, Maxim Yu. Osipov wrote:
>>>> Hi Jan,
>>>>
>>>> Should we include your two last linux-custom patches into the 
>>>> release (I planned to release isar today evening)?
>>>
>>> Yes, I think so. I've tested both with jailhouse-images for 4.14 and 
>>> 4.19-rc, so I feel rather confident that they work as desired. I'll 
>>> do a 4.4-cip check this morning as well and scream out loudly if that 
>>> should break unexpectedly.
>>
>> 4.4-build completed successfully as well.
> 
> BTW, do you have a kernel build as part of your CI? If not, should we 
> add this? Ideally there would even be a build of latest linus-master to 
> catch issues like these here.

This is in CI TODO list...

Maxim.

> Jan
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov

Re: [PATCH] linux-custom: Add support for kernels >= 4.17

[Maxim Yu. Osipov]

On 9/30/18 7:55 PM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Upstream changed deb-pkg, and it no longer spits out a debian.tar.gz
> archive. Take the debian folder generated by deb-pkg instead.
> 
> A second change is required because upstream now sets the target package
> architecture as well, but dpkg-gencontrol will not like this in a cross
> environment (host != package arch). Trick it.

Applied to the 'next'.

Thanks,
Maxim.

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta/recipes-kernel/linux/files/build-kernel.sh | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh
> index 2cee28f..3f39d43 100644
> --- a/meta/recipes-kernel/linux/files/build-kernel.sh
> +++ b/meta/recipes-kernel/linux/files/build-kernel.sh
> @@ -51,8 +51,14 @@ mkdir -p ${REPACK_DIR}
>   mkdir -p ${REPACK_LINUX_IMAGE_DIR}
>   mkdir -p ${REPACK_LINUX_HEADERS_DIR}
>   
> +cp -a debian ${REPACK_DIR}
> +
> +# dpkg-gencontrol performs cross-incompatible checks on the
> +# Architecture field; trick it to accept the control file
> +sed -i "s/Architecture: .*/Architecture: any/" ${REPACK_DIR}/debian/control
> +
>   cd ..
> -tar xzf linux-${PV}_${PV}-1.debian.tar.gz -C ${REPACK_DIR}
> +
>   dpkg-deb -R linux-image-${PV}_${PV}-1_*.deb ${REPACK_LINUX_IMAGE_DIR}
>   dpkg-deb -R linux-headers-${PV}_${PV}-1_*.deb ${REPACK_LINUX_HEADERS_DIR}
>   
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov