Message ID | 20240527013705.2781009-4-changqing.li@windriver.com |
---|---|
State | New |
Headers | show |
Series | [1/4] libgpg-error: upgrade 1.48 -> 1.49 | expand |
On 27/05/2024 09:37:05+0800, Changqing Li wrote: > 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" > - But we still have an ARM ubuntu 18.04 worker, will it still work?
On 6/2/24 17:51, Alexandre Belloni via lists.openembedded.org wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and know the content is safe. > > On 27/05/2024 09:37:05+0800, Changqing Li wrote: >> 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" >> - > But we still have an ARM ubuntu 18.04 worker, will it still work? No, ubuntu18.04 still needs patch 0001-GNUmakefile-use-env-from-PATH.patch. Should we keep this patch for not supported host distro? I can send a V2 and add this patch back if we still need this. Regards Changqing > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#200202):https://lists.openembedded.org/g/openembedded-core/message/200202 > Mute This Topic:https://lists.openembedded.org/mt/106323762/3616873 > Group Owner:openembedded-core+owner@lists.openembedded.org > Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub [changqing.li@eng.windriver.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 6/3/24 08:52, Changqing Li wrote: > > > On 6/2/24 17:51, Alexandre Belloni via lists.openembedded.org > <https://urldefense.com/v3/__http://lists.openembedded.org__;!!AjveYdw8EvQ!YpM6rnmmGg65JY6sfVj_MxBUznl6qzyT3RdMMxR3XIrTOHzwo2745-xRd0GCTlYjdgB5_0Sae7m8nFzKjddLq9mWjQwfOHCdBr5w1Q$> > wrote: >> CAUTION: This email comes from a non Wind River email account! >> Do not click links or open attachments unless you recognize the sender and know the content is safe. >> >> On 27/05/2024 09:37:05+0800, Changqing Li wrote: >>> diff --git a/meta/recipes-extended/man-pages/man-pages_6.06.bb <https://urldefense.com/v3/__http://man-pages_6.06.bb__;!!AjveYdw8EvQ!YpM6rnmmGg65JY6sfVj_MxBUznl6qzyT3RdMMxR3XIrTOHzwo2745-xRd0GCTlYjdgB5_0Sae7m8nFzKjddLq9mWjQwfOHAM4T2W4w$> b/meta/recipes-extended/man-pages/man-pages_6.8.bb <https://urldefense.com/v3/__http://man-pages_6.8.bb__;!!AjveYdw8EvQ!YpM6rnmmGg65JY6sfVj_MxBUznl6qzyT3RdMMxR3XIrTOHzwo2745-xRd0GCTlYjdgB5_0Sae7m8nFzKjddLq9mWjQwfOHBMG5wnsw$> >>> similarity index 84% >>> rename from meta/recipes-extended/man-pages/man-pages_6.06.bb <https://urldefense.com/v3/__http://man-pages_6.06.bb__;!!AjveYdw8EvQ!YpM6rnmmGg65JY6sfVj_MxBUznl6qzyT3RdMMxR3XIrTOHzwo2745-xRd0GCTlYjdgB5_0Sae7m8nFzKjddLq9mWjQwfOHAM4T2W4w$> >>> rename to meta/recipes-extended/man-pages/man-pages_6.8.bb <https://urldefense.com/v3/__http://man-pages_6.8.bb__;!!AjveYdw8EvQ!YpM6rnmmGg65JY6sfVj_MxBUznl6qzyT3RdMMxR3XIrTOHzwo2745-xRd0GCTlYjdgB5_0Sae7m8nFzKjddLq9mWjQwfOHBMG5wnsw$> >>> index 0f091bbd7d..fd19fa3b97 100644 >>> --- a/meta/recipes-extended/man-pages/man-pages_6.06.bb <https://urldefense.com/v3/__http://man-pages_6.06.bb__;!!AjveYdw8EvQ!YpM6rnmmGg65JY6sfVj_MxBUznl6qzyT3RdMMxR3XIrTOHzwo2745-xRd0GCTlYjdgB5_0Sae7m8nFzKjddLq9mWjQwfOHAM4T2W4w$> >>> +++ b/meta/recipes-extended/man-pages/man-pages_6.8.bb <https://urldefense.com/v3/__http://man-pages_6.8.bb__;!!AjveYdw8EvQ!YpM6rnmmGg65JY6sfVj_MxBUznl6qzyT3RdMMxR3XIrTOHzwo2745-xRd0GCTlYjdgB5_0Sae7m8nFzKjddLq9mWjQwfOHBMG5wnsw$> >>> @@ -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" >>> - >> But we still have an ARM ubuntu 18.04 worker, will it still work? > > No, ubuntu18.04 still needs patch > 0001-GNUmakefile-use-env-from-PATH.patch. Should we keep this patch > for not supported host distro? > > I can send a V2 and add this patch back if we still need this. > > Regards > > Changqing > Hi, Just find that 0001-GNUmakefile-use-env-from-PATH.patch is not needed anymore, upstream have fix this issue. and V2 is send to update the commit message. >> -- >> Alexandre Belloni, co-owner and COO, Bootlin >> Embedded Linux and Kernel engineering >> https://bootlin.com >> > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#200227):https://lists.openembedded.org/g/openembedded-core/message/200227 > Mute This Topic:https://lists.openembedded.org/mt/106323762/3616873 > Group Owner:openembedded-core+owner@lists.openembedded.org > Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub [changqing.li@eng.windriver.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 <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 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 <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 ' <$@ \ 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 ??= ""