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

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

[riku.voipio]

From: Riku Voipio <riku.voipio@linaro.org>

The builddeb script has some hardcoded references to Linux version 2.6
which is ancient. Drop Provides as the virtual packages provided are not
useful anymore. Leave the Provides for linux-kernel-headers, as someone
might still be referring to it.

While at it, updated copyright date and standards version.

Cc: Timo Sigurdsson <public_timo.s@silentcreek.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 scripts/package/builddeb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 8ea9fd2..a7f8b99 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -265,7 +265,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
@@ -288,7 +288,7 @@ Section: kernel
 Priority: optional
 Maintainer: $maintainer
 Build-Depends: $build_depends
-Standards-Version: 3.8.4
+Standards-Version: 3.9.8
 Homepage: http://www.kernel.org/
 EOF
 
@@ -296,7 +296,6 @@ if [ "$ARCH" = "um" ]; then
 	cat <<EOF >> debian/control
 
 Package: $packagename
-Provides: linux-image, linux-image-2.6, 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 +312,6 @@ else
 	cat <<EOF >> debian/control
 
 Package: $packagename
-Provides: linux-image, linux-image-2.6, linux-modules-$version
 Suggests: $fwpackagename
 Architecture: any
 Description: Linux kernel, version $version
@@ -346,7 +344,6 @@ rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
 cat <<EOF >> debian/control
 
 Package: $kernel_headers_packagename
-Provides: linux-headers, linux-headers-2.6
 Architecture: any
 Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
  This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
@@ -404,7 +401,6 @@ if [ -n "$BUILD_DEBUG" ] ; then
 
 Package: $dbg_packagename
 Section: debug
-Provides: linux-debug, linux-debug-$version
 Architecture: any
 Description: Linux kernel debugging symbols for $version
  This package will come in handy if you need to debug the kernel. It provides
-- 
2.1.4

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

[Timo Sigurdsson]

Hi,

riku.voipio@linaro.org schrieb am 15.09.2016 21:25:

> From: Riku Voipio <riku.voipio@linaro.org>
> 
> The builddeb script has some hardcoded references to Linux version 2.6
> which is ancient. Drop Provides as the virtual packages provided are not
> useful anymore. Leave the Provides for linux-kernel-headers, as someone
> might still be referring to it.

Looking at your patch, it seems you missed the linux-headers part ...

> 
> While at it, updated copyright date and standards version.
> 
> Cc: Timo Sigurdsson <public_timo.s@silentcreek.de>
> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
> ---
> scripts/package/builddeb | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 8ea9fd2..a7f8b99 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -265,7 +265,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
> @@ -288,7 +288,7 @@ Section: kernel
> Priority: optional
> Maintainer: $maintainer
> Build-Depends: $build_depends
> -Standards-Version: 3.8.4
> +Standards-Version: 3.9.8
> Homepage: http://www.kernel.org/
> EOF
> 
> @@ -296,7 +296,6 @@ if [ "$ARCH" = "um" ]; then
> 	cat <<EOF >> debian/control
> 
> Package: $packagename
> -Provides: linux-image, linux-image-2.6, 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 +312,6 @@ else
> 	cat <<EOF >> debian/control
> 
> Package: $packagename
> -Provides: linux-image, linux-image-2.6, linux-modules-$version
> Suggests: $fwpackagename
> Architecture: any
> Description: Linux kernel, version $version
> @@ -346,7 +344,6 @@ rm -f "$objtree/debian/hdrsrcfiles"
> "$objtree/debian/hdrobjfiles"
> cat <<EOF >> debian/control
> 
> Package: $kernel_headers_packagename
> -Provides: linux-headers, linux-headers-2.6

I guess, here you wanted to have:
+Provides: linux-headers

> Architecture: any
> Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
>  This package provides kernel header files for $KERNELRELEASE on
>  \${kernel:debarch}
> @@ -404,7 +401,6 @@ if [ -n "$BUILD_DEBUG" ] ; then
> 
> Package: $dbg_packagename
> Section: debug
> -Provides: linux-debug, linux-debug-$version
> Architecture: any
> Description: Linux kernel debugging symbols for $version
>  This package will come in handy if you need to debug the kernel. It provides
> -- 
> 2.1.4
> 

Regards,

Timo

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

[Riku Voipio]

On 15 September 2016 at 22:48, Timo Sigurdsson
<public_timo.s@silentcreek.de> wrote:
> Hi,
>
> riku.voipio@linaro.org schrieb am 15.09.2016 21:25:
>
>> From: Riku Voipio <riku.voipio@linaro.org>
>>
>> The builddeb script has some hardcoded references to Linux version 2.6
>> which is ancient. Drop Provides as the virtual packages provided are not
>> useful anymore. Leave the Provides for linux-kernel-headers, as someone
>> might still be referring to it.
>
> Looking at your patch, it seems you missed the linux-headers part ...

