From: Masahiro Yamada <masahiroy@kernel.org>
Date: Tue, 2 Jul 2024 18:02:40 +0000 (+0900)
Subject: kbuild: deb-pkg: remove support for EMAIL environment variable
X-Git-Tag: v6.11-rc1~62^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6276761955817fd8259093a6e6a9ad88ab466b21;p=thirdparty%2Fkernel%2Fstable.git

kbuild: deb-pkg: remove support for EMAIL environment variable

Commit edec611db047 ("kbuild, deb-pkg: improve maintainer
identification") added the EMAIL and NAME environment variables.

Commit d5940c60e057 ("kbuild: deb-pkg improve maintainer address
generation") removed support for NAME, but kept support for EMAIL.

The EMAIL and NAME environment variables are supported by some tools
(see 'man debchange'), but not by all.

We should support both of them, or neither of them. We should not stop
halfway.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
---

diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index b9a5b789c6552..589f92b88c422 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -125,7 +125,7 @@ gen_source ()
 rm -rf debian
 mkdir debian
 
-email=${DEBEMAIL-$EMAIL}
+email=${DEBEMAIL}
 
 # use email string directly if it contains <email>
 if echo "${email}" | grep -q '<.*>'; then