Re: How to create multi-source tarball with different submodules for scipy

2023-01-17 Thread Nick Morrott
On Mon, 16 Jan 2023 at 16:06, Andreas Tille  wrote:
>
> Hi,
>
> I tried to create a multi-source tarball for scipy in its experimental
> branch[1].  Upstream includes a set of git submodules in its build
> process.  I intended to merge all these submodules in a single
> scipy_1.10.0.orig-submodules.tar.gz.  This tarball is created with a
> script[2] which makes sure that the exact directory structure as it is
> used by upstream is conserved.  This directory layout is needed in the
> build process.  Unfortunately `dpkg-source -x` extracts the content of
> the submodules tarball into a subdirectory submodules/.
>
> Is there any trick to unpack this tarball right into the root?
> Otherwise I need to do some symlinks workaround in d/rules to provide
> all files where these are needed.

When I packaged firmware-microbit-microbit I wasn't aware of any
tricks, so I resorted to overriding dh_auto_build to move the
extracted components into their expected paths before building:

https://salsa.debian.org/python-team/packages/firmware-microbit-micropython/-/blob/debian/master/debian/rules

Not sure if this useful, but I thought I'd pass it along in case it helps.

Cheers,
Nick



Re: How to create multi-source tarball with different submodules for scipy

2023-01-17 Thread Andreas Tille
Am Tue, Jan 17, 2023 at 08:55:21AM +0800 schrieb Paul Wise:
> On Mon, 2023-01-16 at 17:05 +0100, Andreas Tille wrote:
> 
> > I intended to merge all these submodules in a single
> > scipy_1.10.0.orig-submodules.tar.gz.
> Any reason not to use one tarball per submodule?

Yes, this would need manual intervention for any change of the modules
(either we can get rid of one or upstream adds another one).  Single
tarballs also would not really solve the problem I was asking for.

Kind regards
Andreas.

-- 
http://fam-tille.de



Re: How to create multi-source tarball with different submodules for scipy

2023-01-16 Thread Paul Wise
On Mon, 2023-01-16 at 17:05 +0100, Andreas Tille wrote:

> I intended to merge all these submodules in a single
> scipy_1.10.0.orig-submodules.tar.gz.

Any reason not to use one tarball per submodule?

-- 
bye,
pabs

https://wiki.debian.org/PaulWise


signature.asc
Description: This is a digitally signed message part


Re: How to create multi-source tarball with different submodules for scipy

2023-01-16 Thread Julian Gilbey
On Mon, Jan 16, 2023 at 05:05:39PM +0100, Andreas Tille wrote:
> Hi,
> 
> I tried to create a multi-source tarball for scipy in its experimental
> branch[1].  Upstream includes a set of git submodules in its build
> process.  I intended to merge all these submodules in a single
> scipy_1.10.0.orig-submodules.tar.gz.  This tarball is created with a
> script[2] which makes sure that the exact directory structure as it is
> used by upstream is conserved.  This directory layout is needed in the
> build process.  Unfortunately `dpkg-source -x` extracts the content of
> the submodules tarball into a subdirectory submodules/.
> 
> Is there any trick to unpack this tarball right into the root?
> Otherwise I need to do some symlinks workaround in d/rules to provide
> all files where these are needed.

Not that I know of; this is the design of the multi-source tarball
setup: each component tarball is extracted into a directory with the
name of the component.

Best wishes,

   Julian



How to create multi-source tarball with different submodules for scipy

2023-01-16 Thread Andreas Tille
Hi,

I tried to create a multi-source tarball for scipy in its experimental
branch[1].  Upstream includes a set of git submodules in its build
process.  I intended to merge all these submodules in a single
scipy_1.10.0.orig-submodules.tar.gz.  This tarball is created with a
script[2] which makes sure that the exact directory structure as it is
used by upstream is conserved.  This directory layout is needed in the
build process.  Unfortunately `dpkg-source -x` extracts the content of
the submodules tarball into a subdirectory submodules/.

Is there any trick to unpack this tarball right into the root?
Otherwise I need to do some symlinks workaround in d/rules to provide
all files where these are needed.

Kind regards
   Andreas.

[1] https://salsa.debian.org/python-team/packages/scipy/-/tree/experimental
[2] 
https://salsa.debian.org/python-team/packages/scipy/-/blob/experimental/debian/get-submodules

-- 
http://fam-tille.de