Hi Diego,
> On 19 Apr 2022, at 17:33, Diego Sueiro via lists.yoctoproject.org
> <[email protected]> wrote:
>
> With the patch "xen: only package xencommon systemd components if systemd is
> enabled" (c9554c6), the following error is displayed:
>
> ERROR: xen-tools-4.15+stableAUTOINC+84fa99099b-r0 do_package: QA Issue:
> xen-tools: Files/directories were installed but not shipped in any package:
> /etc/init.d/xencommons
>
> To fix this, we need to conditionally include/exclude files in do_install
> depending on whether or not systemd is in the DISTRO_FEATURES.
>
> Also, take the opportunity to have the relevant extra sed processing in these
> conditionals.
>
> Signed-off-by: Diego Sueiro <[email protected]>
Reviewed-by: Bertrand Marquis <[email protected]>
Cheers
Bertrand
> ---
> recipes-extended/xen/xen-tools.inc | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/recipes-extended/xen/xen-tools.inc
> b/recipes-extended/xen/xen-tools.inc
> index 6bbc8cd..cf2a344 100644
> --- a/recipes-extended/xen/xen-tools.inc
> +++ b/recipes-extended/xen/xen-tools.inc
> @@ -805,14 +805,22 @@ do_install() {
> for i in $VOLATILE_DIRS; do
> echo "d $i 0755 root root - -" >>
> ${D}${sysconfdir}/tmpfiles.d/xen.conf
> done
> - fi
>
> - # fixup default path to qemu-system-i386
> - sed -i 's#\(test -z "$QEMU_XEN" &&
> QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons
> + if [ -e
> ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service ]; then
> + sed -i
> 's#ExecStart=.*qemu-system-i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#'
> \
> +
> ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
> + fi
> +
> + # remove sysvinit specific file:
> + rm -rf ${sysconfdir}/init.d/xencommons
> +
> + # sysvinit
> + else
> + # fixup default path to qemu-system-i386
> + sed -i 's#\(test -z "$QEMU_XEN" &&
> QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons
>
> - if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
> ]; then
> - sed -i
> 's#ExecStart=.*qemu-system-i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#'
> \
> - ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
> + # remove systemd specific files
> + rm -rf ${systemd_unitdir}
> fi
> }
>
> --
> 2.35.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7193):
https://lists.yoctoproject.org/g/meta-virtualization/message/7193
Mute This Topic: https://lists.yoctoproject.org/mt/90565672/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
