فهرست منبع

kbuild, deb-pkg: improve maintainer identification

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" sounds nicer then "Kernel Compiler" if no name is found.

Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: Andres Salomon <dilinger@debian.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
maximilian attems 16 سال پیش
والد
کامیت
edec611db0
1فایلهای تغییر یافته به همراه19 افزوده شده و 3 حذف شده
  1. 19 3
      scripts/package/builddeb

+ 19 - 3
scripts/package/builddeb

@@ -95,14 +95,30 @@ EOF
 	chmod 755 "$tmpdir/DEBIAN/$script"
 	chmod 755 "$tmpdir/DEBIAN/$script"
 done
 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"
+fi
+maintainer="$name <$email>"
+
 # Generate a simple changelog template
 # Generate a simple changelog template
 cat <<EOF > debian/changelog
 cat <<EOF > debian/changelog
 linux ($packageversion) unstable; urgency=low
 linux ($packageversion) unstable; urgency=low
 
 
   * Custom built Linux kernel.
   * Custom built Linux kernel.
 
 
- -- $name  $(date -R)
+ -- $maintainer  $(date -R)
 EOF
 EOF
 
 
 # Generate copyright file
 # Generate copyright file
@@ -130,7 +146,7 @@ cat <<EOF > debian/control
 Source: linux
 Source: linux
 Section: base
 Section: base
 Priority: optional
 Priority: optional
-Maintainer: $name
+Maintainer: $maintainer
 Standards-Version: 3.6.1
 Standards-Version: 3.6.1
 EOF
 EOF