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

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

On 14.04.20 09:11, Henning Schild wrote:
> Am Tue, 14 Apr 2020 09:05:24 +0200
> schrieb "[ext] Henning Schild" <henning.schild@siemens.com>:
> 
>> 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?
> 
> In fact the debianization and creation of that install file are
> something like a patch step. We can either try to roll it back by
> having a reverse implementation ... maybe actually using quilt.
> Or we need to invalidate its stamp together with unpack.

As explained in my other email: It's not only about adding debian/, this 
is also about picking from ${S} into ${D}. You are still on the old path 
with your proposal.

Jan

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