diff mbox series

gcc-runtime.inc: additionally remove libgomp.info-1 and libgomp.info-2

Message ID 20240520175706.1840576-1-f_l_k@t-online.de
State New
Headers show
Series gcc-runtime.inc: additionally remove libgomp.info-1 and libgomp.info-2 | expand

Commit Message

Markus Volk May 20, 2024, 5:57 p.m. UTC
This avoids:
ERROR: gcc-runtime-14.1.0-r0 do_package: QA Issue: gcc-runtime: Files/directories were installed but not shipped in any package:
  /usr/share/info
  /usr/share/info/libgomp.info-1
  /usr/share/info/libgomp.info-2
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
gcc-runtime: 3 installed and not shipped files. [installed-vs-shipped]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alexandre Belloni May 22, 2024, 9:06 a.m. UTC | #1
Hello Markus,

this doesn't apply on master anymore, can you rebase?

On 20/05/2024 19:57:06+0200, Markus Volk wrote:
> This avoids:
> ERROR: gcc-runtime-14.1.0-r0 do_package: QA Issue: gcc-runtime: Files/directories were installed but not shipped in any package:
>   /usr/share/info
>   /usr/share/info/libgomp.info-1
>   /usr/share/info/libgomp.info-2
> Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
> gcc-runtime: 3 installed and not shipped files. [installed-vs-shipped]
> 
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
> index dbc9141000..d1c47c5d5c 100644
> --- a/meta/recipes-devtools/gcc/gcc-runtime.inc
> +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
> @@ -92,7 +92,7 @@ do_install () {
>  		mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include
>  		rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include
>  	fi
> -	rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
> +	rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/libgomp.info-1 ${D}${infodir}/libgomp.info-2 ${D}${infodir}/dir
>  	rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir
>  	rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir
>  	if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then
> -- 
> 2.44.0
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#199600): https://lists.openembedded.org/g/openembedded-core/message/199600
> Mute This Topic: https://lists.openembedded.org/mt/106208568/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Alexander Kanavin May 22, 2024, 9:07 a.m. UTC | #2
I'm also curious in what scenarios is this needed, if the AB doesn't
have the issue?

Alex

On Wed, 22 May 2024 at 11:06, Alexandre Belloni via
lists.openembedded.org
<alexandre.belloni=bootlin.com@lists.openembedded.org> wrote:
>
> Hello Markus,
>
> this doesn't apply on master anymore, can you rebase?
>
> On 20/05/2024 19:57:06+0200, Markus Volk wrote:
> > This avoids:
> > ERROR: gcc-runtime-14.1.0-r0 do_package: QA Issue: gcc-runtime: Files/directories were installed but not shipped in any package:
> >   /usr/share/info
> >   /usr/share/info/libgomp.info-1
> >   /usr/share/info/libgomp.info-2
> > Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
> > gcc-runtime: 3 installed and not shipped files. [installed-vs-shipped]
> >
> > Signed-off-by: Markus Volk <f_l_k@t-online.de>
> > ---
> >  meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
> > index dbc9141000..d1c47c5d5c 100644
> > --- a/meta/recipes-devtools/gcc/gcc-runtime.inc
> > +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
> > @@ -92,7 +92,7 @@ do_install () {
> >               mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include
> >               rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include
> >       fi
> > -     rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
> > +     rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/libgomp.info-1 ${D}${infodir}/libgomp.info-2 ${D}${infodir}/dir
> >       rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir
> >       rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir
> >       if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then
> > --
> > 2.44.0
> >
>
> >
> >
> >
>
>
> --
> 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 (#199694): https://lists.openembedded.org/g/openembedded-core/message/199694
> Mute This Topic: https://lists.openembedded.org/mt/106208568/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj May 22, 2024, 8:05 p.m. UTC | #3
On Wed, May 22, 2024 at 2:07 AM Alexander Kanavin via
lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
wrote:
>
> I'm also curious in what scenarios is this needed, if the AB doesn't
> have the issue?
>

I am guessing that texinfo is installed on build host and libgomp
configure is finding it somehow

> Alex
>
> On Wed, 22 May 2024 at 11:06, Alexandre Belloni via
> lists.openembedded.org
> <alexandre.belloni=bootlin.com@lists.openembedded.org> wrote:
> >
> > Hello Markus,
> >
> > this doesn't apply on master anymore, can you rebase?
> >
> > On 20/05/2024 19:57:06+0200, Markus Volk wrote:
> > > This avoids:
> > > ERROR: gcc-runtime-14.1.0-r0 do_package: QA Issue: gcc-runtime: Files/directories were installed but not shipped in any package:
> > >   /usr/share/info
> > >   /usr/share/info/libgomp.info-1
> > >   /usr/share/info/libgomp.info-2
> > > Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
> > > gcc-runtime: 3 installed and not shipped files. [installed-vs-shipped]
> > >
> > > Signed-off-by: Markus Volk <f_l_k@t-online.de>
> > > ---
> > >  meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
> > > index dbc9141000..d1c47c5d5c 100644
> > > --- a/meta/recipes-devtools/gcc/gcc-runtime.inc
> > > +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
> > > @@ -92,7 +92,7 @@ do_install () {
> > >               mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include
> > >               rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include
> > >       fi
> > > -     rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
> > > +     rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/libgomp.info-1 ${D}${infodir}/libgomp.info-2 ${D}${infodir}/dir
> > >       rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir
> > >       rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir
> > >       if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then
> > > --
> > > 2.44.0
> > >
> >
> > >
> > >
> > >
> >
> >
> > --
> > 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 (#199695): https://lists.openembedded.org/g/openembedded-core/message/199695
> Mute This Topic: https://lists.openembedded.org/mt/106208568/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Markus Volk May 22, 2024, 9:42 p.m. UTC | #4
On Wed, May 22 2024 at 11:06:22 AM +02:00:00, Alexandre Belloni 
<alexandre.belloni@bootlin.com> wrote:
> this doesn't apply on master anymore, can you rebase?

Hi Alexandre,

probably this doesn't apply because Richard Purdie added a fix for this 
almost at the same time as I sent this patch.
So I guess this can be ignored
Alexandre Belloni May 22, 2024, 9:49 p.m. UTC | #5
On 22/05/2024 23:42:07+0200, Markus Volk wrote:
> On Wed, May 22 2024 at 11:06:22 AM +02:00:00, Alexandre Belloni
> <alexandre.belloni@bootlin.com> wrote:
> > this doesn't apply on master anymore, can you rebase?
> 
> Hi Alexandre,
> 
> probably this doesn't apply because Richard Purdie added a fix for this
> almost at the same time as I sent this patch.
> So I guess this can be ignored

Ack, I wasn't sure this was fixing the same issue, thanks!
Richard Purdie May 22, 2024, 9:50 p.m. UTC | #6
On Wed, 2024-05-22 at 11:07 +0200, Alexander Kanavin via
lists.openembedded.org wrote:
> I'm also curious in what scenarios is this needed, if the AB doesn't
> have the issue?

The AB did (the mandb selftest) and I had a patch which overlapped with
the patch from Markus.

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index dbc9141000..d1c47c5d5c 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -92,7 +92,7 @@  do_install () {
 		mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include
 		rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include
 	fi
-	rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
+	rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/libgomp.info-1 ${D}${infodir}/libgomp.info-2 ${D}${infodir}/dir
 	rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir
 	rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir
 	if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then