Re: [PATCH 1/2] dpkg-source: Fix source deployment

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

On 10.05.24 19:32, Jan Kiszka wrote:
> On 05.05.24 22:32, 'Jan Kiszka' via isar-users wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> This failed if S was not a direct subdir of WORKDIR. Align it with
>> do_dpkg_source.
>>
>> Furthermore, move -maxdepth before -name to prevent warnings about a
>> global option specified after a positional one.
>>
>> Fixes: 38b832ad8248 ("meta: Implement two stage build")
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>  meta/classes/dpkg-source.bbclass | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass
>> index 7fd5d2ed..005eafbe 100644
>> --- a/meta/classes/dpkg-source.bbclass
>> +++ b/meta/classes/dpkg-source.bbclass
>> @@ -21,7 +21,7 @@ do_deploy_source[dirs] = "${S}"
>>  do_deploy_source() {
>>      repo_del_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \
>>          "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${BPN}"
>> -    find "${S}/../" -name '*\.dsc' -maxdepth 1 | while read package; do
>> +    find "${WORKDIR}" -maxdepth 1 -name '*\.dsc' | while read package; do
>>          repo_add_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \
>>              "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \
>>              "${DEBDISTRONAME}" \
> 
> The longer I look at this... Why is this a loop over potentially
> multiple dsc files? We are expecting a single source package, and that
> is assumed to be called ${BPN} (that assumption for cleaning may be
> wrong with external source packages, though). So there should be also
> only a single match for *_*.dsc, no?
> 

Ok, there is a case where there could be multiple dsc files: If someone
fetches apt://foo in order to build bar.deb. Then we will not only
deploy the sources of bar to isar-apt but also those of the dependency
foo - ouch.

We need to figure out the source name of the target package differently.
Not so easy...

Jan

> I'm actually trying the clean the mess we have in dpkg_runbuild where we
> are reading debian/changlog to get the dsc name. When not building the
> source packages ourselves, we would have to unpack the sources in order
> get the changelog in order to find out the dsc name that is needed to
> unpack the source - this is nonsense.
> 
> Jan
> 

-- 
Siemens AG, Technology
Linux Expert Center