diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:15 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:02 +0000 |
commit | 08cde8263a909da9e59c5a9e12769ed23e7ecbbe (patch) | |
tree | 26c67968dd6d6d28d6cb5025d2a066bb6aad4483 /meta/recipes-extended | |
parent | 71c2eb3ac9b0cfd26fc6f481dc1f86634ffe7387 (diff) | |
download | poky-08cde8263a909da9e59c5a9e12769ed23e7ecbbe.tar.gz |
man-pages: upgrade 6.05.01 -> 6.06
License-Update: formatting, file names, http -> https, additional license snippets (which are all BSD-type).
(From OE-Core rev: bedf50acb3877c222ccfd07e8eaad9baceb5dc64)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-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.06.bb (renamed from meta/recipes-extended/man-pages/man-pages_6.05.01.bb) | 15 |
2 files changed, 43 insertions, 5 deletions
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 @@ | |||
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.05.01.bb b/meta/recipes-extended/man-pages/man-pages_6.06.bb index f0eb1a6132..fa2e6b266e 100644 --- a/meta/recipes-extended/man-pages/man-pages_6.05.01.bb +++ b/meta/recipes-extended/man-pages/man-pages_6.06.bb | |||
@@ -4,19 +4,24 @@ SECTION = "console/utils" | |||
4 | HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" | 4 | HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" |
5 | LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" | 5 | LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" |
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://README;md5=cbd51cd3dd298230df8ddd4637e65c37 \ | 7 | LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \ |
8 | file://LICENSES/BSD-2-Clause.txt;md5=d0f280d1058e77e66264a9b9e10e6c89 \ | 8 | file://LICENSES/BSD-2-Clause.txt;md5=9e16594a228301089d759b4f178db91f \ |
9 | file://LICENSES/BSD-3-Clause.txt;md5=71f739ef75581cae312e8c711bcdab16 \ | 9 | file://LICENSES/BSD-3-Clause.txt;md5=407426fcc1a243b7b2eff6e35c56aca9 \ |
10 | file://LICENSES/BSD-4-Clause-UC.txt;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \ | 10 | file://LICENSES/BSD-4-Clause-UC.txt;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \ |
11 | file://LICENSES/GPL-1.0-or-later.txt;md5=e5b7c80002ef72ab868b43ce47b65125 \ | 11 | file://LICENSES/GPL-1.0-or-later.txt;md5=e5b7c80002ef72ab868b43ce47b65125 \ |
12 | file://LICENSES/GPL-2.0-only.txt;md5=3d26203303a722dedc6bf909d95ba815 \ | 12 | file://LICENSES/GPL-2.0-only.txt;md5=3d26203303a722dedc6bf909d95ba815 \ |
13 | file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \ | 13 | file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \ |
14 | file://LICENSES/Linux-man-pages-1-para.txt;md5=97ab07585ce6700273bc66461bf46bf2 \ | ||
15 | file://LICENSES/Linux-man-pages-copyleft-2-para.txt;md5=1cafc230857da5e43f3d509c425d3c64 \ | ||
14 | file://LICENSES/Linux-man-pages-copyleft.txt;md5=173b960c686ff2d26f043ddaeb63f6ce \ | 16 | file://LICENSES/Linux-man-pages-copyleft.txt;md5=173b960c686ff2d26f043ddaeb63f6ce \ |
17 | file://LICENSES/Linux-man-pages-copyleft-var.txt;md5=d33708712c5918521f47f23b0c4e0d20 \ | ||
15 | file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ | 18 | file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ |
16 | " | 19 | " |
17 | 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 | " | ||
18 | 23 | ||
19 | SRC_URI[sha256sum] = "b2dd44ca0342b50923291f06bdba38c42438e10c04843ce1f731cf3f50631e0a" | 24 | SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" |
20 | 25 | ||
21 | inherit manpages | 26 | inherit manpages |
22 | 27 | ||