linux-kernel-headers != linux-headers. linux-kernel-headers is
provided by linux-libc-dev and actually used to be an package. Since I
don't touch what linux-libc-dev provides, it doesnt' appear in this
patch.

>> While at it, updated copyright date and standards version.
>>
>> Cc: Timo Sigurdsson <public_timo.s@silentcreek.de>
>> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
>> ---
>> scripts/package/builddeb | 8 ++------
>> 1 file changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>> index 8ea9fd2..a7f8b99 100755
>> --- a/scripts/package/builddeb
>> +++ b/scripts/package/builddeb
>> @@ -265,7 +265,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
>> @@ -288,7 +288,7 @@ Section: kernel
>> Priority: optional
>> Maintainer: $maintainer
>> Build-Depends: $build_depends
>> -Standards-Version: 3.8.4
>> +Standards-Version: 3.9.8
>> Homepage: http://www.kernel.org/
>> EOF
>>
>> @@ -296,7 +296,6 @@ if [ "$ARCH" = "um" ]; then
>>       cat <<EOF >> debian/control
>>
>> Package: $packagename
>> -Provides: linux-image, linux-image-2.6, 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 +312,6 @@ else
>>       cat <<EOF >> debian/control
>>
>> Package: $packagename
>> -Provides: linux-image, linux-image-2.6, linux-modules-$version
>> Suggests: $fwpackagename
>> Architecture: any
>> Description: Linux kernel, version $version
>> @@ -346,7 +344,6 @@ rm -f "$objtree/debian/hdrsrcfiles"
>> "$objtree/debian/hdrobjfiles"
>> cat <<EOF >> debian/control
>>
>> Package: $kernel_headers_packagename
>> -Provides: linux-headers, linux-headers-2.6
>
> I guess, here you wanted to have:
> +Provides: linux-headers

linux-headers is virtual package that hasn't been provided by official
packages for a while. So this is intentional.

>> Architecture: any
>> Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
>>  This package provides kernel header files for $KERNELRELEASE on
>>  \${kernel:debarch}
>> @@ -404,7 +401,6 @@ if [ -n "$BUILD_DEBUG" ] ; then
>>
>> Package: $dbg_packagename
>> Section: debug
>> -Provides: linux-debug, linux-debug-$version
>> Architecture: any
>> Description: Linux kernel debugging symbols for $version
>>  This package will come in handy if you need to debug the kernel. It provides
>> --
>> 2.1.4
>>
>
> Regards,
>
> Timo

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

[Timo Sigurdsson]

Hi,

Riku Voipio schrieb am 16.09.2016 12:59:

> On 15 September 2016 at 22:48, Timo Sigurdsson
> <public_timo.s@silentcreek.de> wrote:
>> Hi,
>>
>> riku.voipio@linaro.org schrieb am 15.09.2016 21:25:
>>
>>> From: Riku Voipio <riku.voipio@linaro.org>
>>>
>>> The builddeb script has some hardcoded references to Linux version 2.6
>>> which is ancient. Drop Provides as the virtual packages provided are not
>>> useful anymore. Leave the Provides for linux-kernel-headers, as someone
>>> might still be referring to it.
>>
>> Looking at your patch, it seems you missed the linux-headers part ...
> 
> linux-kernel-headers != linux-headers. linux-kernel-headers is
> provided by linux-libc-dev and actually used to be an package. Since I
> don't touch what linux-libc-dev provides, it doesnt' appear in this
> patch.

Ooops. I see... Sorry for the noise!
> 
>>> While at it, updated copyright date and standards version.
>>>
>>> Cc: Timo Sigurdsson <public_timo.s@silentcreek.de>
>>> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
>>> ---
>>> scripts/package/builddeb | 8 ++------
>>> 1 file changed, 2 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>>> index 8ea9fd2..a7f8b99 100755
>>> --- a/scripts/package/builddeb
>>> +++ b/scripts/package/builddeb
>>> @@ -265,7 +265,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
>>> @@ -288,7 +288,7 @@ Section: kernel
>>> Priority: optional
>>> Maintainer: $maintainer
>>> Build-Depends: $build_depends
>>> -Standards-Version: 3.8.4
>>> +Standards-Version: 3.9.8
>>> Homepage: http://www.kernel.org/
>>> EOF
>>>
>>> @@ -296,7 +296,6 @@ if [ "$ARCH" = "um" ]; then
>>>       cat <<EOF >> debian/control
>>>
>>> Package: $packagename
>>> -Provides: linux-image, linux-image-2.6, 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 +312,6 @@ else
>>>       cat <<EOF >> debian/control
>>>
>>> Package: $packagename
>>> -Provides: linux-image, linux-image-2.6, linux-modules-$version
>>> Suggests: $fwpackagename
>>> Architecture: any
>>> Description: Linux kernel, version $version
>>> @@ -346,7 +344,6 @@ rm -f "$objtree/debian/hdrsrcfiles"
>>> "$objtree/debian/hdrobjfiles"
>>> cat <<EOF >> debian/control
>>>
>>> Package: $kernel_headers_packagename
>>> -Provides: linux-headers, linux-headers-2.6
>>
>> I guess, here you wanted to have:
>> +Provides: linux-headers
> 
> linux-headers is virtual package that hasn't been provided by official
> packages for a while. So this is intentional.
> 
>>> Architecture: any
>>> Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
>>>  This package provides kernel header files for $KERNELRELEASE on
>>>  \${kernel:debarch}
>>> @@ -404,7 +401,6 @@ if [ -n "$BUILD_DEBUG" ] ; then
>>>
>>> Package: $dbg_packagename
>>> Section: debug
>>> -Provides: linux-debug, linux-debug-$version
>>> Architecture: any
>>> Description: Linux kernel debugging symbols for $version
>>>  This package will come in handy if you need to debug the kernel. It provides
>>> --
>>> 2.1.4

