diff options
Diffstat (limited to 'meta/recipes-extended/man-pages')
-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/0001-man.ml-do-not-use-dev-stdin.patch | 33 | ||||
-rw-r--r-- | meta/recipes-extended/man-pages/man-pages_6.8.bb (renamed from meta/recipes-extended/man-pages/man-pages_6.06.bb) | 7 |
3 files changed, 1 insertions, 70 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 deleted file mode 100644 index a644d24328..0000000000 --- a/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
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/0001-man.ml-do-not-use-dev-stdin.patch b/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch deleted file mode 100644 index ec2d0600c7..0000000000 --- a/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From f16cd8c4986b7f250e8465dfbe4bda8d366e05dd Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 4 Mar 2024 14:35:16 +0100 | ||
4 | Subject: [PATCH] man.ml: do not use /dev/stdin | ||
5 | |||
6 | This was introduced in https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=30c38a8bf8ae8f4a6e71d3b8ac4abf0a40778f1e | ||
7 | (presumably to build a 'sed | install' pipeline instead of previous 'install; sed' sequence), | ||
8 | but it doesn't work under pseudo where /dev/stdin is absent. | ||
9 | |||
10 | Upstream-Status: Inappropriate [yocto specific] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | share/mk/install/man.mk | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk | ||
17 | index b9865b9..06880f0 100644 | ||
18 | --- a/share/mk/install/man.mk | ||
19 | +++ b/share/mk/install/man.mk | ||
20 | @@ -60,10 +60,10 @@ $(foreach s, $(MANSECTIONS), \ | ||
21 | |||
22 | $(_manpages): | ||
23 | $(info INSTALL $@) | ||
24 | - <$< \ | ||
25 | - $(SED) $(foreach s, $(MANSECTIONS), \ | ||
26 | + $(INSTALL_DATA) -T $< $@ | ||
27 | + $(SED) -i $(foreach s, $(MANSECTIONS), \ | ||
28 | -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \ | ||
29 | - | $(INSTALL_DATA) -T /dev/stdin $@ | ||
30 | + $@ | ||
31 | ifeq ($(LINK_PAGES),symlink) | ||
32 | if $(GREP) '^\.so ' <$@ >/dev/null; then \ | ||
33 | $(GREP) '^\.so ' <$@ \ | ||
diff --git a/meta/recipes-extended/man-pages/man-pages_6.06.bb b/meta/recipes-extended/man-pages/man-pages_6.8.bb index 0f091bbd7d..1181de1f15 100644 --- a/meta/recipes-extended/man-pages/man-pages_6.06.bb +++ b/meta/recipes-extended/man-pages/man-pages_6.8.bb | |||
@@ -18,17 +18,12 @@ LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \ | |||
18 | file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ | 18 | file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ |
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 \ | ||
22 | file://0001-GNUmakefile-use-env-from-PATH.patch \ | ||
23 | " | 21 | " |
24 | 22 | ||
25 | SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" | 23 | SRC_URI[sha256sum] = "f4d5b9756b4ee52e34ca9d895095c92312ced6292395b811e11069ab007e6f06" |
26 | 24 | ||
27 | inherit manpages | 25 | inherit manpages |
28 | 26 | ||
29 | # can be dropped when ubuntu 18.04 is not in use anymore | ||
30 | DEPENDS += "coreutils-native" | ||
31 | |||
32 | MAN_PKG = "${PN}" | 27 | MAN_PKG = "${PN}" |
33 | 28 | ||
34 | PACKAGECONFIG ??= "" | 29 | PACKAGECONFIG ??= "" |