Re: [PATCH 2/2] dpkg-source: Build source package only once

[Jan Kiszka <jan.kiszka@siemens.com>]

On 13.05.24 14:04, Anton Mikanovich wrote:
> 05/05/2024 23:32, 'Jan Kiszka' via isar-users wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> Avoid building the source package multiple times, possibly even
>> inconsistently. This is achieved by delegating this task to to the base
>> package and installing the source package from isar-apt in the native
>> and compat package variants.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>   meta/classes/dpkg-source.bbclass | 44 ++++++++++++++++++++++++++++++--
>>   1 file changed, 42 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/classes/dpkg-source.bbclass
>> b/meta/classes/dpkg-source.bbclass
>> index 005eafbe..7161641f 100644
>> --- a/meta/classes/dpkg-source.bbclass
>> +++ b/meta/classes/dpkg-source.bbclass
>> @@ -13,7 +13,7 @@ do_dpkg_source() {
>>       find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -delete
>>       sh -c "cd ${WORKDIR}; dpkg-source ${DPKG_SOURCE_EXTRA_ARGS} -b
>> ${PPS}"
>>   }
>> -addtask dpkg_source after do_prepare_build before do_dpkg_build
>> +addtask dpkg_source after do_prepare_build
>>     do_deploy_source[depends] += "isar-apt:do_cache_config"
>>   do_deploy_source[lockfiles] = "${REPO_ISAR_DIR}/isar.lock"
>> @@ -28,4 +28,44 @@ do_deploy_source() {
>>               "${package}"
>>       done
>>   }
>> -addtask deploy_source after do_dpkg_source before do_dpkg_build
>> +addtask deploy_source after do_dpkg_source
>> +
>> +do_dpkg_build[depends] += "${BPN}:do_deploy_source"
>> +
>> +SCHROOT_MOUNTS = "${WORKDIR}:/work ${REPO_ISAR_DIR}/${DISTRO}:/isar-apt"
>> +
>> +do_fetch_common_source[depends] += "${BPN}:do_deploy_source"
> As do_fetch_common_source is the first task which use schroot it should
> also
> have ${SCHROOT_DEP} in depends flag.

Yes, locally fixed already. There was another bug as well, forgot right
now. Will send a new series once Adriaan sent his v4 of the kbuild rework.

Jan

> Simple test case to reproduce the issue with missing schroot: build
> mc:qemuarm64-bullseye:libhello-compat (with ISAR_ENABLE_COMPAT_ARCH
> enabled)
>> +do_fetch_common_source[network] = "${TASK_USE_SUDO}"
>> +do_fetch_common_source() {
>> +    schroot_create_configs
>> +    insert_mounts
>> +
>> +    session_id=$(schroot -q -b -c ${SBUILD_CHROOT})
>> +    echo "Started session: ${session_id}"
>> +
>> +    schroot_cleanup() {
>> +        schroot -q -f -e -c ${session_id} > /dev/null 2>&1
>> +        remove_mounts > /dev/null 2>&1
>> +        schroot_delete_configs
>> +    }
>> +    trap 'exit 1' INT HUP QUIT TERM ALRM USR1
>> +    trap 'schroot_cleanup' EXIT
>> +
>> +    schroot -r -c ${session_id} -d / -u root -- \
>> +        apt-get update -o
>> Dir::Etc::SourceList="sources.list.d/isar-apt.list" -o
>> Dir::Etc::SourceParts="-" -o APT::Get::List-Cleanup="0"
>> +    schroot -r -c ${session_id} -d / -- \
>> +        sh -c '
>> +            cd /work
>> +            apt-get -y --download-only --only-source -o
>> Acquire::Source-Symlinks="false" source ${BPN}'
>> +
>> +    schroot -e -c ${session_id}
>> +    remove_mounts
>> +    schroot_delete_configs
>> +}
>> +addtask fetch_common_source after do_unpack
>> +
>> +def is_native_or_compat(d):
>> +    overrides = d.getVar('OVERRIDES').split(':')
>> +    return 'class-native' in overrides or 'class-compat' in overrides
>> +
>> +do_dpkg_build[depends] += "${@'${PN}:do_fetch_common_source' if
>> is_native_or_compat(d) else ''}"
> 
> 

-- 
Siemens AG, Technology
Linux Expert Center