[PATCH] linux-custom: Update isar-apt prior to installing build deps

[PATCH] linux-custom: Update isar-apt prior to installing build deps

[Jan Kiszka]

Some of them may have been built by a recipe.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Henning, maybe also useful for your scenario of the openssl rebuild
because the kernel depends on self-built packages there as well.

 meta/recipes-kernel/linux/linux-custom.inc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
index e9a68fd..d9b2935 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -27,11 +27,18 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools | linux-initramfs-tool, kmod, linux-ba
 KERNEL_HEADERS_DEBIAN_DEPENDS ?= "libc6, libssl1.1"
 
 do_install_builddeps() {
+	dpkg_do_mounts
 	E="${@ bb.utils.export_proxies(d)}"
+	sudo -E chroot ${BUILDCHROOT_DIR} \
+		apt-get update \
+			-o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \
+			-o Dir::Etc::sourceparts="-" \
+			-o APT::Get::List-Cleanup="0"
 	sudo -E chroot ${BUILDCHROOT_DIR} \
 		apt-get install \
 			-y -o Debug::pkgProblemResolver=yes \
 			--no-install-recommends ${KBUILD_DEPENDS}
+	dpkg_undo_mounts
 }
 
 addtask install_builddeps after do_prepare_build before do_build
-- 
2.16.4

Re: [PATCH] linux-custom: Update isar-apt prior to installing build deps

[Henning Schild]

Am Tue, 6 Nov 2018 12:23:53 +0100
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> Some of them may have been built by a recipe.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Henning, maybe also useful for your scenario of the openssl rebuild
> because the kernel depends on self-built packages there as well.

Will try once merged.

>  meta/recipes-kernel/linux/linux-custom.inc | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc
> b/meta/recipes-kernel/linux/linux-custom.inc index e9a68fd..d9b2935
> 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -27,11 +27,18 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools |
> linux-initramfs-tool, kmod, linux-ba KERNEL_HEADERS_DEBIAN_DEPENDS ?=
> "libc6, libssl1.1" 
>  do_install_builddeps() {
> +	dpkg_do_mounts
>  	E="${@ bb.utils.export_proxies(d)}"
> +	sudo -E chroot ${BUILDCHROOT_DIR} \
> +		apt-get update \
> +			-o
> Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \
> +			-o Dir::Etc::sourceparts="-" \
> +			-o APT::Get::List-Cleanup="0"

All these args make sure we just update that one repo?

Henning

>  	sudo -E chroot ${BUILDCHROOT_DIR} \
>  		apt-get install \
>  			-y -o Debug::pkgProblemResolver=yes \
>  			--no-install-recommends ${KBUILD_DEPENDS}
> +	dpkg_undo_mounts
>  }
>  
>  addtask install_builddeps after do_prepare_build before do_build

Re: [PATCH] linux-custom: Update isar-apt prior to installing build deps

[Jan Kiszka]

On 06.11.18 12:49, Henning Schild wrote:
> Am Tue, 6 Nov 2018 12:23:53 +0100
> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> 
>> Some of them may have been built by a recipe.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>
>> Henning, maybe also useful for your scenario of the openssl rebuild
>> because the kernel depends on self-built packages there as well.
> 
> Will try once merged.
> 
>>   meta/recipes-kernel/linux/linux-custom.inc | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/meta/recipes-kernel/linux/linux-custom.inc
>> b/meta/recipes-kernel/linux/linux-custom.inc index e9a68fd..d9b2935
>> 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc
>> +++ b/meta/recipes-kernel/linux/linux-custom.inc
>> @@ -27,11 +27,18 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools |
>> linux-initramfs-tool, kmod, linux-ba KERNEL_HEADERS_DEBIAN_DEPENDS ?=
>> "libc6, libssl1.1"
>>   do_install_builddeps() {
>> +	dpkg_do_mounts
>>   	E="${@ bb.utils.export_proxies(d)}"
>> +	sudo -E chroot ${BUILDCHROOT_DIR} \
>> +		apt-get update \
>> +			-o
>> Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \
>> +			-o Dir::Etc::sourceparts="-" \
>> +			-o APT::Get::List-Cleanup="0"
> 
> All these args make sure we just update that one repo?

Yes, it's the same as in deps.sh, the script we call for normal package 
dependency installation.

Jan

> 
> Henning
> 
>>   	sudo -E chroot ${BUILDCHROOT_DIR} \
>>   		apt-get install \
>>   			-y -o Debug::pkgProblemResolver=yes \
>>   			--no-install-recommends ${KBUILD_DEPENDS}
>> +	dpkg_undo_mounts
>>   }
>>   
>>   addtask install_builddeps after do_prepare_build before do_build
> 

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