diff options
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.patch | 31 | ||||
-rw-r--r-- | meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch | 33 |
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 @@ +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/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 @@ +From f16cd8c4986b7f250e8465dfbe4bda8d366e05dd Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 4 Mar 2024 14:35:16 +0100 +Subject: [PATCH] man.ml: do not use /dev/stdin + +This was introduced in https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=30c38a8bf8ae8f4a6e71d3b8ac4abf0a40778f1e +(presumably to build a 'sed | install' pipeline instead of previous 'install; sed' sequence), +but it doesn't work under pseudo where /dev/stdin is absent. + +Upstream-Status: Inappropriate [yocto specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + share/mk/install/man.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk +index b9865b9..06880f0 100644 +--- a/share/mk/install/man.mk ++++ b/share/mk/install/man.mk +@@ -60,10 +60,10 @@ $(foreach s, $(MANSECTIONS), \ + + $(_manpages): + $(info INSTALL $@) +- <$< \ +- $(SED) $(foreach s, $(MANSECTIONS), \ ++ $(INSTALL_DATA) -T $< $@ ++ $(SED) -i $(foreach s, $(MANSECTIONS), \ + -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \ +- | $(INSTALL_DATA) -T /dev/stdin $@ ++ $@ + ifeq ($(LINK_PAGES),symlink) + if $(GREP) '^\.so ' <$@ >/dev/null; then \ + $(GREP) '^\.so ' <$@ \ |