Linux-KBuild Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 1/7] deb-pkg: Beautify changelog
@ 2009-03-31 15:19 maximilian attems
  2009-03-31 15:19 ` [PATCH 2/7] deb-pkg: Fix Provides field maximilian attems
  0 siblings, 1 reply; 7+ messages in thread
From: maximilian attems @ 2009-03-31 15:19 UTC (permalink / raw)
  To: linux-kbuild; +Cc: sam, akpm, maximilian attems, Andres Salomon

Try harder to find email and maintainer name.
Debian's own devscripts all use DEBEMAIL or DEBFULLNAME
prior to an eventual EMAIL or NAME environment variable.
Match their logic.

"Anonymous Maintainer" sounds nicer then Kernel compiler
if no name is found. As bonus add more descriptive changelog
entry.

Cc: Andres Salomon <dilinger@debian.org>
Signed-off-by: maximilian attems <max@stro.at>
---
 scripts/package/builddeb |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 1264b8e..dd61591 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -66,14 +66,29 @@ EOF
 	chmod 755 "$tmpdir/DEBIAN/$script"
 done
 
-name="Kernel Compiler <$(id -nu)@$(hostname -f)>"
+# Try to determine maintainer and email values
+if [ -n "${DEBEMAIL}" ]; then
+	email=${DEBEMAIL}
+elif [ -n "${EMAIL}" ]; then
+	email=${EMAIL}
+else
+	email=$(id -nu)@$(hostname -f)
+fi
+if [ -n "${DEBFULLNAME}" ]; then
+	name=${DEBFULLNAME}
+elif [ -n "${NAME}" ]; then
+	name=${NAME}
+else
+	name="Anonymous Maintainer"
+fi
+maintainer="${name} <${email}>"
 # Generate a simple changelog template
 cat <<EOF > debian/changelog
 linux ($version-$revision) unstable; urgency=low
 
-  * A standard release
+  * New upstream release
 
- -- $name  $(date -R)
+ -- ${maintainer}  $(date -R)
 EOF
 
 # Generate a control file
@@ -83,7 +98,7 @@ cat <<EOF > debian/control
 Source: linux
 Section: base
 Priority: optional
-Maintainer: $name
+Maintainer: $maintainer
 Standards-Version: 3.6.1
 
 Package: $packagename
@@ -105,7 +120,7 @@ cat <<EOF > debian/control
 Source: linux
 Section: base
 Priority: optional
-Maintainer: $name
+Maintainer: $maintainer
 Standards-Version: 3.6.1
 
 Package: $packagename
-- 
1.6.2.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/7] deb-pkg: Fix Provides field
  2009-03-31 15:19 [PATCH 1/7] deb-pkg: Beautify changelog maximilian attems
@ 2009-03-31 15:19 ` maximilian attems
  2009-03-31 15:19   ` [PATCH 3/7] deb-pkg: bump standards version maximilian attems
  0 siblings, 1 reply; 7+ messages in thread
From: maximilian attems @ 2009-03-31 15:19 UTC (permalink / raw)
  To: linux-kbuild; +Cc: sam, akpm, maximilian attems, Andres Salomon

kernel-image naming has been dropped for the Lenny release
and was only transitional for Etch.

as it builds modules it provides linux-modules-$version

Cc: Andres Salomon <dilinger@debian.org>
Signed-off-by: maximilian attems <max@stro.at>
---
 scripts/package/builddeb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index dd61591..f5c8fa6 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -102,7 +102,7 @@ Maintainer: $maintainer
 Standards-Version: 3.6.1
 
 Package: $packagename
-Provides: kernel-image-$version, linux-image-$version
+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
@@ -124,7 +124,7 @@ Maintainer: $maintainer
 Standards-Version: 3.6.1
 
 Package: $packagename
-Provides: kernel-image-$version, linux-image-$version
+Provides: linux-image, linux-image-2.6, linux-modules-$version
 Suggests: $fwpackagename
 Architecture: any
 Description: Linux kernel, version $version
-- 
1.6.2.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 3/7] deb-pkg: bump standards version
  2009-03-31 15:19 ` [PATCH 2/7] deb-pkg: Fix Provides field maximilian attems
@ 2009-03-31 15:19   ` maximilian attems
  2009-03-31 15:19     ` [PATCH 4/7] deb-pkg: Fix Section and Source field maximilian attems
  0 siblings, 1 reply; 7+ messages in thread
