| Message ID | 20180423195055.26069-1-malat@debian.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 23 April 2018 at 22:50, Mathieu Malaterre <malat@debian.org> wrote: > Be nice to the user and check env vars KBUILD_BUILD_USER & > KBUILD_BUILD_HOST when those are set. mkdebian sets the maintainer address as "$name <$email>", but this patch only sets the email part. I also wonder about the precedence, I think KBUILD_* should be considered over the generic Debian variables. Riku > Signed-off-by: Mathieu Malaterre <malat@debian.org> > --- > scripts/package/mkdebian | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian > index 6adb3a16ba3b..05d58d3ae8a0 100755 > --- a/scripts/package/mkdebian > +++ b/scripts/package/mkdebian > @@ -76,6 +76,8 @@ if [ -n "$DEBEMAIL" ]; then > email=$DEBEMAIL > elif [ -n "$EMAIL" ]; then > email=$EMAIL > +elif [ -n "$KBUILD_BUILD_USER" ] && [ -n "$KBUILD_BUILD_HOST" ]; then > + email=$KBUILD_BUILD_USER@$KBUILD_BUILD_HOST > else > email=$(id -nu)@$(hostname -f 2>/dev/null || hostname) > fi > -- > 2.11.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2018-05-02 20:30 GMT+09:00 Riku Voipio <riku.voipio@linaro.org>: > On 23 April 2018 at 22:50, Mathieu Malaterre <malat@debian.org> wrote: >> Be nice to the user and check env vars KBUILD_BUILD_USER & >> KBUILD_BUILD_HOST when those are set. > > mkdebian sets the maintainer address as "$name <$email>", but this > patch only sets the email part. I also wonder about the precedence, I > think KBUILD_* should be considered over the generic Debian variables. How come? If you see scripts/mkcompile_h, KBUILD_BUILD_USER and KBUILD_BUILD_HOST are used for overriding 'whoami' and 'hostname', respectively. So, I think it is reasonable to put email=$KBUILD_BUILD_USER@$KBUILD_BUILD_HOST over email=$(id -nu)@$(hostname -f 2>/dev/null || hostname) But, it is questionable to put it even over $DEBEMAIL. I think the intention of this patch is to support another (a bit better) fallback in case DEBEMAIL is not set. > Riku > >> Signed-off-by: Mathieu Malaterre <malat@debian.org> >> --- >> scripts/package/mkdebian | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian >> index 6adb3a16ba3b..05d58d3ae8a0 100755 >> --- a/scripts/package/mkdebian >> +++ b/scripts/package/mkdebian >> @@ -76,6 +76,8 @@ if [ -n "$DEBEMAIL" ]; then >> email=$DEBEMAIL >> elif [ -n "$EMAIL" ]; then >> email=$EMAIL >> +elif [ -n "$KBUILD_BUILD_USER" ] && [ -n "$KBUILD_BUILD_HOST" ]; then >> + email=$KBUILD_BUILD_USER@$KBUILD_BUILD_HOST >> else >> email=$(id -nu)@$(hostname -f 2>/dev/null || hostname) >> fi >> -- >> 2.11.0 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > -- > To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 2, 2018 at 1:30 PM, Riku Voipio <riku.voipio@linaro.org> wrote: > On 23 April 2018 at 22:50, Mathieu Malaterre <malat@debian.org> wrote: >> Be nice to the user and check env vars KBUILD_BUILD_USER & >> KBUILD_BUILD_HOST when those are set. > > mkdebian sets the maintainer address as "$name <$email>", but this > patch only sets the email part. I also wonder about the precedence, I > think KBUILD_* should be considered over the generic Debian variables. I simply tried to re-use the KBUILD_* env vars whenever possible. This did made sense, since: $ dmesg|grep debian ~ [ 0.000000] Linux version 4.14.0-0.bpo.3-amd64 (debian-kernel@lists.debian.org) (gcc version 6.3.0 20170516 (Debian 6.3.0-18)) #1 SMP Debian 4.14.13-1~bpo9+1 (2018-01-14) and $ apt-cache show linux-image-amd64| grep Main ~ Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org> I do not believe this should take precedence over DEBEMAIL. > Riku > >> Signed-off-by: Mathieu Malaterre <malat@debian.org> >> --- >> scripts/package/mkdebian | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian >> index 6adb3a16ba3b..05d58d3ae8a0 100755 >> --- a/scripts/package/mkdebian >> +++ b/scripts/package/mkdebian >> @@ -76,6 +76,8 @@ if [ -n "$DEBEMAIL" ]; then >> email=$DEBEMAIL >> elif [ -n "$EMAIL" ]; then >> email=$EMAIL >> +elif [ -n "$KBUILD_BUILD_USER" ] && [ -n "$KBUILD_BUILD_HOST" ]; then >> + email=$KBUILD_BUILD_USER@$KBUILD_BUILD_HOST >> else >> email=$(id -nu)@$(hostname -f 2>/dev/null || hostname) >> fi >> -- >> 2.11.0 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 2, 2018 at 9:27 PM, Mathieu Malaterre <malat@debian.org> wrote: > On Wed, May 2, 2018 at 1:30 PM, Riku Voipio <riku.voipio@linaro.org> wrote: >> On 23 April 2018 at 22:50, Mathieu Malaterre <malat@debian.org> wrote: >>> Be nice to the user and check env vars KBUILD_BUILD_USER & >>> KBUILD_BUILD_HOST when those are set. >> >> mkdebian sets the maintainer address as "$name <$email>", but this >> patch only sets the email part. I also wonder about the precedence, I >> think KBUILD_* should be considered over the generic Debian variables. > > I simply tried to re-use the KBUILD_* env vars whenever possible. This > did made sense, since: > > $ dmesg|grep debian > ~ > [ 0.000000] Linux version 4.14.0-0.bpo.3-amd64 > (debian-kernel@lists.debian.org) (gcc version 6.3.0 20170516 (Debian > 6.3.0-18)) #1 SMP Debian 4.14.13-1~bpo9+1 (2018-01-14) > > and > > $ apt-cache show linux-image-amd64| grep Main > ~ > Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org> > > I do not believe this should take precedence over DEBEMAIL. It seems that the env var DEBEMAIL is now accepting a new syntax (at least I was not aware of this syntax): https://manpages.debian.org/unstable/devscripts/dch.1.en.html [...]If the environment variable DEBEMAIL is set, this will be used for the email address. If this variable has the form "name <email>", then the maintainer name will also be taken from here[...] I'll send a v2 that check DEBEMAIL does not contains '<>'. >> Riku >> >>> Signed-off-by: Mathieu Malaterre <malat@debian.org> >>> --- >>> scripts/package/mkdebian | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian >>> index 6adb3a16ba3b..05d58d3ae8a0 100755 >>> --- a/scripts/package/mkdebian >>> +++ b/scripts/package/mkdebian >>> @@ -76,6 +76,8 @@ if [ -n "$DEBEMAIL" ]; then >>> email=$DEBEMAIL >>> elif [ -n "$EMAIL" ]; then >>> email=$EMAIL >>> +elif [ -n "$KBUILD_BUILD_USER" ] && [ -n "$KBUILD_BUILD_HOST" ]; then >>> + email=$KBUILD_BUILD_USER@$KBUILD_BUILD_HOST >>> else >>> email=$(id -nu)@$(hostname -f 2>/dev/null || hostname) >>> fi >>> -- >>> 2.11.0 >>> >>> -- >>> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in >>> the body of a message to majordomo@vger.kernel.org >>> More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 6adb3a16ba3b..05d58d3ae8a0 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -76,6 +76,8 @@ if [ -n "$DEBEMAIL" ]; then email=$DEBEMAIL elif [ -n "$EMAIL" ]; then email=$EMAIL +elif [ -n "$KBUILD_BUILD_USER" ] && [ -n "$KBUILD_BUILD_HOST" ]; then + email=$KBUILD_BUILD_USER@$KBUILD_BUILD_HOST else email=$(id -nu)@$(hostname -f 2>/dev/null || hostname) fi
Be nice to the user and check env vars KBUILD_BUILD_USER & KBUILD_BUILD_HOST when those are set. Signed-off-by: Mathieu Malaterre <malat@debian.org> --- scripts/package/mkdebian | 2 ++ 1 file changed, 2 insertions(+)