Re: [PATCH 2/2] dpkg-raw: Correct path so that git fetching works

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

On 14.04.20 09:05, Henning Schild wrote:
> Am Fri, 3 Apr 2020 17:02:57 +0200
> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> 
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> Setting D to S and cleaning the former caused problems when fetching
>> the to-be-installed files via git. Fix this by using a distinct D
>> folder. This requires setting --sourcedir for dh_install accordingly.
>>
>> At this chance, simplify ${PN}.install creation and avoid resolving
>> ${D} in the error message.
>>
>> Reported-by: Sven Schultschik <sven.schultschik@siemens.com>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>   meta/classes/dpkg-raw.bbclass | 15 ++++++++++-----
>>   1 file changed, 10 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta/classes/dpkg-raw.bbclass
>> b/meta/classes/dpkg-raw.bbclass index 8c01a46a..9d4e8c19 100644
>> --- a/meta/classes/dpkg-raw.bbclass
>> +++ b/meta/classes/dpkg-raw.bbclass
>> @@ -5,22 +5,27 @@
>>   
>>   inherit dpkg
>>   
>> -D = "${S}"
>> +D = "${WORKDIR}/image"
>>   
>>   # Populate folder that will be picked up as package
>>   do_install() {
>> -	bbnote "Put your files for this package in ${D}"
>> +	bbnote "Put your files for this package in $""{D}"
>>   }
>>   
>>   do_install[cleandirs] = "${D}"
>>   addtask install after do_unpack before do_prepare_build
>>   
>> -do_prepare_build[cleandirs] += "${D}/debian"
>> +do_prepare_build[cleandirs] += "${S}/debian"
>>   do_prepare_build() {
>>   	cd ${D}
> 
> How about we create a recursive copy of S into D and leave the rest of
> the code as it was?

This may cause artifacts being distributed that shall not. ${S} may 
contain a complete git repo while ${D} shall only contain some selected 
files of it.

> 
>>   	find . -maxdepth 1 ! -name .. -and ! -name . -and ! -name
>> debian | \
>> -		sed 's:^./::' > ${WORKDIR}/${PN}.install
>> -	mv ${WORKDIR}/${PN}.install ${D}/debian/
>> +		sed 's:^./::' > ${S}/debian/${PN}.install
>>   
>>   	deb_debianize
>> +
>> +	cat <<EOF >> ${S}/debian/rules
>> +
>> +override_dh_install:
>> +	dh_install --sourcedir=${PP}/image
>> +EOF
> 
> Because this looks confusing and will break if people already had their
> own override ... for some weird reason.
> 
> And because of the hidden API "change" i commented on in the other
> patch.

I can write a small changelog entry, but I don't see any point in 
addressing purely hypothetical user issues by copying stuff around - 
which may even not be as simple as you think.

Jan

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