From: maximilian attems @ 2009-03-31 15:19 UTC (permalink / raw)
  To: linux-kbuild; +Cc: sam, akpm, maximilian attems

Latest Debian policy is 3.8.1.
Even if we are not yet compliant to it strive for the latest.

Acked-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: maximilian attems <max@stro.at>
---
 scripts/package/builddeb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index f5c8fa6..35f972b 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -99,7 +99,7 @@ Source: linux
 Section: base
 Priority: optional
 Maintainer: $maintainer
-Standards-Version: 3.6.1
+Standards-Version: 3.8.1
 
 Package: $packagename
 Provides: linux-image, linux-image-2.6, linux-modules-$version
@@ -121,7 +121,7 @@ Source: linux
 Section: base
 Priority: optional
 Maintainer: $maintainer
-Standards-Version: 3.6.1
+Standards-Version: 3.8.1
 
 Package: $packagename
 Provides: linux-image, linux-image-2.6, linux-modules-$version
-- 
1.6.2.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 4/7] deb-pkg: Fix Section and Source field
  2009-03-31 15:19   ` [PATCH 3/7] deb-pkg: bump standards version maximilian attems
@ 2009-03-31 15:19     ` maximilian attems
  2009-03-31 15:19       ` [PATCH 5/7] deb-pkg: Generate a debian/copyright maximilian attems
  0 siblings, 1 reply; 7+ messages in thread
From: maximilian attems @ 2009-03-31 15:19 UTC (permalink / raw)
  To: linux-kbuild; +Cc: sam, akpm, maximilian attems, Andres Salomon

Base section has been removed, the base is defined by Priority field.
Source is linux-2.6.

Cc: Andres Salomon <dilinger@debian.org>
Signed-off-by: maximilian attems <max@stro.at>
---
 scripts/package/builddeb |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 35f972b..9d21ec5 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -84,7 +84,7 @@ fi
 maintainer="${name} <${email}>"
 # Generate a simple changelog template
 cat <<EOF > debian/changelog
-linux ($version-$revision) unstable; urgency=low
+linux-2.6 ($version-$revision) unstable; urgency=low
 
   * New upstream release
 
@@ -95,8 +95,8 @@ EOF
 if [ "$ARCH" == "um" ]; then
 
 cat <<EOF > debian/control
-Source: linux
-Section: base
+Source: linux-2.6
+Section: admin
 Priority: optional
 Maintainer: $maintainer
 Standards-Version: 3.8.1
@@ -117,8 +117,8 @@ EOF
 
 else
 cat <<EOF > debian/control
-Source: linux
-Section: base
+Source: linux-2.6
+Section: admin
 Priority: optional
 Maintainer: $maintainer
 Standards-Version: 3.8.1
-- 
1.6.2.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 5/7] deb-pkg: Generate a debian/copyright
  2009-03-31 15:19     ` [PATCH 4/7] deb-pkg: Fix Section and Source field maximilian attems
@ 2009-03-31 15:19       ` maximilian attems
  2009-03-31 15:19         ` [PATCH 6/7] deb-pkg: Fix generated packagename maximilian attems
  0 siblings, 1 reply; 7+ messages in thread
From: maximilian attems @ 2009-03-31 15:19 UTC (permalink / raw)
  To: linux-kbuild; +Cc: sam, akpm, maximilian attems, Andres Salomon

add a basic debian/copyright to the binary package.

Cc: Andres Salomon <dilinger@debian.org>
Signed-off-by: maximilian attems <max@stro.at>
---
 scripts/package/builddeb |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 9d21ec5..c9ff47e 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -91,6 +91,26 @@ linux-2.6 ($version-$revision) unstable; urgency=low
  -- ${maintainer}  $(date -R)
 EOF
 
+# Generate copyright file
+cat <<EOF > debian/copyright
+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 - 2008 Linus Torvalds and others.
+
+see git history
+git://git.eu.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.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
 if [ "$ARCH" == "um" ]; then
 
