| Message ID | 20220329021437.308790-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kbuild: fix empty ${PYTHON} in scripts/link-vmlinux.sh | expand |
On Mon, Mar 28, 2022 at 7:15 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > The two commits > > d8d2d38275c1 ("kbuild: remove PYTHON variable") > a8cccdd95473 ("init: lto: ensure initcall ordering") > > were applied in the same development cycle, in two different trees. > > After they were merged together, this ${PYTHON} expands to an empty > string. > > Therefore, ${srctree}/scripts/jobserver-exec is executed directly. > (it has the executable bit set) > > This is working but let's fix the code into the intended form. Thanks for the patch! Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > scripts/link-vmlinux.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh > index f704034ebbe6..20f44504a644 100755 > --- a/scripts/link-vmlinux.sh > +++ b/scripts/link-vmlinux.sh > @@ -50,7 +50,7 @@ gen_initcalls() > { > info GEN .tmp_initcalls.lds > > - ${PYTHON} ${srctree}/scripts/jobserver-exec \ > + ${PYTHON3} ${srctree}/scripts/jobserver-exec \ > ${PERL} ${srctree}/scripts/generate_initcall_order.pl \ > ${KBUILD_VMLINUX_OBJS} ${KBUILD_VMLINUX_LIBS} \ > > .tmp_initcalls.lds > -- > 2.32.0 >
On Wed, Mar 30, 2022 at 5:17 AM Nick Desaulniers <ndesaulniers@google.com> wrote: > > On Mon, Mar 28, 2022 at 7:15 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > > > The two commits > > > > d8d2d38275c1 ("kbuild: remove PYTHON variable") > > a8cccdd95473 ("init: lto: ensure initcall ordering") > > > > were applied in the same development cycle, in two different trees. > > > > After they were merged together, this ${PYTHON} expands to an empty > > string. > > > > Therefore, ${srctree}/scripts/jobserver-exec is executed directly. > > (it has the executable bit set) > > > > This is working but let's fix the code into the intended form. > > Thanks for the patch! > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > Good catch. I was not aware that scripts/jobserver-exec was executable. Debian/unstable now switched to python v3.10.x as default "python3" and I will have this patch in my next series for testing. Thanks. Reviewed-by: Sedat Dilek <sedat.dilek@gmail.com> - Sedat - > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > --- > > > > scripts/link-vmlinux.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh > > index f704034ebbe6..20f44504a644 100755 > > --- a/scripts/link-vmlinux.sh > > +++ b/scripts/link-vmlinux.sh > > @@ -50,7 +50,7 @@ gen_initcalls() > > { > > info GEN .tmp_initcalls.lds > > > > - ${PYTHON} ${srctree}/scripts/jobserver-exec \ > > + ${PYTHON3} ${srctree}/scripts/jobserver-exec \ > > ${PERL} ${srctree}/scripts/generate_initcall_order.pl \ > > ${KBUILD_VMLINUX_OBJS} ${KBUILD_VMLINUX_LIBS} \ > > > .tmp_initcalls.lds > > -- > > 2.32.0 > > > > > -- > Thanks, > ~Nick Desaulniers
On Tue, Mar 29, 2022 at 11:15 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > The two commits > > d8d2d38275c1 ("kbuild: remove PYTHON variable") > a8cccdd95473 ("init: lto: ensure initcall ordering") > > were applied in the same development cycle, in two different trees. > > After they were merged together, this ${PYTHON} expands to an empty > string. > > Therefore, ${srctree}/scripts/jobserver-exec is executed directly. > (it has the executable bit set) > > This is working but let's fix the code into the intended form. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- Applied to linux-kbuild/fixes. > > scripts/link-vmlinux.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh > index f704034ebbe6..20f44504a644 100755 > --- a/scripts/link-vmlinux.sh > +++ b/scripts/link-vmlinux.sh > @@ -50,7 +50,7 @@ gen_initcalls() > { > info GEN .tmp_initcalls.lds > > - ${PYTHON} ${srctree}/scripts/jobserver-exec \ > + ${PYTHON3} ${srctree}/scripts/jobserver-exec \ > ${PERL} ${srctree}/scripts/generate_initcall_order.pl \ > ${KBUILD_VMLINUX_OBJS} ${KBUILD_VMLINUX_LIBS} \ > > .tmp_initcalls.lds > -- > 2.32.0 >
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index f704034ebbe6..20f44504a644 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -50,7 +50,7 @@ gen_initcalls() { info GEN .tmp_initcalls.lds - ${PYTHON} ${srctree}/scripts/jobserver-exec \ + ${PYTHON3} ${srctree}/scripts/jobserver-exec \ ${PERL} ${srctree}/scripts/generate_initcall_order.pl \ ${KBUILD_VMLINUX_OBJS} ${KBUILD_VMLINUX_LIBS} \ > .tmp_initcalls.lds
The two commits d8d2d38275c1 ("kbuild: remove PYTHON variable") a8cccdd95473 ("init: lto: ensure initcall ordering") were applied in the same development cycle, in two different trees. After they were merged together, this ${PYTHON} expands to an empty string. Therefore, ${srctree}/scripts/jobserver-exec is executed directly. (it has the executable bit set) This is working but let's fix the code into the intended form. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/link-vmlinux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)