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

[Russ Allbery]

Andreas Beckmann <debian at abeckmann.de> writes:

> attached is a patch to that cleans up the nvidia-graphics-modules-i386
> package even further:

>  * use control.template from nvidia-kernel-source

> There should be no need to maintain two copies of the file, so just use
> the one included in nvidia-kernel-source (a small edit is neccessary:
> the Source package name needs to be adjusted, that is done on the fly
> during build).

> control.template needs to be deleted from nvidia-graphics-modules-i386,
> a patch for nvidia-graphics-drivers to update the control file there is
> coming later.

This looks like a good idea.

>  * 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.

>  * debian/rules
>    - stop special handling of the amd64 package, the module source
>      already cares for linking with the correct binary object file

> That was long obsolete code as was the comment "amd64 needs to go last
> in the flavor list".

Oh, okay.  I hadn't actually looked at the upstream build system.

>    - 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.

>    - 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
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.

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

-- 
Russ Allbery (rra at debian.org)               <http://www.eyrie.org/~eagle/>