summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/man-pages/man-pages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/man-pages/man-pages')
-rw-r--r--meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch31
-rw-r--r--meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch33
2 files changed, 64 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 @@
1From fbf0544138af02be4d6dd3085e7ecf98ad060bb4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 13 Mar 2024 17:30:02 +0100
4Subject: [PATCH] GNUmakefile: use env from PATH
5
6This allows using env from coreutils-native (rather than host env),
7which resolves the problem of missing -S option on distributions
8with much older coreutils such as Ubuntu 18.04.
9
10Once all autobuilder distros are newer than that, this patch
11can be dropped, together with corutils-native dependency.
12
13Upstream-Status: Inappropriate [made for obsolete host distros]
14Signed-off-by: Alexander Kanavin <alex@linutronix.de>
15---
16 GNUmakefile | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/GNUmakefile b/GNUmakefile
20index 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
new file mode 100644
index 0000000000..ec2d0600c7
--- /dev/null
+++ b/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch
@@ -0,0 +1,33 @@
1From f16cd8c4986b7f250e8465dfbe4bda8d366e05dd Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 4 Mar 2024 14:35:16 +0100
4Subject: [PATCH] man.ml: do not use /dev/stdin
5
6This 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),
8but it doesn't work under pseudo where /dev/stdin is absent.
9
10Upstream-Status: Inappropriate [yocto specific]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 share/mk/install/man.mk | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
17index 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 ' <$@ \