Regards,

Timo

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

[Riku Voipio]

Hi

On 16 September 2016 at 14:41, Timo Sigurdsson
<public_timo.s@silentcreek.de> wrote:
>> On 15 September 2016 at 22:48, Timo Sigurdsson
>> <public_timo.s@silentcreek.de> wrote:
>>> Hi,
>>>
>>> riku.voipio@linaro.org schrieb am 15.09.2016 21:25:
>>>
>>>> From: Riku Voipio <riku.voipio@linaro.org>
>>>>
>>>> The builddeb script has some hardcoded references to Linux version 2.6
>>>> which is ancient. Drop Provides as the virtual packages provided are not
>>>> useful anymore. Leave the Provides for linux-kernel-headers, as someone
>>>> might still be referring to it.
>>>
>>> Looking at your patch, it seems you missed the linux-headers part ...
>>
>> linux-kernel-headers != linux-headers. linux-kernel-headers is
>> provided by linux-libc-dev and actually used to be an package. Since I
>> don't touch what linux-libc-dev provides, it doesnt' appear in this
>> patch.
>
> Ooops. I see... Sorry for the noise!

Did this patch miss the 4.10 window?

Riku

>>>> While at it, updated copyright date and standards version.
>>>>
>>>> Cc: Timo Sigurdsson <public_timo.s@silentcreek.de>
>>>> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
>>>> ---
>>>> scripts/package/builddeb | 8 ++------
>>>> 1 file changed, 2 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>>>> index 8ea9fd2..a7f8b99 100755
>>>> --- a/scripts/package/builddeb
>>>> +++ b/scripts/package/builddeb
>>>> @@ -265,7 +265,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
>>>> @@ -288,7 +288,7 @@ Section: kernel
>>>> Priority: optional
>>>> Maintainer: $maintainer
>>>> Build-Depends: $build_depends
>>>> -Standards-Version: 3.8.4
>>>> +Standards-Version: 3.9.8
>>>> Homepage: http://www.kernel.org/
>>>> EOF
>>>>
>>>> @@ -296,7 +296,6 @@ if [ "$ARCH" = "um" ]; then
>>>>       cat <<EOF >> debian/control
>>>>
>>>> Package: $packagename
>>>> -Provides: linux-image, linux-image-2.6, 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 +312,6 @@ else
>>>>       cat <<EOF >> debian/control
>>>>
>>>> Package: $packagename
>>>> -Provides: linux-image, linux-image-2.6, linux-modules-$version
>>>> Suggests: $fwpackagename
>>>> Architecture: any
>>>> Description: Linux kernel, version $version
>>>> @@ -346,7 +344,6 @@ rm -f "$objtree/debian/hdrsrcfiles"
>>>> "$objtree/debian/hdrobjfiles"
>>>> cat <<EOF >> debian/control
>>>>
>>>> Package: $kernel_headers_packagename
>>>> -Provides: linux-headers, linux-headers-2.6
>>>
>>> I guess, here you wanted to have:
>>> +Provides: linux-headers
>>
>> linux-headers is virtual package that hasn't been provided by official
>> packages for a while. So this is intentional.
>>
>>>> Architecture: any
>>>> Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
>>>>  This package provides kernel header files for $KERNELRELEASE on
>>>>  \${kernel:debarch}
>>>> @@ -404,7 +401,6 @@ if [ -n "$BUILD_DEBUG" ] ; then
>>>>
>>>> Package: $dbg_packagename
>>>> Section: debug
>>>> -Provides: linux-debug, linux-debug-$version
>>>> Architecture: any
>>>> Description: Linux kernel debugging symbols for $version
>>>>  This package will come in handy if you need to debug the kernel. It provides
>>>> --
>>>> 2.1.4
>
> Regards,
>
> Timo
>