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:21:45 +0000 |
commit | 88eaffee1e1db1d96a4c944b6281fea202a1c778 (patch) | |
tree | 524bd23ecdee523d37aee7adbbc6ec387a951470 /meta | |
parent | 276332d289fdc7572ac2dcd5030160b90e4028b0 (diff) | |
download | poky-88eaffee1e1db1d96a4c944b6281fea202a1c778.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.
(From OE-Core rev: 7bfbaaf2baa54f0abff231cfc263d4d8bc7f732b)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@ | |||
1 | From fbf0544138af02be4d6dd3085e7ecf98ad060bb4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 13 Mar 2024 17:30:02 +0100 | ||
4 | Subject: [PATCH] GNUmakefile: use env from PATH | ||
5 | |||
6 | This allows using env from coreutils-native (rather than host env), | ||
7 | which resolves the problem of missing -S option on distributions | ||
8 | with much older coreutils such as Ubuntu 18.04. | ||
9 | |||
10 | Once all autobuilder distros are newer than that, this patch | ||
11 | can be dropped, together with corutils-native dependency. | ||
12 | |||
13 | Upstream-Status: Inappropriate [made for obsolete host distros] | ||
14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
15 | --- | ||
16 | GNUmakefile | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/GNUmakefile b/GNUmakefile | ||
20 | index 1234194..65ba327 100644 | ||
21 | --- a/GNUmakefile | ||
22 | +++ b/GNUmakefile | ||
23 | @@ -21,7 +21,7 @@ | ||
24 | ######################################################################## | ||
25 | |||
26 | |||
27 | -SHELL := /usr/bin/env | ||
28 | +SHELL := env | ||
29 | .SHELLFLAGS := -S bash -Eeuo pipefail -c | ||
30 | |||
31 | |||
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 \ | |||
19 | " | 19 | " |
20 | SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ | 20 | SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ |
21 | file://0001-man.ml-do-not-use-dev-stdin.patch \ | 21 | file://0001-man.ml-do-not-use-dev-stdin.patch \ |
22 | file://0001-GNUmakefile-use-env-from-PATH.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" | 25 | SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" |
25 | 26 | ||
26 | inherit manpages | 27 | inherit manpages |
27 | 28 | ||
29 | # can be dropped when ubuntu 18.04 is not in use anymore | ||
30 | DEPENDS += "coreutils-native" | ||
31 | |||
28 | MAN_PKG = "${PN}" | 32 | MAN_PKG = "${PN}" |
29 | 33 | ||
30 | PACKAGECONFIG ??= "" | 34 | PACKAGECONFIG ??= "" |