Re: [PATCH 1/2] dpkg-raw: add files to source package

["'Quirin Gylstorff' via isar-users" <isar-users@googlegroups.com>]

On 12/4/25 11:50, Moessbauer, Felix (FT RPD CED OES-DE) wrote:
> On Thu, 2025-12-04 at 11:31 +0100, Quirin Gylstorff wrote:
>> Hi,
>>
>> On 8/20/25 14:41, 'Felix Moessbauer' via isar-users wrote:
>>> In dpkg-raw, the user can place files in ${D} which are then installed
>>> into the resulting binary package. Hereby, ${D} is a directory outside
>>> of ${S} (since b19cd25) to not interfere with other data added to ${S}.
>>> However, by that the files are not added to the source package. This
>>> remained unnoticed, as the directory dh_install installs from is set
>>> to absolute path, hence the installed files actually came from the
>>> absolute path and not from the extracted source package. In case of
>>> ${PN} == ${BPN}, this path was always there as it has been created by
>>> previous tasks. However, with the switch in 2ca3a7e5 to only build the
>>> source package once, the path is not always there.
>>>
>>> We fix this by adding the files to the source package (under image) and
>>> install from a relative base. We further use a sub-path (image) in ${S}
>>> as a temporary location to not run into the issue solved in b19cd25.
>>>
>>> Fixes: 2ca3a7e5 ("dpkg-source: Build source package only once")
>>> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
>>> ---
>>
>> This patch  breaks the possibility to install *.so (for example from
>> external deliveries) into the system.
> 
> No, it doesn't. The *.so just need to be added to the source package,
> as this is the input to the sbuild. Pointing to some external paths
> outside of the source package already broke in 2ca3a7e5 and is
> conceptually wrong.

This due to dpkg-source is called with "-I" which excludes the following 
list:

   -I, --tar-ignore[=<pattern>]
                            filter out files when building tarballs
                              (defaults to: -I*.a -I*.la -I*.o -I*.so 
-I.*.sw? -I*/*~ -I,,* -I.[#~]* -I.arch-ids -I.arch-inventory -I.be 
-I.bzr -I.bzr.backup -I.bzr.tags -I.bz
rignore -I.cvsignore -I.deps -I.git -I.gitattributes -I.gitignore 
-I.gitmodules -I.gitreview -I.hg -I.hgignore -I.hgsigs -I.hgtags 
-I.mailmap -I.mtn-ignore -I.shelf -I.svn -I
CVS -IDEADJOE -IRCS -I_MTN -I_darcs -I{arch}).

The faulty previous implementation did hide that behaviour.

Quirin

> 
> Felix
> 
>>
>> Quirin>   meta/classes/dpkg-raw.bbclass | 4 ++--
>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
>>> index a7bf204a..d4cb7d8a 100644
>>> --- a/meta/classes/dpkg-raw.bbclass
>>> +++ b/meta/classes/dpkg-raw.bbclass
>>> @@ -5,7 +5,7 @@
>>>    
>>>    inherit dpkg
>>>    
>>> -D = "${WORKDIR}/image"
>>> +D = "${S}/image"
>>>    
>>>    # Default to creating a binary-indep package
>>>    DPKG_ARCH ??= "all"
>>> @@ -30,6 +30,6 @@ do_prepare_build() {
>>>    	cat <<EOF >> ${S}/debian/rules
>>>    
>>>    override_dh_install:
>>> -	dh_install --sourcedir=${PP}/image
>>> +	dh_install --sourcedir=image
>>>    EOF
>>>    }
> 


-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/566d3141-e3ba-4fda-aeb0-81eccec964f2%40siemens.com.