[PATCH] builddeb: Update a few outdated and hardcoded strings

[PATCH] builddeb: Update a few outdated and hardcoded strings

[Timo Sigurdsson]

The builddeb script has some hardcoded references to linux version 2.6
which is ancient. Use a variable instead in order to keep in sync with
new releases and avoid the need to manually update this. In addition,
change the copyright notice to include the year 2016.

Signed-off-by: Timo Sigurdsson <public_timo.s@silentcreek.de>
---
 scripts/package/builddeb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 8ea9fd2..d85120c 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -84,6 +84,7 @@ set_debarch() {
 
 # Some variables and settings used throughout the script
 version=$KERNELRELEASE
+majorversion=$VERSION.$PATCHLEVEL
 revision=$(cat .version)
 if [ -n "$KDEB_PKGVERSION" ]; then
 	packageversion=$KDEB_PKGVERSION
@@ -265,7 +266,7 @@ 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 - 2015 Linus Torvalds and others.
+Copyright: 1991 - 2016 Linus Torvalds and others.
 
 The git repository for mainline kernel development is at:
 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
@@ -296,7 +297,7 @@ if [ "$ARCH" = "um" ]; then
 	cat <<EOF >> debian/control
 
 Package: $packagename
-Provides: linux-image, linux-image-2.6, linux-modules-$version
+Provides: linux-image, linux-image-$majorversion, linux-modules-$version
 Architecture: any
 Description: User Mode Linux kernel, version $version
  User-mode Linux is a port of the Linux kernel to its own system call
@@ -313,7 +314,7 @@ else
 	cat <<EOF >> debian/control
 
 Package: $packagename
-Provides: linux-image, linux-image-2.6, linux-modules-$version
+Provides: linux-image, linux-image-$majorversion, linux-modules-$version
 Suggests: $fwpackagename
 Architecture: any
 Description: Linux kernel, version $version
@@ -346,7 +347,7 @@ rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
 cat <<EOF >> debian/control
 
 Package: $kernel_headers_packagename
-Provides: linux-headers, linux-headers-2.6
+Provides: linux-headers, linux-headers-$majorversion
 Architecture: any
 Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
  This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
-- 
2.1.4

Re: [PATCH] builddeb: Update a few outdated and hardcoded strings

[Riku Voipio]

On 5 September 2016 at 02:43, Timo Sigurdsson
<public_timo.s@silentcreek.de> wrote:
> The builddeb script has some hardcoded references to linux version 2.6
> which is ancient. Use a variable instead in order to keep in sync with
> new releases and avoid the need to manually update this. In addition,
> change the copyright notice to include the year 2016.

I think we can just drop all the "Provides" lines, the official debian
packages don't provide
anything, and nothing depends on these provided virtual packages either.

> Signed-off-by: Timo Sigurdsson <public_timo.s@silentcreek.de>
> ---
>  scripts/package/builddeb | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 8ea9fd2..d85120c 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -84,6 +84,7 @@ set_debarch() {
>
>  # Some variables and settings used throughout the script
>  version=$KERNELRELEASE
> +majorversion=$VERSION.$PATCHLEVEL
>  revision=$(cat .version)
>  if [ -n "$KDEB_PKGVERSION" ]; then
>         packageversion=$KDEB_PKGVERSION
> @@ -265,7 +266,7 @@ 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 - 2015 Linus Torvalds and others.
> +Copyright: 1991 - 2016 Linus Torvalds and others.
>
>  The git repository for mainline kernel development is at:
>  git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> @@ -296,7 +297,7 @@ if [ "$ARCH" = "um" ]; then
>         cat <<EOF >> debian/control
>
>  Package: $packagename
> -Provides: linux-image, linux-image-2.6, linux-modules-$version
> +Provides: linux-image, linux-image-$majorversion, linux-modules-$version
>  Architecture: any
>  Description: User Mode Linux kernel, version $version
>   User-mode Linux is a port of the Linux kernel to its own system call
> @@ -313,7 +314,7 @@ else
>         cat <<EOF >> debian/control
>
>  Package: $packagename
> -Provides: linux-image, linux-image-2.6, linux-modules-$version
> +Provides: linux-image, linux-image-$majorversion, linux-modules-$version
>  Suggests: $fwpackagename
>  Architecture: any
>  Description: Linux kernel, version $version
> @@ -346,7 +347,7 @@ rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
>  cat <<EOF >> debian/control
>
>  Package: $kernel_headers_packagename
> -Provides: linux-headers, linux-headers-2.6
> +Provides: linux-headers, linux-headers-$majorversion
>  Architecture: any
>  Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
>   This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] builddeb: Update a few outdated and hardcoded strings

[Timo Sigurdsson]

Hi,

Riku Voipio schrieb am 13.09.2016 10:22:

> On 5 September 2016 at 02:43, Timo Sigurdsson
> <public_timo.s@silentcreek.de> wrote:
>> The builddeb script has some hardcoded references to linux version 2.6
>> which is ancient. Use a variable instead in order to keep in sync with
>> new releases and avoid the need to manually update this. In addition,
>> change the copyright notice to include the year 2016.
> 
> I think we can just drop all the "Provides" lines, the official debian
> packages don't provide
> anything, and nothing depends on these provided virtual packages either.

As far as Debian is concerned, that's true. However, Ubuntu's linux
packages have these "Provides" lines. But as I haven't used Ubuntu in a
while, I don't know if these are actually required for anything on Ubuntu
systems.

I'd be fine with any decision (keep or drop), I just don't wanna make the
call to drop them as I'm not aware about the implications on other Debian
based distributions.

Regards,

Timo


<snip>

Re: [PATCH] builddeb: Update a few outdated and hardcoded strings

[Riku Voipio]

On 14 September 2016 at 10:11, Timo Sigurdsson
<public_timo.s@silentcreek.de> wrote:
>> On 5 September 2016 at 02:43, Timo Sigurdsson
>> <public_timo.s@silentcreek.de> wrote:
>>> The builddeb script has some hardcoded references to linux version 2.6
>>> which is ancient. Use a variable instead in order to keep in sync with
>>> new releases and avoid the need to manually update this. In addition,
>>> change the copyright notice to include the year 2016.
>>
>> I think we can just drop all the "Provides" lines, the official debian
>> packages don't provide
>> anything, and nothing depends on these provided virtual packages either.
>
> As far as Debian is concerned, that's true. However, Ubuntu's linux
> packages have these "Provides" lines. But as I haven't used Ubuntu in a
> while, I don't know if these are actually required for anything on Ubuntu
> systems.

Ubuntu has "linux-image" but not "linux-image-$majorversion". No
reverse dependencies on either (apt-cache rdepends). Let me ask the
other way around - why do you need linux-image-4.9 in your provides?

> I'd be fine with any decision (keep or drop), I just don't wanna make the
> call to drop them as I'm not aware about the implications on other Debian
> based distributions.

I'd like to keep builddeb script simple. If there is some evidence
that something is still using "linux-image" or "linux-headers" virtual
package, we can keep them in the "provides" line. dropping the
linux-image-2.6 and linux-headers-2.6 bits should however be preferred
over starting to updating the dynamically. Especially since we've
managed all the way from 2.6 ... 4.7 without anyone needing it.

Riku

Re: [PATCH] builddeb: Update a few outdated and hardcoded strings

[Timo Sigurdsson]

Hi,

Riku Voipio schrieb am 14.09.2016 10:56:

> On 14 September 2016 at 10:11, Timo Sigurdsson
> <public_timo.s@silentcreek.de> wrote:
>>> On 5 September 2016 at 02:43, Timo Sigurdsson
>>> <public_timo.s@silentcreek.de> wrote:
>>>> The builddeb script has some hardcoded references to linux version 2.6
>>>> which is ancient. Use a variable instead in order to keep in sync with
>>>> new releases and avoid the need to manually update this. In addition,
>>>> change the copyright notice to include the year 2016.
>>>
>>> I think we can just drop all the "Provides" lines, the official debian
>>> packages don't provide
>>> anything, and nothing depends on these provided virtual packages either.
>>
>> As far as Debian is concerned, that's true. However, Ubuntu's linux
>> packages have these "Provides" lines. But as I haven't used Ubuntu in a
>> while, I don't know if these are actually required for anything on Ubuntu
>> systems.
> 
> Ubuntu has "linux-image" but not "linux-image-$majorversion". No
> reverse dependencies on either (apt-cache rdepends). Let me ask the
> other way around - why do you need linux-image-4.9 in your provides?

I don't need it. I just wanted the strings to be up-to-date (merely a
cosmetic issue). If the consensus is to drop the lines entirely, that's
good enough for me.

One reason why it didn't occur to me to get rid of the lines was that IIRC
at least a while back there were Ubuntu packages relying on a
"linux-headers" package (without a version number). As it's quite some
time ago that I actually used Ubuntu, I'm not entirely sure whether
that was or still is the case.

> 
>> I'd be fine with any decision (keep or drop), I just don't wanna make the
>> call to drop them as I'm not aware about the implications on other Debian
>> based distributions.
> 
> I'd like to keep builddeb script simple. If there is some evidence
> that something is still using "linux-image" or "linux-headers" virtual
> package, we can keep them in the "provides" line. dropping the
> linux-image-2.6 and linux-headers-2.6 bits should however be preferred
> over starting to updating the dynamically. Especially since we've
> managed all the way from 2.6 ... 4.7 without anyone needing it.

Dropping the version references sounds allright to me. Maybe someone else
can tell whether the virutal packages without version suffix are still
used somewhere. But just to be safe, I'd rather keep those unless it's
certain that they aren't needed anymore (nobody speaking up and saying
these virtual packages are still in use, doesn't necessarily mean that
they aren't used in fact).

Regards,

Timo