-- 
1.6.2.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 6/7] deb-pkg: Fix generated packagename
  2009-03-31 15:19       ` [PATCH 5/7] deb-pkg: Generate a debian/copyright maximilian attems
@ 2009-03-31 15:19         ` maximilian attems
  2009-03-31 15:19           ` [PATCH 7/7] deb-pkg: generate changelog, copyright and control on demand maximilian attems
  0 siblings, 1 reply; 7+ messages in thread
From: maximilian attems @ 2009-03-31 15:19 UTC (permalink / raw)
  To: linux-kbuild; +Cc: sam, akpm, maximilian attems, Andres Salomon

The binary package that make deb-pkg creates is a linux-image.
To be fixed may also be the addition of $DEB_ARCH.

Cc: Andres Salomon <dilinger@debian.org>
Signed-off-by: maximilian attems <max@stro.at>
---
 scripts/package/builddeb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index c9ff47e..5be141a 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -16,7 +16,7 @@ version=$KERNELRELEASE
 revision=`cat .version`
 tmpdir="$objtree/debian/tmp"
 fwdir="$objtree/debian/fwtmp"
-packagename=linux-$version
+packagename=linux-image-$version
 fwpackagename=linux-firmware-image
 
 if [ "$ARCH" == "um" ] ; then
-- 
1.6.2.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 7/7] deb-pkg: generate changelog, copyright and control on demand
  2009-03-31 15:19         ` [PATCH 6/7] deb-pkg: Fix generated packagename maximilian attems
@ 2009-03-31 15:19           ` maximilian attems
  0 siblings, 0 replies; 7+ messages in thread
From: maximilian attems @ 2009-03-31 15:19 UTC (permalink / raw)
  To: linux-kbuild; +Cc: sam, akpm, maximilian attems, Andres Salomon

if one those files are already in place don't overwrite it.

Cc: Andres Salomon <dilinger@debian.org>
Signed-off-by: maximilian attems <max@stro.at>
---
 scripts/package/builddeb |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 5be141a..3d833a0 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -66,6 +66,10 @@ EOF
 	chmod 755 "$tmpdir/DEBIAN/$script"
 done
 
+[ -f debian/changelog ] || gen_changelog
+[ -f debian/copyright ] || gen_copyright
+[ -f debian/control ] || gen_control
+
 # Try to determine maintainer and email values
 if [ -n "${DEBEMAIL}" ]; then
 	email=${DEBEMAIL}
@@ -82,7 +86,10 @@ else
 	name="Anonymous Maintainer"
 fi
 maintainer="${name} <${email}>"
+
 # Generate a simple changelog template
+gen_changelog()
+{
 cat <<EOF > debian/changelog
 linux-2.6 ($version-$revision) unstable; urgency=low
 
@@ -90,8 +97,11 @@ linux-2.6 ($version-$revision) unstable; urgency=low
 
  -- ${maintainer}  $(date -R)
 EOF
+}
 
 # Generate copyright file
+gen_copyright()
+{
 cat <<EOF > debian/copyright
 This is a packacked upstream version of the Linux kernel.
 
@@ -110,8 +120,11 @@ git://git.eu.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 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
+gen_control()
+{
 if [ "$ARCH" == "um" ]; then
 
 cat <<EOF > debian/control
@@ -152,6 +165,7 @@ Description: Linux kernel, version $version
  files version $version
 EOF
 fi
+}
 
 # Fix some ownership and permissions
 chown -R root:root "$tmpdir"
-- 
1.6.2.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, back to index

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-31 15:19 [PATCH 1/7] deb-pkg: Beautify changelog maximilian attems
2009-03-31 15:19 ` [PATCH 2/7] deb-pkg: Fix Provides field maximilian attems
2009-03-31 15:19   ` [PATCH 3/7] deb-pkg: bump standards version maximilian attems
2009-03-31 15:19     ` [PATCH 4/7] deb-pkg: Fix Section and Source field maximilian attems
2009-03-31 15:19       ` [PATCH 5/7] deb-pkg: Generate a debian/copyright maximilian attems
2009-03-31 15:19         ` [PATCH 6/7] deb-pkg: Fix generated packagename maximilian attems
2009-03-31 15:19           ` [PATCH 7/7] deb-pkg: generate changelog, copyright and control on demand maximilian attems

Linux-KBuild Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-kbuild/0 linux-kbuild/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-kbuild linux-kbuild/ https://lore.kernel.org/linux-kbuild \
		linux-kbuild@vger.kernel.org
	public-inbox-index linux-kbuild

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kbuild


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git