From patchwork Mon May 27 01:37:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 44194 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E888CC25B75 for ; Mon, 27 May 2024 01:37:19 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.18711.1716773831626366448 for ; Sun, 26 May 2024 18:37:11 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=5877813c0a=changqing.li@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44R103kh014227 for ; Sun, 26 May 2024 18:37:11 -0700 Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ybfgg92tf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 26 May 2024 18:37:11 -0700 (PDT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sun, 26 May 2024 18:37:10 -0700 Received: from pek-lpg-core2.wrs.com (128.224.153.41) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Sun, 26 May 2024 18:37:09 -0700 From: To: Subject: [PATCH 4/4] man-pages: upgrade 6.06 -> 6.8 Date: Mon, 27 May 2024 09:37:05 +0800 Message-ID: <20240527013705.2781009-4-changqing.li@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240527013705.2781009-1-changqing.li@windriver.com> References: <20240527013705.2781009-1-changqing.li@windriver.com> MIME-Version: 1.0 X-Proofpoint-GUID: xiKUpIHF7M_FF4lSFD1CoHsUWpdO2Pll X-Proofpoint-ORIG-GUID: xiKUpIHF7M_FF4lSFD1CoHsUWpdO2Pll X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-26_09,2024-05-24_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 priorityscore=1501 adultscore=0 spamscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2405270012 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 27 May 2024 01:37:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199893 From: Changqing Li * drop 0001-man.ml-do-not-use-dev-stdin.patch since upstream already fix the issue, see [1] * drop 0001-GNUmakefile-use-env-from-PATH.patch and drop depends on coreutils-native since ubuntu18.04 is not supported linux distro now [1] https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/share/mk/install/man.mk?id=9524f0f63badd896ccf6da7d79511100d86c4721 Signed-off-by: Changqing Li --- .../0001-GNUmakefile-use-env-from-PATH.patch | 31 ----------------- .../0001-man.ml-do-not-use-dev-stdin.patch | 33 ------------------- .../{man-pages_6.06.bb => man-pages_6.8.bb} | 10 ++---- 3 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch delete mode 100644 meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch rename meta/recipes-extended/man-pages/{man-pages_6.06.bb => man-pages_6.8.bb} (84%) 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 @@ -From fbf0544138af02be4d6dd3085e7ecf98ad060bb4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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 ---- - 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 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 @@ -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.06.bb b/meta/recipes-extended/man-pages/man-pages_6.8.bb similarity index 84% rename from meta/recipes-extended/man-pages/man-pages_6.06.bb rename to meta/recipes-extended/man-pages/man-pages_6.8.bb index 0f091bbd7d..fd19fa3b97 100644 --- a/meta/recipes-extended/man-pages/man-pages_6.06.bb +++ b/meta/recipes-extended/man-pages/man-pages_6.8.bb @@ -17,18 +17,12 @@ LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \ 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 \ - file://0001-GNUmakefile-use-env-from-PATH.patch \ - " +SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" +SRC_URI[sha256sum] = "f4d5b9756b4ee52e34ca9d895095c92312ced6292395b811e11069ab007e6f06" inherit manpages -# can be dropped when ubuntu 18.04 is not in use anymore -DEPENDS += "coreutils-native" - MAN_PKG = "${PN}" PACKAGECONFIG ??= ""