Re: [PATCH] scripts/package/builddeb: upgrade to current practices

[Jonathan Nieder <jrnieder@gmail.com>]

Hi,

Martin-Éric Racine wrote:

> Signed-off-by: Martin-Éric Racine <martin-eric.racine@iki.fi>

Thanks.  This patch does many things at once instead of the usual
practice of "one patch per logical change", but oh well.

[...]
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -79,9 +79,9 @@ fwdir="$objtree/debian/fwtmp"
>  kernel_headers_dir="$objtree/debian/hdrtmp"
>  libc_headers_dir="$objtree/debian/headertmp"
>  packagename=linux-image-$version
> -fwpackagename=linux-firmware-image
>  kernel_headers_packagename=linux-headers-$version
>  libc_headers_packagename=linux-libc-dev
> +fwpackagename=firmware-linux

Micronit: any reason the lines are reordered here?

> @@ -188,17 +188,17 @@ This is a packacked upstream version of the Linux kernel.
>  The sources may be found at most Linux ftp sites, including:
>  ftp://ftp.kernel.org/pub/linux/kernel
>  
> -Copyright: 1991 - 2009 Linus Torvalds and others.
> +Copyright: 1991-2012 Linus Torvalds and others.
>  
> -The git repository for mainline kernel development is at:
> -git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> +The GIT repository for mainline kernel development is at:
> +git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

I personally like to spell it as "Git". ;-)

[...]
> @@ -273,6 +273,9 @@ if [ -e "$tmpdir/lib/firmware" ]; then
>  
>  Package: $fwpackagename
>  Architecture: all
> +Conflicts: firmware-linux-free, firmware-linux-nonfree
> +Provides: firmware-linux-free, firmware-linux-nonfree
> +Replaces: firmware-linux-free, firmware-linux-nonfree

I assume you mean Breaks+Replaces.  Do the files actually overlap,
or is this change being overly cautious?  I would expect the files
not to overlap because the package build with deb-pkg puts firmware
in a versioned subdirectory "/lib/firmware/<version>".

Hope that helps,
Jonathan