package/linux-tools/linux-tool-perf.mk.in: Fix disabling of documentation
PATCH 1/1 package/linux-tools/linux-tool-perf.mk.in: Fix disabling of documentation
We are trying to not build the perf documentation. However, the hook being used to do so was named incorrectly. As a result, the build steps to disable the documentation were never executed.
Rename the hook from
LINUX_POST_PATCH_HOOKS
to
LINUX_TOOLS_POST_PATCH_HOOKS
to fix the issue.
--- package/linux-tools/linux-tool-perf.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/linux-tools/linux-tool-perf.mk.in +1 -1
@@ -126,7 +126,7 @@ define PERF_DISABLE_DOCUMENTATION printf "%%:\n\t@:\n" >$(LINUX_DIR)/tools/perf/Documentation/GNUmakefile; \ fi endef -LINUX_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION +LINUX_TOOLS_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION # O must be redefined here to overwrite the one used by Buildroot for # out of tree build. We build perf in $(LINUX_DIR)/tools/perf/ and not just
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 4 lines · Markus Mayer via buildroot
We are trying to not build the perf documentation. However, the hook being used to do so was named incorrectly. As a result, the build steps to disable the documentation were never executed.
Quoted 8 lines
Rename the hook from
LINUX_POST_PATCH_HOOKS
to
LINUX_TOOLS_POST_PATCH_HOOKS
to fix the issue.Fixes 20b144666909 ("linux/tools: make it a real, separate package")Signed-off-by Markus Mayer <[email protected]>
Signature · 5 lines
Florian _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedMarkus, All,
On 2022-08-09 13:35 -0700, Markus Mayer via buildroot spake thusly:
Quoted 11 lines
We are trying to not build the perf documentation. However, the hook being used to do so was named incorrectly. As a result, the build steps to disable the documentation were never executed.
Rename the hook from
LINUX_POST_PATCH_HOOKS
to
LINUX_TOOLS_POST_PATCH_HOOKS
to fix the issue.Fixes 20b144666909 ("linux/tools: make it a real, separate package")
Woo.. almost six years before my crap gets noticed! ;-)
Quoted 1 line
Signed-off-by Markus Mayer <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 24 lines
--- package/linux-tools/linux-tool-perf.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/linux-tools/linux-tool-perf.mk.in +1
-1@@ -126,7 +126,7 @@ define PERF_DISABLE_DOCUMENTATION printf "%%:\n\t@:\n" >$(LINUX_DIR)/tools/perf/Documentation/GNUmakefile; \ fi endef -LINUX_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION +LINUX_TOOLS_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION # O must be redefined here to overwrite the one used by Buildroot for # out of tree build. We build perf in $(LINUX_DIR)/tools/perf/ and not justSignature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Yann,
Quoted 5 lines
Woo.. almost six years before my crap gets noticed! ;-)
Quoted 1 line
Signed-off-by Markus Mayer <[email protected]>Applied to master, thanks.
Thanks for applying this. We have to thank Ubuntu 22.04 for flushing out this error.
In the past, /usr/bin/asciidoc used to be a regular Python script that would import "regular" Python packages (i.e. nothing special). The actual parser was contained in the script. With Ubuntu 22.04, /usr/bin/asciidoc became a shell script like so:
$ cat /usr/bin/asciidoc #!/bin/sh python3 -m asciidoc "$@"
This means that the actual parser now lives as a Python module in /usr/lib/python3/dist-packages/asciidoc. And therein lies the issue. We are using BR2_FORCE_HOST_BUILD=y, so it builds its own Python interpreter. And while .../output/arm64/host/bin/python3 is perfectly capable of running /usr/bin/asciidoc when it is a standalone script, it can't run asciidoc as a module, because /usr/lib/python3/dist-packages is not in the custom Python interpreter's search path.
And, thus, our build started failing when conducted on Ubuntu 22.04 (while being perfectly fine on Ubuntu 20.04 and older). Subsequently, a slightly confusing search for the root cause commenced, since none of these findings were expected.
I am mentioning here what happened, in case somebody else comes across a similar issue.
Regards,
-Markus
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Markus" == Markus Mayer via buildroot <[email protected]> writes:
We are trying to not build the perf documentation. However, the hook being used to do so was named incorrectly. As a result, the build steps to disable the documentation were never executed.
Quoted 8 lines
Rename the hook from
LINUX_POST_PATCH_HOOKS
to
LINUX_TOOLS_POST_PATCH_HOOKS
to fix the issue.Fixes 20b144666909 ("linux/tools: make it a real, separate package")Signed-off-by Markus Mayer <[email protected]>
Committed to 2022.05.x and 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot