On Thu, May 30, 2024 at 9:21 AM Martin Jansa <[email protected]> wrote:
>
> On Thu, May 30, 2024 at 3:11 PM Bruce Ashfield <[email protected]>
> wrote:
> >
> > On Thu, May 30, 2024 at 8:47 AM Martin Jansa via
> > lists.yoctoproject.org <[email protected]>
> > wrote:
> > >
> > > From: Hieu Van Nguyen <[email protected]>
> > >
> > > unpacked source files are now in UNPACKDIR, so we adjust our
> > > operations to match.
> > >
> > > Some references were missed in previous commit as they
> > > are behind conditional.
> > >
> > > Signed-off-by: Hieu Van Nguyen <[email protected]>
> > > Signed-off-by: Martin Jansa <[email protected]>
> > > ---
> > > recipes-extended/libvirt/libvirt-python.inc | 4 ++--
> > > recipes-extended/libvirt/libvirt_10.0.0.bb | 18 +++++++++---------
> > > 2 files changed, 11 insertions(+), 11 deletions(-)
> > >
> > > diff --git a/recipes-extended/libvirt/libvirt-python.inc
> > > b/recipes-extended/libvirt/libvirt-python.inc
> > > index 6fb2b68c..12041df0 100644
> > > --- a/recipes-extended/libvirt/libvirt-python.inc
> > > +++ b/recipes-extended/libvirt/libvirt-python.inc
> > > @@ -46,7 +46,7 @@ do_compile:append() {
> > > # the syroot staged pkgconfig entries. So we clear the
> > > sysroot
> > > # for just this portion.
> > > export PKG_CONFIG_SYSROOT_DIR=
> > > - cd ${WORKDIR}/${BPN}-python-${PV} && \
> > > + cd ${UNPACKDIR}/${BPN}-python-${PV} && \
> > > ${STAGING_BINDIR_NATIVE}/python3-native/python3
> > > setup.py build
> > > fi
> > > }
> > > @@ -57,7 +57,7 @@ do_install:append() {
> > > # the syroot staged pkgconfig entries. So we clear the
> > > sysroot
> > > # for just this portion.
> > > export PKG_CONFIG_SYSROOT_DIR=
> > > - cd ${WORKDIR}/${BPN}-python-${PV} && \
> > > + cd ${UNPACKDIR}/${BPN}-python-${PV} && \
> >
> > Indeed, I did miss these behind the pkgconfig.
> >
> > > ${STAGING_BINDIR_NATIVE}/python3-native/python3
> > > setup.py install \
> > > --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR}
> > > ${LIBVIRT_INSTALL_ARGS}
> > > fi
> > > diff --git a/recipes-extended/libvirt/libvirt_10.0.0.bb
> > > b/recipes-extended/libvirt/libvirt_10.0.0.bb
> > > index 9ad1f798..ababbf1b 100644
> > > --- a/recipes-extended/libvirt/libvirt_10.0.0.bb
> > > +++ b/recipes-extended/libvirt/libvirt_10.0.0.bb
> > > @@ -286,21 +286,21 @@ do_install:append() {
> > >
> > > if
> > > ${@bb.utils.contains('PACKAGECONFIG','gnutls','true','false',d)}; then
> > > # Generate sample keys and certificates.
> > > - cd ${WORKDIR}
> > > - ${WORKDIR}/gnutls-helper.py -y
> > > + cd ${UNPACKDIR}
> > > + ${UNPACKDIR}/gnutls-helper.py -y
> >
> > I had left these on purpose. Not everything has to be in UNPACKDIR
> > (from my understanding and point of view)
> >
> > Since these are generated files as part of the build, I don't see the issue
> > with them being in WORKDIR.
> >
> > That's what my comment about "generated files" was referring to in the
> > commit message.
>
> I see it's already in master-next, do you want v2 which will call
> gnutls-helper.py from UNPACKDIR but doesn't 'cd' there?
That sounds like a good idea. I'll drop the current patch from master-next.
I was guilty of building it while looking at the change, so I pushed
it out of habit :)
>
> With libvirt-python-${PV} being built under UNPACKDIR already it's a
> bit confusing I agree, maybe it would be clearer to unpack all these
> files and libvirt-python-${PV} under ${BPN} destdir and use ${S}
> everywhere?
That also sounds like a good cleanup / clarification.
Bruce
--
- 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 (#8787):
https://lists.yoctoproject.org/g/meta-virtualization/message/8787
Mute This Topic: https://lists.yoctoproject.org/mt/106387463/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
