Skip to contentSkip to conversation

kbuild: deb-pkg: split debian/copyright

PATCH In review Masahiro Yamada 2 participants 4 messages Dec 19, 2023 – Dec 23, 2023 1 message not in the archive Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: deb-pkg: split debian/copyright

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

---

 scripts/package/debian/copyright | 16 ++++++++++++++++
 scripts/package/mkdebian         | 21 +--------------------
 2 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 scripts/package/debian/copyright
scripts/package/debian/copyright new file +16 -0
new file mode 100644
index 000000000000..388a204b0b2b
@@ -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'.
scripts/package/mkdebian +1 -20
index c1a36da85e84..91f0e09600b1 100755
@@ -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
Signature · 1 line
2.40.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Masahiro Yamada

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

---

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.

Quoted 70 lines
 scripts/package/debian/copyright | 16 ++++++++++++++++
 scripts/package/mkdebian         | 21 +--------------------
 2 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 scripts/package/debian/copyright
scripts/package/debian/copyright new file +16 -0
new file mode 100644
index 000000000000..388a204b0b2b
@@ -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'.
scripts/package/mkdebian +1 -20
index c1a36da85e84..91f0e09600b1 100755
@@ -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
Signature · 1 line
2.40.1
#2 lore raw
Quoted 11 lines · Nicolas Schier
Quoted 6 lines · Masahiro Yamada

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

---

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.

Signature · 2 lines
Best Regards
Masahiro Yamada

A message that is not in the archive (sent off-list or not yet received): CA+icZUXKMfzecJgrSzw7smNm8kN6V28VouNLT0H0-qtedB4ZGw@mail.gmail.com

#4 lore raw
Quoted 45 lines · Sedat Dilek

Masahiro Yamada <[email protected]> schrieb am Di., 19. Dez. 2023, 16:41:

Quoted 41 lines

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

---

 scripts/package/debian/copyright | 16 ++++++++++++++++
 scripts/package/mkdebian         | 21 +--------------------
 2 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 scripts/package/debian/copyright
scripts/package/debian/copyright new file +16 -0
new file mode 100644
index 000000000000..388a204b0b2b
@@ -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'.
scripts/package/mkdebian +0 -0
index c1a36da85e84..91f0e09600b1 100755
@@ -188,26 +188,6 @@ $sourcename ($packageversion) $distribution; urgency=low
  -- $maintainer  $(date -R)
 EOF
 
Quoted 13 lines

scripts/package/mkdebian $sourcename ($packageversion) $distribution; urgency=low · line 199

Quoted 9 lines
scripts/package/mkdebian +0 -9
-# 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.
-

Can you update to 2023 while at it?
Thanks.

OK, I will do so.

Thanks.

Signature · 2 lines
Best Regards
Masahiro Yamada