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

[Andreas Beckmann]

Hi Russ,

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.

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

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

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

   - 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 ...
There is one variable currently still hardcoded in debian/rules:
"package" (the name of the source package). I hope you can find a better
solution so we can get this value automatically, e.g. using
dpkg-parsechangelog.


Andreas

PS: I'm switching from British "flavour" to American "flavor"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: nvidia-graphics-modules-i386-1of2-cleanup.patch
Type: text/x-patch
Size: 4585 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-nvidia-devel/attachments/20100409/144d11db/attachment.bin>