diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-13 18:33:36 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-18 12:20:59 +0000 |
| commit | 7bfbaaf2baa54f0abff231cfc263d4d8bc7f732b (patch) | |
| tree | 172138e02bfcd41beb4c247cf2dced47f7314d34 | |
| parent | e0d8494b569bc5fb45d9a4bafa25527a0ee3d970 (diff) | |
| download | openembedded-core-7bfbaaf2baa54f0abff231cfc263d4d8bc7f732b.tar.gz | |
man-pages: use env from coreutils-native
This is the outcome of investigating the selftest-armhost fail:
https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/3028/steps/15/logs/stdio
When man-pages recipe builds on ubuntu 18.04, /usr/bin/env on that is too
old to support -S option, and the outcome is that man-pages quietly
installs nothing, and no packages get created, and the test
that expects the package to exist fails.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-extended/man-pages/man-pages_6.06.bb | 4 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch b/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch new file mode 100644 index 0000000000..a644d24328 --- /dev/null +++ b/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch @@ -0,0 +1,31 @@ +From fbf0544138af02be4d6dd3085e7ecf98ad060bb4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 13 Mar 2024 17:30:02 +0100 +Subject: [PATCH] GNUmakefile: use env from PATH + +This allows using env from coreutils-native (rather than host env), +which resolves the problem of missing -S option on distributions +with much older coreutils such as Ubuntu 18.04. + +Once all autobuilder distros are newer than that, this patch +can be dropped, together with corutils-native dependency. + +Upstream-Status: Inappropriate [made for obsolete host distros] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + GNUmakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 1234194..65ba327 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -21,7 +21,7 @@ + ######################################################################## + + +-SHELL := /usr/bin/env ++SHELL := env + .SHELLFLAGS := -S bash -Eeuo pipefail -c + + diff --git a/meta/recipes-extended/man-pages/man-pages_6.06.bb b/meta/recipes-extended/man-pages/man-pages_6.06.bb index fa2e6b266e..0f091bbd7d 100644 --- a/meta/recipes-extended/man-pages/man-pages_6.06.bb +++ b/meta/recipes-extended/man-pages/man-pages_6.06.bb @@ -19,12 +19,16 @@ LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \ " SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ file://0001-man.ml-do-not-use-dev-stdin.patch \ + file://0001-GNUmakefile-use-env-from-PATH.patch \ " SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" inherit manpages +# can be dropped when ubuntu 18.04 is not in use anymore +DEPENDS += "coreutils-native" + MAN_PKG = "${PN}" PACKAGECONFIG ??= "" |