From 08cde8263a909da9e59c5a9e12769ed23e7ecbbe Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 6 Mar 2024 07:42:15 -0800 Subject: 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 Signed-off-by: Richard Purdie --- .../0001-man.ml-do-not-use-dev-stdin.patch | 33 ++++++++++++++++ .../man-pages/man-pages_6.05.01.bb | 41 ------------------- meta/recipes-extended/man-pages/man-pages_6.06.bb | 46 ++++++++++++++++++++++ 3 files changed, 79 insertions(+), 41 deletions(-) create mode 100644 meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch delete mode 100644 meta/recipes-extended/man-pages/man-pages_6.05.01.bb create mode 100644 meta/recipes-extended/man-pages/man-pages_6.06.bb 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 +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 +--- + 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 ' <$@ \ diff --git a/meta/recipes-extended/man-pages/man-pages_6.05.01.bb b/meta/recipes-extended/man-pages/man-pages_6.05.01.bb deleted file mode 100644 index f0eb1a6132..0000000000 --- a/meta/recipes-extended/man-pages/man-pages_6.05.01.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Linux man-pages" -DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" -SECTION = "console/utils" -HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" -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" - -LIC_FILES_CHKSUM = "file://README;md5=cbd51cd3dd298230df8ddd4637e65c37 \ - file://LICENSES/BSD-2-Clause.txt;md5=d0f280d1058e77e66264a9b9e10e6c89 \ - file://LICENSES/BSD-3-Clause.txt;md5=71f739ef75581cae312e8c711bcdab16 \ - file://LICENSES/BSD-4-Clause-UC.txt;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \ - file://LICENSES/GPL-1.0-or-later.txt;md5=e5b7c80002ef72ab868b43ce47b65125 \ - file://LICENSES/GPL-2.0-only.txt;md5=3d26203303a722dedc6bf909d95ba815 \ - file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \ - file://LICENSES/Linux-man-pages-copyleft.txt;md5=173b960c686ff2d26f043ddaeb63f6ce \ - file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ - " -SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" - -SRC_URI[sha256sum] = "b2dd44ca0342b50923291f06bdba38c42438e10c04843ce1f731cf3f50631e0a" - -inherit manpages - -MAN_PKG = "${PN}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[manpages] = "" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - oe_runmake install prefix=${prefix} DESTDIR=${D} - rm -rf ${D}${mandir}/man3/crypt.3 - rm -rf ${D}${mandir}/man3/crypt_r.3 - rm -rf ${D}${mandir}/man3/getspnam.3 - rm -rf ${D}${mandir}/man5/passwd.5 -} - -# Only deliveres man-pages so FILES:${PN} gets everything -FILES:${PN}-doc = "" -FILES:${PN} = "${mandir}/*" diff --git a/meta/recipes-extended/man-pages/man-pages_6.06.bb b/meta/recipes-extended/man-pages/man-pages_6.06.bb new file mode 100644 index 0000000000..fa2e6b266e --- /dev/null +++ b/meta/recipes-extended/man-pages/man-pages_6.06.bb @@ -0,0 +1,46 @@ +SUMMARY = "Linux man-pages" +DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" +SECTION = "console/utils" +HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" +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" + +LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \ + file://LICENSES/BSD-2-Clause.txt;md5=9e16594a228301089d759b4f178db91f \ + file://LICENSES/BSD-3-Clause.txt;md5=407426fcc1a243b7b2eff6e35c56aca9 \ + file://LICENSES/BSD-4-Clause-UC.txt;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \ + file://LICENSES/GPL-1.0-or-later.txt;md5=e5b7c80002ef72ab868b43ce47b65125 \ + file://LICENSES/GPL-2.0-only.txt;md5=3d26203303a722dedc6bf909d95ba815 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \ + file://LICENSES/Linux-man-pages-1-para.txt;md5=97ab07585ce6700273bc66461bf46bf2 \ + file://LICENSES/Linux-man-pages-copyleft-2-para.txt;md5=1cafc230857da5e43f3d509c425d3c64 \ + file://LICENSES/Linux-man-pages-copyleft.txt;md5=173b960c686ff2d26f043ddaeb63f6ce \ + file://LICENSES/Linux-man-pages-copyleft-var.txt;md5=d33708712c5918521f47f23b0c4e0d20 \ + file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ + " +SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ + file://0001-man.ml-do-not-use-dev-stdin.patch \ + " + +SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" + +inherit manpages + +MAN_PKG = "${PN}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + oe_runmake install prefix=${prefix} DESTDIR=${D} + rm -rf ${D}${mandir}/man3/crypt.3 + rm -rf ${D}${mandir}/man3/crypt_r.3 + rm -rf ${D}${mandir}/man3/getspnam.3 + rm -rf ${D}${mandir}/man5/passwd.5 +} + +# Only deliveres man-pages so FILES:${PN} gets everything +FILES:${PN}-doc = "" +FILES:${PN} = "${mandir}/*" -- cgit v1.2.3-54-g00ecf