[pkg-nvidia-devel] [PATCH 1/2] [nvidia-graphics-modules-i386] cleanup

[Andreas Beckmann]

Russ Allbery wrote:
> Andreas Beckmann <debian at abeckmann.de> writes:

>>  * keep the original changelog from nvidia-kernel-source as
>>    changelog.nvidia-kernel-source
> 
>> Now I just need to find a way to include this as an additional changelog
>> while module-assistant builds the module package ... probably also a
>> patch for nvidia-graphics-drivers.
> 
> I don't think we actually care about the nvidia-graphics-modules-*
> changelog, since for the most part it isn't going to affect the contents
> of those packages.  I wouldn't go to a lot of work to include it in the
> kernel package.

But we replace the much more interesting changelog from
nvidia-graphics-modules with the boring one from
nvidia-graphics-modules-* currently ...

>>  * debian/rules
>>    - split from binary-arch target: binary-arch-meta, binary-module-%
> 
>> Should help debugging if one specific module build fails ...
>> also rewrapped and reordered variables for better readability (one
>> variable per line and same variables in the same order).
> 
> Hm, I'm not sure.  I see your point about debugging in that it lets you
> run the specific build that failed, but the code is a lot more complex and
> harder to follow and understand.

Do as you like.

>>    - move configurable settings to debian/rules.defs
> 
>> (kernel version, flavor list)
>> Trying to get a common rules file that can be used for building modules
>> for -i386, -amd64 and the legacy versions ...
> 
> I think the right direction to go here is to just merge all those source
> packages together into one package.  Unless I'm missing something, there's
> no reason why a single nvidia-kernel-modules package can't build all
> legacy versions for both i386 and amd64 from the same source package.  We
i386 and amd64 from one source should be not too difficult, but probably
 we still should have separate module builder packages for n-g-d and
each n-g-d-legacy-abcxx

> just select which varients we build based on the current build
> architecture and use architecture-specific build dependencies in
> debian/control.
> 
> My long-term plan was to do that and merge all of the module packages
> together.

For the short term, it would be nice to have -amd64 back

> Then, there's no reason not to leave everything together in one rules file
> for simplicity.


Should I send a shorter patch only including the things you acked?

Andreas

PS: I just tried and successfully built modules for vserver-686 and
vserver-686-bigmem, too. There is no way I could test them, but probably
they should be added to the flavor list anyway. Having patch 2/2 that
generates debian/control really helps here :-)

PPS: I also successfully built amd64 and vserver-amd64 for the amd64
arch by just updating debian/control.flavor to amd64 and using
KERNELFLAVORS=amd64 vserver-amd64 in debian/rules.defs

Andreas