| Message ID | 20230928215640.2683961-3-yoann.congal@smile.fr |
|---|---|
| State | New |
| Headers | show |
| Series | Empty packages and bogus dependencies (Part 1) | expand |
On Thu, 2023-09-28 at 23:56 +0200, Yoann Congal wrote: > From: Fawzi KHABER <fawzi.khaber@smile.fr> > > Remove superfluous DEV_PKG_DEPENDENCY = "" previously used to bypass > ${PN}-dev package RDEPENDS on empty&non-built ${PN}. DEV_PKG_DEPENDENCY > applies RRECOMMENDS now, all workarounds are not needed anymore. > > Related to [YOCTO #6839] and [YOCTO #8222] > > Signed-off-by: Yoann CONGAL <yoann.congal@smile.fr> > Signed-off-by: Fawzi KHABER <fawzi.khaber@smile.fr> > --- > meta/recipes-connectivity/bind/bind_9.18.19.bb | 1 - > meta/recipes-core/musl/bsd-headers.bb | 1 - > meta/recipes-core/musl/libssp-nonshared.bb | 1 - > meta/recipes-core/newlib/newlib_git.bb | 3 --- > meta/recipes-devtools/gcc/libgcc-common.inc | 4 ---- > meta/recipes-devtools/python/python3_3.11.5.bb | 1 - > meta/recipes-graphics/mesa/libglu_9.0.3.bb | 3 --- > meta/recipes-graphics/mesa/mesa.inc | 3 --- > meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb | 1 - > meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb | 1 - > meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb | 1 - > meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb | 3 +-- > meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb | 3 +-- > meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 1 - > meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 1 - > meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb | 1 - > 16 files changed, 2 insertions(+), 27 deletions(-) Firstly, sorry for taking as long to get to this. The patch 1/2 looks good and I'm happy to merge that. It does set us on the patch I outlined originally so I think we're good there. I'm less sure about this second one. It appears to remove variables which do actively change things and once they are removed, warnings from the previous patch show up. I therefore think the second patch is incorrect and doesn't move us in the direction we want? Cheers, Richard
Hi Richard, Le jeu. 16 nov. 2023 à 13:13, Richard Purdie <richard.purdie@linuxfoundation.org> a écrit : > On Thu, 2023-09-28 at 23:56 +0200, Yoann Congal wrote: > > From: Fawzi KHABER <fawzi.khaber@smile.fr> > > > > Remove superfluous DEV_PKG_DEPENDENCY = "" previously used to bypass > > ${PN}-dev package RDEPENDS on empty&non-built ${PN}. DEV_PKG_DEPENDENCY > > applies RRECOMMENDS now, all workarounds are not needed anymore. > > > > Related to [YOCTO #6839] and [YOCTO #8222] > > > > Signed-off-by: Yoann CONGAL <yoann.congal@smile.fr> > > Signed-off-by: Fawzi KHABER <fawzi.khaber@smile.fr> > > --- > > meta/recipes-connectivity/bind/bind_9.18.19.bb | 1 - > > meta/recipes-core/musl/bsd-headers.bb | 1 - > > meta/recipes-core/musl/libssp-nonshared.bb | 1 - > > meta/recipes-core/newlib/newlib_git.bb | 3 --- > > meta/recipes-devtools/gcc/libgcc-common.inc | 4 ---- > > meta/recipes-devtools/python/python3_3.11.5.bb | 1 - > > meta/recipes-graphics/mesa/libglu_9.0.3.bb | 3 --- > > meta/recipes-graphics/mesa/mesa.inc | 3 --- > > meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb | 1 - > > meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb | 1 - > > meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb | 1 - > > meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb | 3 +-- > > meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb | 3 +-- > > meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 1 - > > meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 1 - > > meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb | 1 - > > 16 files changed, 2 insertions(+), 27 deletions(-) > > Firstly, sorry for taking as long to get to this. That is fine! This was sent really late in the dev cycle wrt the release... > The patch 1/2 looks > good and I'm happy to merge that. It does set us on the patch I > outlined originally so I think we're good there. Awesome, thanks! > I'm less sure about this second one. It appears to remove variables > which do actively change things and once they are removed, warnings > from the previous patch show up. > > I therefore think the second patch is incorrect and doesn't move us in > the direction we want? I would need to look into it to to confirm this but from your plan : https://bugzilla.yoctoproject.org/show_bug.cgi?id=6839#c7 a) was to make warnings appear b) fixing the warnings We are now between a) and b) : warnings but no fix. Since the patch I finally integrated the fact that the CI must be warning free. So I guess, I'll come back with a series with this patch (a) _and the fixes (b)_. Does that sound good? > Cheers, > > Richard Regards,
On Thu, 2023-11-16 at 14:10 +0100, Yoann CONGAL wrote: > Hi Richard, > > Le jeu. 16 nov. 2023 à 13:13, Richard Purdie > <richard.purdie@linuxfoundation.org> a écrit : > > On Thu, 2023-09-28 at 23:56 +0200, Yoann Congal wrote: > > > From: Fawzi KHABER <fawzi.khaber@smile.fr> > > > > > > Remove superfluous DEV_PKG_DEPENDENCY = "" previously used to bypass > > > ${PN}-dev package RDEPENDS on empty&non-built ${PN}. DEV_PKG_DEPENDENCY > > > applies RRECOMMENDS now, all workarounds are not needed anymore. > > > > > > Related to [YOCTO #6839] and [YOCTO #8222] > > > > > > Signed-off-by: Yoann CONGAL <yoann.congal@smile.fr> > > > Signed-off-by: Fawzi KHABER <fawzi.khaber@smile.fr> > > > --- > > > meta/recipes-connectivity/bind/bind_9.18.19.bb | 1 - > > > meta/recipes-core/musl/bsd-headers.bb | 1 - > > > meta/recipes-core/musl/libssp-nonshared.bb | 1 - > > > meta/recipes-core/newlib/newlib_git.bb | 3 --- > > > meta/recipes-devtools/gcc/libgcc-common.inc | 4 ---- > > > meta/recipes-devtools/python/python3_3.11.5.bb | 1 - > > > meta/recipes-graphics/mesa/libglu_9.0.3.bb | 3 --- > > > meta/recipes-graphics/mesa/mesa.inc | 3 --- > > > meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb | 1 - > > > meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb | 1 - > > > meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb | 1 - > > > meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb | 3 +-- > > > meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb | 3 +-- > > > meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 1 - > > > meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 1 - > > > meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb | 1 - > > > 16 files changed, 2 insertions(+), 27 deletions(-) > > > > Firstly, sorry for taking as long to get to this. > > That is fine! This was sent really late in the dev cycle wrt the release... > > > The patch 1/2 looks > > good and I'm happy to merge that. It does set us on the patch I > > outlined originally so I think we're good there. > > Awesome, thanks! > > > I'm less sure about this second one. It appears to remove variables > > which do actively change things and once they are removed, warnings > > from the previous patch show up. > > > > I therefore think the second patch is incorrect and doesn't move us in > > the direction we want? > > I would need to look into it to to confirm this but from your plan : > https://bugzilla.yoctoproject.org/show_bug.cgi?id=6839#c7 > a) was to make warnings appear > b) fixing the warnings > > We are now between a) and b) : warnings but no fix. > > Since the patch I finally integrated the fact that the CI must be warning free. > So I guess, I'll come back with a series with this patch (a) _and the > fixes (b)_. > Does that sound good? Yes. I think the changes in 2/2 actually create warnings where we don't currently have any and you'd need to revert 2/2 to help with the fixes in step b) above. I did also do a bit more testing of 1/2 and it also needs a bit more work unfortunately, it is the right direction but not quite there yet. Firstly, it shows warnings like: perl-modules rrecommends perl-module-warnings but perl-module-warnings won't be built which is because it is an RPROVIDES: recipes-devtools/perl/perl_5.38.0.bb:RPROVIDES:${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \ so we need to teach the check how to resolve and ignore those. Secondly, it is only handling "self referencing" rrecommends. That can be changed by updating the constraint to something like: if not rrec_data or "FILES_INFO" not in rrec_data or (rrec_data["FILES_INFO"] == "{}" and not bb.utils.to_boolean(rrec_data.get("ALLOW_EMPTY", "0"), False)): oe.qa.add_message(messages, "rrecommends-non-existent", "{0} rrecommends {1} but {1} won't be built".format(pkg, rrecommend)) but then a lot more warnings appear. I think a lot of the new warnings would be fixed if the RPROVIDES issue is accounted for. So things are heading the right way but need a little work. I'd be happy to merge 1/2 when it is ready since we can enable the warnings on a per layer basis now once we fix the issues. 1/2 isn't quite ready yet though, we need to fix the RPROVIDES issue. Cheers, Richard
diff --git a/meta/recipes-connectivity/bind/bind_9.18.19.bb b/meta/recipes-connectivity/bind/bind_9.18.19.bb index 8124c5c591..01f5c9e852 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.19.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.19.bb @@ -110,4 +110,3 @@ PACKAGE_BEFORE_PN += "${PN}-libs" FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so" FILES:${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so" -DEV_PKG_DEPENDENCY = "" diff --git a/meta/recipes-core/musl/bsd-headers.bb b/meta/recipes-core/musl/bsd-headers.bb index 887a816031..8a2f4177a7 100644 --- a/meta/recipes-core/musl/bsd-headers.bb +++ b/meta/recipes-core/musl/bsd-headers.bb @@ -27,5 +27,4 @@ do_install() { # COMPATIBLE_HOST = ".*-musl.*" -DEV_PKG_DEPENDENCY = "" RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta/recipes-core/musl/libssp-nonshared.bb b/meta/recipes-core/musl/libssp-nonshared.bb index 3faf8f00c3..982bcc47a5 100644 --- a/meta/recipes-core/musl/libssp-nonshared.bb +++ b/meta/recipes-core/musl/libssp-nonshared.bb @@ -31,5 +31,4 @@ do_install() { # COMPATIBLE_HOST = ".*-musl.*" RDEPENDS:${PN}-staticdev = "" -DEV_PKG_DEPENDENCY = "" RRECOMMENDS:${PN}-dbg = "${PN}-staticdev (= ${EXTENDPKGV})" diff --git a/meta/recipes-core/newlib/newlib_git.bb b/meta/recipes-core/newlib/newlib_git.bb index fb922d65d1..a3687f5e67 100644 --- a/meta/recipes-core/newlib/newlib_git.bb +++ b/meta/recipes-core/newlib/newlib_git.bb @@ -15,6 +15,3 @@ do_install:append() { # Remove original directory rmdir ${D}${prefix}/${TARGET_SYS} } - -# No rpm package is actually created but -dev depends on it, avoid dnf error -DEV_PKG_DEPENDENCY:libc-newlib = "" diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index d9084af51a..7e357af3b9 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -54,10 +54,6 @@ do_install:append:libc-newlib () { fi } -# No rpm package is actually created but -dev depends on it, avoid dnf error -DEV_PKG_DEPENDENCY:libc-baremetal = "" -DEV_PKG_DEPENDENCY:libc-newlib = "" - BBCLASSEXTEND = "nativesdk" addtask multilib_install after do_install before do_package do_populate_sysroot diff --git a/meta/recipes-devtools/python/python3_3.11.5.bb b/meta/recipes-devtools/python/python3_3.11.5.bb index 8e023c7dfb..f391a1ca14 100644 --- a/meta/recipes-devtools/python/python3_3.11.5.bb +++ b/meta/recipes-devtools/python/python3_3.11.5.bb @@ -441,7 +441,6 @@ RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev ${PN}-cgitb ${PN}-zi RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-tr-tr" RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}" RDEPENDS:${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter ${MLPREFIX}tcl', '', d)}" -DEV_PKG_DEPENDENCY = "" RDEPENDS:${PN}-pydoc += "${PN}-io" RDEPENDS:${PN}-tests:append:class-target = " ${MLPREFIX}bash" diff --git a/meta/recipes-graphics/mesa/libglu_9.0.3.bb b/meta/recipes-graphics/mesa/libglu_9.0.3.bb index 8151727c52..880a02d916 100644 --- a/meta/recipes-graphics/mesa/libglu_9.0.3.bb +++ b/meta/recipes-graphics/mesa/libglu_9.0.3.bb @@ -26,6 +26,3 @@ EXTRA_OEMESON = "-Dgl_provider=gl" # Requires libGL.so which is provided by mesa when x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11 opengl" - -# Remove the mesa-glu dependency in mesa-glu-dev, as mesa-glu is empty -DEV_PKG_DEPENDENCY = "" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 559d445ae5..e897ce65c8 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -213,9 +213,6 @@ FULL_OPTIMIZATION:append = " -fno-omit-frame-pointer" CFLAGS:append:armv5 = " -DMISSING_64BIT_ATOMICS" CFLAGS:append:armv6 = " -DMISSING_64BIT_ATOMICS" -# Remove the mesa dependency on mesa-dev, as mesa is empty -DEV_PKG_DEPENDENCY = "" - # Khronos documentation says that include/GLES2/gl2ext.h can be used for # OpenGL ES 3 specification as well as for OpenGL ES 2. # There can be applications including GLES2/gl2ext.h instead of GLES3/gl3ext.h diff --git a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb index 62384e6d2e..21eb27ee2d 100644 --- a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb +++ b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb @@ -12,7 +12,6 @@ SRC_URI[sha256sum] = "59da566decceba7c2a7970a4a03b48d9905f1262ff94410a649224e33d inherit autotools -DEV_PKG_DEPENDENCY = "" RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb index 781382e516..ebff85d0f0 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb @@ -16,7 +16,6 @@ SRC_URI += "file://multilibfix.patch" PE = "1" -DEV_PKG_DEPENDENCY = "" inherit gettext diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb index 67c1e8d97d..e2a6223116 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb @@ -25,7 +25,6 @@ FILES:${PN} = "" FILES:${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" FILES:python-xcbgen = "${PYTHON_SITEPACKAGES_DIR}" -DEV_PKG_DEPENDENCY = "" RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb b/meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb index 94d37c56bc..25ed5cdfec 100644 --- a/meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb +++ b/meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb @@ -18,8 +18,7 @@ PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false" # Datadir only used to install pc files, $datadir/pkgconfig datadir="${libdir}" -# ${PN} is empty so we need to tweak -dev and -dbg package dependencies -DEV_PKG_DEPENDENCY = "" +# ${PN} is empty so we need to tweak -dbg package dependencies RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb index cd4bc387a2..88edf1411e 100644 --- a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb +++ b/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb @@ -13,8 +13,7 @@ SRC_URI += "file://0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.pat SRC_URI[sha256sum] = "8daf36913d551a90fd1013cb078401375dabae021cb4713b9b256a70f00eeb74" -# ${PN} is empty so we need to tweak -dev and -dbg package dependencies -DEV_PKG_DEPENDENCY = "" +# ${PN} is empty so we need to tweak -dbg package dependencies RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 3a8d32e785..33da025bf8 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -105,7 +105,6 @@ do_install_armmultilib () { BBCLASSEXTEND = "nativesdk" -DEV_PKG_DEPENDENCY = "" RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" INHIBIT_DEFAULT_DEPS = "1" diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb index a91680d497..2cff48c39c 100644 --- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb @@ -13,7 +13,6 @@ S = "${WORKDIR}" do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot" do_compile[depends] += "virtual/kernel:do_compile_kernelmodules" -DEV_PKG_DEPENDENCY = "" DEPENDS += "bc-native bison-native" DEPENDS += "gmp-native" diff --git a/meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb b/meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb index 00b6036502..38e854ab48 100644 --- a/meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb +++ b/meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb @@ -18,7 +18,6 @@ inherit autotools CFLAGS += "-fPIC -U__OPTIMIZE__" -DEV_PKG_DEPENDENCY = "" RDEPENDS:${PN}-staticdev = "" do_install() {