| Message ID | 20240704152400.1527619-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kbuild: deb-pkg: use default string when variable is unset or null | expand |
On Fri, Jul 05, 2024 at 12:23:32AM +0900, Masahiro Yamada wrote: > ${DEBFULLNAME-${user}} falls back to ${user} when DEBFULLNAME is unset. > It is more reasonable to do so when DEBFULLNAME is unset or null. > > Otherwise, the command: > > $ DEBFULLNAME= make deb-pkg > > will leave the name field blank. > > The same applies to KBUILD_BUILD_USER and KBUILD_BUILD_HOST. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Yeah, it definitely does not really make sense to let someone do that, although I am not really sure why anyone would... Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > > scripts/package/mkdebian | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian > index 0cc1913aad30..196b14e8ad47 100755 > --- a/scripts/package/mkdebian > +++ b/scripts/package/mkdebian > @@ -125,12 +125,12 @@ gen_source () > rm -rf debian > mkdir debian > > -user=${KBUILD_BUILD_USER-$(id -nu)} > -name=${DEBFULLNAME-${user}} > +user=${KBUILD_BUILD_USER:-$(id -nu)} > +name=${DEBFULLNAME:-${user}} > if [ "${DEBEMAIL:+set}" ]; then > email=${DEBEMAIL} > else > - buildhost=${KBUILD_BUILD_HOST-$(hostname -f 2>/dev/null || hostname)} > + buildhost=${KBUILD_BUILD_HOST:-$(hostname -f 2>/dev/null || hostname)} > email="${user}@${buildhost}" > fi > maintainer="${name} <${email}>" > -- > 2.43.0 >
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 0cc1913aad30..196b14e8ad47 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -125,12 +125,12 @@ gen_source () rm -rf debian mkdir debian -user=${KBUILD_BUILD_USER-$(id -nu)} -name=${DEBFULLNAME-${user}} +user=${KBUILD_BUILD_USER:-$(id -nu)} +name=${DEBFULLNAME:-${user}} if [ "${DEBEMAIL:+set}" ]; then email=${DEBEMAIL} else - buildhost=${KBUILD_BUILD_HOST-$(hostname -f 2>/dev/null || hostname)} + buildhost=${KBUILD_BUILD_HOST:-$(hostname -f 2>/dev/null || hostname)} email="${user}@${buildhost}" fi maintainer="${name} <${email}>"
${DEBFULLNAME-${user}} falls back to ${user} when DEBFULLNAME is unset. It is more reasonable to do so when DEBFULLNAME is unset or null. Otherwise, the command: $ DEBFULLNAME= make deb-pkg will leave the name field blank. The same applies to KBUILD_BUILD_USER and KBUILD_BUILD_HOST. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/package/mkdebian | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)