[PATCH] scripts/package: add back 'version' for builddeb

[PATCH] scripts/package: add back 'version' for builddeb

[David Wang]

Fixes: 36862e14e316 (kbuild: deb-pkg: use dh_listpackages to know
enabled packages)
The 'version' variable is still needed for building
debian 'linux-headers' packages, add it back.

Signed-off-by: David Wang <00107082@163.com>
---
 scripts/package/builddeb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index c5ae57167d7c..5102d0903f9c 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -215,6 +215,7 @@ install_libc_headers () {
 
 rm -f debian/files
 
+version=$KERNELRELEASE
 packages_enabled=$(dh_listpackages)
 
 for package in ${packages_enabled}
-- 
2.20.1

Re: [PATCH] scripts/package: add back 'version' for builddeb

[Bagas Sanjaya]

On 3/20/23 18:08, David Wang wrote:
> Fixes: 36862e14e316 (kbuild: deb-pkg: use dh_listpackages to know
> enabled packages)
> The 'version' variable is still needed for building
> debian 'linux-headers' packages, add it back.
> 
> Signed-off-by: David Wang <00107082@163.com>
> ---
>  scripts/package/builddeb | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index c5ae57167d7c..5102d0903f9c 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -215,6 +215,7 @@ install_libc_headers () {
>  
>  rm -f debian/files
>  
> +version=$KERNELRELEASE
>  packages_enabled=$(dh_listpackages)
>  
>  for package in ${packages_enabled}

Hi,

Again, your patch looks like corrupted (tabs converted to spaces).
Please resubmit; this time; generate the patch via git-format-patch(1)
and then send the resulting patch with git-send-email(1).

Thanks.

-- 
An old man doll... just what I always wanted! - Clara

Re:Re: [PATCH] scripts/package: add back 'version' for builddeb

[David Wang]

>
>Again, your patch looks like corrupted (tabs converted to spaces).
>Please resubmit; this time; generate the patch via git-format-patch(1)
>and then send the resulting patch with git-send-email(1).
>
>Thanks.
>
I did use `git format-patch` and `git send-email`, but I did not run scripts/checkpatch.pl.
Now when I run scripts/checkpatch.pl against the file generated by `git format-patch`, it shows a warning about "Fixes:" tag, and
I have resend a patch which pass the checks of scripts/checkpatch.pl, hope this time it could be ok.

```
$ scripts/checkpatch.pl 0001-scripts-package-add-back-version-for-builddeb.patch
total: 0 errors, 0 warnings, 7 lines checked

0001-scripts-package-add-back-version-for-builddeb.patch has no obvious style problems and is ready for submission.
```


David

Re: [PATCH] scripts/package: add back 'version' for builddeb

[Bagas Sanjaya]

On 3/21/23 22:20, David Wang wrote:
> 
>>
>> Again, your patch looks like corrupted (tabs converted to spaces).
>> Please resubmit; this time; generate the patch via git-format-patch(1)
>> and then send the resulting patch with git-send-email(1).
>>
>> Thanks.
>>
> I did use `git format-patch` and `git send-email`, but I did not run scripts/checkpatch.pl.
> Now when I run scripts/checkpatch.pl against the file generated by `git format-patch`, it shows a warning about "Fixes:" tag, and
> I have resend a patch which pass the checks of scripts/checkpatch.pl, hope this time it could be ok.
> 
> ```
> $ scripts/checkpatch.pl 0001-scripts-package-add-back-version-for-builddeb.patch
> total: 0 errors, 0 warnings, 7 lines checked
> 
> 0001-scripts-package-add-back-version-for-builddeb.patch has no obvious style problems and is ready for submission.
> ```
> 
> 
> David

OK, but there is already the similar fix submitted at [1]. Please test it.

Thanks anyway.

[1]: https://lore.kernel.org/linux-kbuild/3351f907cfd0b5d8372e858a8ec9065cc2bd91df.1679434718.git.kevin@kevinlocke.name/

-- 
An old man doll... just what I always wanted! - Clara

Re: [PATCH] scripts/package: add back 'version' for builddeb

[Bagas Sanjaya]

On 3/22/23 10:35, Bagas Sanjaya wrote:
> OK, but there is already the similar fix submitted at [1]. Please test it.
> 
> Thanks anyway.
> 
> [1]: https://lore.kernel.org/linux-kbuild/3351f907cfd0b5d8372e858a8ec9065cc2bd91df.1679434718.git.kevin@kevinlocke.name/
> 

Oops, the fix is already applied at [1].

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=fixes&id=3ced71d273f8edf07bf01a831a49ca6b988e06b3

-- 
An old man doll... just what I always wanted! - Clara

Re:Re: [PATCH] scripts/package: add back 'version' for builddeb

[David Wang]

At 2023-03-22 11:37:45, "Bagas Sanjaya" <bagasdotme@gmail.com> wrote:
>On 3/22/23 10:35, Bagas Sanjaya wrote:
>> OK, but there is already the similar fix submitted at [1]. Please test it.
>> 
>> Thanks anyway.
>> 
>> [1]: https://lore.kernel.org/linux-kbuild/3351f907cfd0b5d8372e858a8ec9065cc2bd91df.1679434718.git.kevin@kevinlocke.name/
>> 
>
>Oops, the fix is already applied at [1].
>
>[1]: https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=fixes&id=3ced71d273f8edf07bf01a831a49ca6b988e06b3
>
>-- 
>An old man doll... just what I always wanted! - Clara


It's OK, glad to know it will be fixed in the next rc.

David

[PATCH] scripts/package: add back 'version' for builddeb

[David Wang]

Fixes: 36862e14e316 ("kbuild: deb-pkg: use dh_listpackages to know enabled packages")
The 'version' variable is still needed for building
debian 'linux-headers' packages, add it back.

Signed-off-by: David Wang <00107082@163.com>
---
 scripts/package/builddeb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index c5ae57167d7c..5102d0903f9c 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -215,6 +215,7 @@ install_libc_headers () {
 
 rm -f debian/files
 
+version=$KERNELRELEASE
 packages_enabled=$(dh_listpackages)
 
 for package in ${packages_enabled}
-- 
2.20.1