Patches 3 and 4 look good to me. I'll put them onto my under-test queue and let you know if they need to be rebased for any of my pending package updates.
Bruce On Wed, Jan 15, 2025 at 12:47 AM Chen Qi via lists.yoctoproject.org <[email protected]> wrote: > From: Chen Qi <[email protected]> > > Set DEBUG=1 to avoid stripping. > See https://github.com/cri-o/cri-o/blob/main/Makefile#L93 > > Set STRIP=true to avoid stripping bin/pinns. > See https://github.com/cri-o/cri-o/blob/main/pinns/Makefile#L4 > > ALLOW_EMPTY:${PN} = "1" is not needed. Remove it. > > Signed-off-by: Chen Qi <[email protected]> > --- > recipes-containers/cri-o/cri-o_git.bb | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/recipes-containers/cri-o/cri-o_git.bb > b/recipes-containers/cri-o/cri-o_git.bb > index 5c2c453e..10c811fe 100644 > --- a/recipes-containers/cri-o/cri-o_git.bb > +++ b/recipes-containers/cri-o/cri-o_git.bb > @@ -60,7 +60,7 @@ inherit goarch > inherit pkgconfig > inherit container-host > > -EXTRA_OEMAKE="BUILDTAGS=''" > +EXTRA_OEMAKE = "BUILDTAGS='' DEBUG=1 STRIP=true" > > do_compile() { > set +e > @@ -115,15 +115,13 @@ do_install_ptest() { > cp -rf ${S}/src/import/test ${D}${PTEST_PATH} > cp -rf ${S}/src/import/bin ${D}${PTEST_PATH} > } > + > FILES:${PN}-config = "${sysconfdir}/crio/config/*" > FILES:${PN} += "${systemd_unitdir}/system/*" > FILES:${PN} += "/usr/local/bin/*" > FILES:${PN} += "/usr/share/containers/oci/hooks.d" > > -# don't clobber hooks.d > -ALLOW_EMPTY:${PN} = "1" > - > -INSANE_SKIP:${PN} += "ldflags already-stripped textrel" > +INSANE_SKIP:${PN} += "ldflags textrel" > INSANE_SKIP:${PN}-ptest += "textrel" > > RDEPENDS:${PN}-ptest += " \ > -- > 2.25.1 > > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9089): https://lists.yoctoproject.org/g/meta-virtualization/message/9089 Mute This Topic: https://lists.yoctoproject.org/mt/110623149/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
