On Thu, May 30, 2024 at 8:47 AM Martin Jansa via lists.yoctoproject.org <martin.jansa=gmail....@lists.yoctoproject.org> wrote: > > From: Hieu Van Nguyen <hieu2.ngu...@lge.com> > > 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 <hieu2.ngu...@lge.com> > Signed-off-by: Martin Jansa <martin.ja...@gmail.com> > --- > 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. Bruce > > # Deploy all sample keys and certificates of CA, server and client > # to target so that libvirtd is able to boot successfully and > local > # connection via 127.0.0.1 is available out of box. > install -d ${D}/etc/pki/CA > install -d ${D}/etc/pki/libvirt/private > - install -m 0755 ${WORKDIR}/gnutls-helper.py ${D}/${bindir} > - install -m 0644 ${WORKDIR}/cakey.pem > ${D}/${sysconfdir}/pki/libvirt/private/cakey.pem > - install -m 0644 ${WORKDIR}/cacert.pem > ${D}/${sysconfdir}/pki/CA/cacert.pem > - install -m 0644 ${WORKDIR}/serverkey.pem > ${D}/${sysconfdir}/pki/libvirt/private/serverkey.pem > - install -m 0644 ${WORKDIR}/servercert.pem > ${D}/${sysconfdir}/pki/libvirt/servercert.pem > - install -m 0644 ${WORKDIR}/clientkey.pem > ${D}/${sysconfdir}/pki/libvirt/private/clientkey.pem > - install -m 0644 ${WORKDIR}/clientcert.pem > ${D}/${sysconfdir}/pki/libvirt/clientcert.pem > + install -m 0755 ${UNPACKDIR}/gnutls-helper.py ${D}/${bindir} > + install -m 0644 ${UNPACKDIR}/cakey.pem > ${D}/${sysconfdir}/pki/libvirt/private/cakey.pem > + install -m 0644 ${UNPACKDIR}/cacert.pem > ${D}/${sysconfdir}/pki/CA/cacert.pem > + install -m 0644 ${UNPACKDIR}/serverkey.pem > ${D}/${sysconfdir}/pki/libvirt/private/serverkey.pem > + install -m 0644 ${UNPACKDIR}/servercert.pem > ${D}/${sysconfdir}/pki/libvirt/servercert.pem > + install -m 0644 ${UNPACKDIR}/clientkey.pem > ${D}/${sysconfdir}/pki/libvirt/private/clientkey.pem > + install -m 0644 ${UNPACKDIR}/clientcert.pem > ${D}/${sysconfdir}/pki/libvirt/clientcert.pem > > # Force the connection to be tls. > sed -i -e 's/^\(listen_tls\ =\ .*\)/#\1/' -e 's/^\(listen_tcp\ =\ > .*\)/#\1/' ${D}/etc/libvirt/libvirtd.conf > -- > 2.45.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 (#8785): https://lists.yoctoproject.org/g/meta-virtualization/message/8785 Mute This Topic: https://lists.yoctoproject.org/mt/106387463/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-