Copy debian/copyright instead of generating it by the 'cat' command.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/package/debian/copyright | 16 ++++++++++++++++
 scripts/package/mkdebian         | 21 +--------------------
 2 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 scripts/package/debian/copyright

diff --git a/scripts/package/debian/copyright b/scripts/package/debian/copyright
new file mode 100644
index 000000000000..388a204b0b2b
--- /dev/null
+++ b/scripts/package/debian/copyright
@@ -0,0 +1,16 @@
+This is a packaged upstream version of the Linux kernel.
+
+The sources may be found at most Linux archive sites, including:
+https://www.kernel.org/pub/linux/kernel
+
+Copyright: 1991 - 2018 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
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 dated June, 1991.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index c1a36da85e84..91f0e09600b1 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -188,26 +188,6 @@ $sourcename ($packageversion) $distribution; urgency=low
  -- $maintainer  $(date -R)
 EOF
 
-# Generate copyright file
-cat <<EOF > debian/copyright
-This is a packaged upstream version of the Linux kernel.
-
-The sources may be found at most Linux archive sites, including:
-https://www.kernel.org/pub/linux/kernel
-
-Copyright: 1991 - 2018 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
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; version 2 dated June, 1991.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License version 2 can be found in \`/usr/share/common-licenses/GPL-2'.
-EOF
-
 # Generate a control file
 cat <<EOF > debian/control
 Source: $sourcename
@@ -268,6 +248,7 @@ ARCH := ${ARCH}
 KERNELRELEASE := ${KERNELRELEASE}
 EOF
 
+cp "${srctree}/scripts/package/debian/copyright" debian/
 cp "${srctree}/scripts/package/debian/rules" debian/
 
 exit 0
-- 
2.40.1

On Wed, Dec 20, 2023 at 12:40:49AM +0900, Masahiro Yamada wrote:
> Copy debian/copyright instead of generating it by the 'cat' command.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---

> Subject: Re: [PATCH] kbuild: deb-pkg: split debian/copyright

With 'split' in the patch summary I had expected something different;
but cp instead of cat seems quite reasonable.

Reviewed-by: Nicolas Schier <n.schier@avm.de>


> 
>  scripts/package/debian/copyright | 16 ++++++++++++++++
>  scripts/package/mkdebian         | 21 +--------------------
>  2 files changed, 17 insertions(+), 20 deletions(-)
>  create mode 100644 scripts/package/debian/copyright
> 
> diff --git a/scripts/package/debian/copyright b/scripts/package/debian/copyright
> new file mode 100644
> index 000000000000..388a204b0b2b
> --- /dev/null
> +++ b/scripts/package/debian/copyright
> @@ -0,0 +1,16 @@
> +This is a packaged upstream version of the Linux kernel.
> +
> +The sources may be found at most Linux archive sites, including:
> +https://www.kernel.org/pub/linux/kernel
> +
> +Copyright: 1991 - 2018 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
> +
> +    This program is free software; you can redistribute it and/or modify
> +    it under the terms of the GNU General Public License as published by
> +    the Free Software Foundation; version 2 dated June, 1991.
> +
> +On Debian GNU/Linux systems, the complete text of the GNU General Public
> +License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
> index c1a36da85e84..91f0e09600b1 100755
> --- a/scripts/package/mkdebian
> +++ b/scripts/package/mkdebian
> @@ -188,26 +188,6 @@ $sourcename ($packageversion) $distribution; urgency=low
>   -- $maintainer  $(date -R)
>  EOF
>  
> -# Generate copyright file
> -cat <<EOF > debian/copyright
> -This is a packaged upstream version of the Linux kernel.
> -
> -The sources may be found at most Linux archive sites, including:
> -https://www.kernel.org/pub/linux/kernel
> -
> -Copyright: 1991 - 2018 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
> -
> -    This program is free software; you can redistribute it and/or modify
> -    it under the terms of the GNU General Public License as published by
> -    the Free Software Foundation; version 2 dated June, 1991.
> -
> -On Debian GNU/Linux systems, the complete text of the GNU General Public
> -License version 2 can be found in \`/usr/share/common-licenses/GPL-2'.
> -EOF
> -
>  # Generate a control file
>  cat <<EOF > debian/control
>  Source: $sourcename
> @@ -268,6 +248,7 @@ ARCH := ${ARCH}
>  KERNELRELEASE := ${KERNELRELEASE}
>  EOF
>  
> +cp "${srctree}/scripts/package/debian/copyright" debian/
>  cp "${srctree}/scripts/package/debian/rules" debian/
>  
>  exit 0
> -- 
> 2.40.1
> 

On Fri, Dec 22, 2023 at 9:52 PM Nicolas Schier <n.schier@avm.de> wrote:
>
> On Wed, Dec 20, 2023 at 12:40:49AM +0900, Masahiro Yamada wrote:
> > Copy debian/copyright instead of generating it by the 'cat' command.
> >
> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > ---
>
> > Subject: Re: [PATCH] kbuild: deb-pkg: split debian/copyright
>
> With 'split' in the patch summary I had expected something different;
> but cp instead of cat seems quite reasonable.


For clarification, I will reword the subject to

"kbuild: deb-pkg: split debian/copyright from the mkdebian script"


Thanks.







-- 
Best Regards
Masahiro Yamada