|
Where is docker.cfg file in rocko?
#meta-virtualization
#yocto
Hi,
So I am having problem running docker image. When I run command: docker run hello-world, this is the output: docker: Error response from daemon: failed to create endpoint elastic_hypatia on network bridge: failed to add the host (vethf9c4250) <=> sandbox (vethc439d7e) pair interfaces: operation not supported.So I suspect that the veth module is missing and as checking, I ran the check-config.sh script, and here is what I get Even running modprobe veth showing that veth is not there:
And here is the output of lxc-checkconfig --- Namespaces ---After going around the internet, I found out that somebody had the same issue with me: https://marc.info/?l=openembedded-devel&m=154773496216135&w=2, and they also think that veth missing is the problem. And as suggestion, I added in my local.conf: CORE_IMAGE_EXTRA_INSTALL += "kernel-modules docker" But they also mentioned the actual solution is : I found the issue. The veth kernel parameter was not enabled. Once I added CONFIG_VETH=y to my docker.cfg file, I was able to successfully run a docker container in my openembedded OSSo where could I do the same? I've used the rocko version and it doesn't have the linux/docker.cfg file? Or could I can create one by myself? P/S: I found in meta-virtualization/recipes-kernel/linux/linux-yocto/ the file docker.cfg, but there is no option as CONFIG_VETH, but in the file lxc.cfg, it exists and already 'y'. I don't really know what needed to actually used this. Why the veth module is not appeared?
|
|
|
|
Re: [PATCH] k3s: fix systemd service install
Bruce Ashfield
On Wed, Dec 29, 2021 at 7:05 AM Adrian Freihofer
<adrian.freihofer@...> wrote: Was that actually causing breakage ? As long as WORKDIR is used, it typically doesn't break anything. - not all paths were replacedWhich ones in particular ? We should document - "if systemd in DISTRO_FEATURES" is already handled in systemd.bbclassIt still needs to be protected by the check. We shouldn't be installing them at all if it isn't enabled. The bbclass doesn't help with that. 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
|
|
|
|
[PATCH] k3s: fix systemd service install
Adrian Freihofer
- sed was complicated and fragile
- sed runs on k3s-agent.service before it was installed - not all paths were replaced - "if systemd in DISTRO_FEATURES" is already handled in systemd.bbclass Signed-off-by: Adrian Freihofer <adrian.freihofer@...> --- recipes-containers/k3s/k3s/k3s-agent.service | 4 ++-- recipes-containers/k3s/k3s/k3s.service | 4 ++-- recipes-containers/k3s/k3s_git.bb | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes-containers/k3s/k3s/k3s-agent.service b/recipes-containers/k3s/k3s/k3s-agent.service index 9f9016d..eeeef2a 100644 --- a/recipes-containers/k3s/k3s/k3s-agent.service +++ b/recipes-containers/k3s/k3s/k3s-agent.service @@ -21,6 +21,6 @@ Restart=always RestartSec=5s ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe overlay -ExecStart=/usr/local/bin/k3s agent -ExecStopPost=/usr/local/bin/k3s-clean +ExecStart=@@BIN_PREFIX@@/bin/k3s agent +ExecStopPost=@@BIN_PREFIX@@/bin/k3s-clean diff --git a/recipes-containers/k3s/k3s/k3s.service b/recipes-containers/k3s/k3s/k3s.service index 33d3ee7..b82d8ce 100644 --- a/recipes-containers/k3s/k3s/k3s.service +++ b/recipes-containers/k3s/k3s/k3s.service @@ -29,9 +29,9 @@ RestartSec=5s ExecStartPre=/bin/sh -xc '! systemctl is-enabled --quiet nm-cloud-setup.service' ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe overlay -ExecStart=/usr/local/bin/k3s server +ExecStart=@@BIN_PREFIX@@/bin/k3s server # Avoid any delay due to this service when the system is rebooting or shutting # down by using the k3s-killall.sh script to kill all of the running k3s # services and containers ExecStopPost=/bin/sh -c "if systemctl is-system-running | grep -i \ - 'stopping'; then /usr/local/bin/k3s-killall.sh; fi" + 'stopping'; then @@BIN_PREFIX@@/bin/k3s-killall.sh; fi" diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb index c9779ea..d38044c 100644 --- a/recipes-containers/k3s/k3s_git.bb +++ b/recipes-containers/k3s/k3s_git.bb @@ -63,12 +63,12 @@ do_install() { install -m 755 "${WORKDIR}/k3s-clean" "${D}${BIN_PREFIX}/bin" install -m 755 "${WORKDIR}/k3s-killall.sh" "${D}${BIN_PREFIX}/bin" - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -D -m 0644 "${WORKDIR}/k3s.service" "${D}${systemd_system_unitdir}/k3s.service" - install -D -m 0644 "${WORKDIR}/k3s-agent.service" "${D}${systemd_system_unitdir}/k3s-agent.service" - sed -i "s#\(Exec\)\(.*\)=\(.*\)\(k3s\)#\1\2=${BIN_PREFIX}/bin/\4#g" "${D}${systemd_system_unitdir}/k3s.service" "${D}${systemd_system_unitdir}/k3s-agent.service" - install -m 755 "${WORKDIR}/k3s-agent" "${D}${BIN_PREFIX}/bin" - fi + install -D -m 0644 "${WORKDIR}/k3s.service" "${D}${systemd_system_unitdir}/k3s.service" + install -D -m 0644 "${WORKDIR}/k3s-agent.service" "${D}${systemd_system_unitdir}/k3s-agent.service" + install -m 755 "${WORKDIR}/k3s-agent" "${D}${BIN_PREFIX}/bin" + sed -i -e "s#@@BIN_PREFIX@@#${BIN_PREFIX}#g" \ + "${D}${systemd_system_unitdir}/k3s.service" \ + "${D}${systemd_system_unitdir}/k3s-agent.service" } PACKAGES =+ "${PN}-server ${PN}-agent" -- 2.31.1
|
|
|
|
Re: [PATCH v2 2/3] xen: Clear TUNE_CCARGS for Xen build for aarch64 machines
Kamil Dziezyk
Hi Cristopher,
Thanks for your comments. My intention was to clear TUNE_CCARGS only for hypervisor compilation, so I will move this change to "xen-hypervisor.inc", to not impact "xen-tools". An example of a machine this patch will fix the compilation is N1SDP from the meta-arm layer.
In the next version of this patch, I will reword that comment regarding "HVM-mode", because it's not accurate for Xen on Arm.
Thanks, Kamil
|
|
|
|
Re: [PATCH v2 3/3] grub-efi: Add xen_boot support when 'xen' is in DISTRO_FEATURES for aarch64
Kamil Dziezyk
Hi Cristopher, 'xen_boot' build-in feature is valid only for aarch64 architecture. Sure, I will send this change to the OE core mailing list. Kamil
|
|
|
|
Re: [PATCH v2 3/3] grub-efi: Add xen_boot support when 'xen' is in DISTRO_FEATURES for aarch64
Christopher Clark
On Thu, Dec 9, 2021 at 5:59 AM Kamil Dziezyk <kamil.dziezyk@...> wrote: Signed-off-by: Kamil Dziezyk <kamil.dziezyk@...> I think this might be better changed in the grub-efi recipe in OE core instead, where the GRUB recipe maintainer can review it? Should this xen_boot build-in feature be enabled for more architectures than just aarch64? Christopher ---
|
|
|
|
Re: [PATCH v2 2/3] xen: Clear TUNE_CCARGS for Xen build for aarch64 machines
Christopher Clark
On Thu, Dec 9, 2021 at 5:59 AM Kamil Dziezyk <kamil.dziezyk@...> wrote: Xen build may fail for arm machines that have enabled extra flags, Apologies for being slow to review this one. From looking at "bitbake -e xen" for an example Raspberry Pi 4 aarch64 build configuration, the major variables that this affects looks like: CPP, CXX and EXTRA_CFLAGS_XEN_TOOLS. So is it the xen recipe or the xen-tools recipe that this patch is intended to fix the build for? (or both?) I can't immediately tell what compilation this fixes, but: I think that this change is probably OK for the hypervisor case, since TUNE_CCARGS is already excluded from the definition of CC for aarch64 for the hypervisor build, but for the tools it will affect the compiler flags, so: Do you really intend to drop all "-mcpu" and "-march" C compiler flags from the Xen tools build, for any aarch64 MACHINEs? Should your MACHINEs actually populate TUNE_CCARGS with those flags if they are not wanted for userspace software? -- or is there a problem that is specifically being encountered with the Xen tools software build? If so, I'd like to know a bit more about that -- and then this workaround may be OK if we can confirm that it doesn't negatively affect the MACHINEs that we care about, which include QemuArm64 and the Rpi4 as a reference platform. As an aside, I would like to remove the similar x86 logic from this recipe where TUNE_CCARGS is cleared to address the hvmloader build, and fix that in a better way. (That will be separate to this work.) The comment that is being added refers to "HVM-mode": is that term still accurate for Xen on Arm? The subject line for this patch should indicate both "xen" and "xen-tools", since this modifies xen.inc which is included by both recipes. I would encourage you to CC both myself and Doug on future posts of Xen-related patches, please. thanks Christopher
|
|
|
|
Re: [PATCH v2 1/3] xen-tools: Load xen related kernel modules during system boot
Christopher Clark
On Mon, Dec 13, 2021 at 12:42 PM Bruce Ashfield <bruce.ashfield@...> wrote: v2 looks good to me, but I'd like to get an Ack from Christopher before merging. Ack, this looks good - thanks for making the change, Kamil. Christopher
|
|
|
|
Re: [m-c-s][PATCH] mod-wsgi: move to 4.9.0
Bruce Ashfield
merged.
toggle quoted messageShow quoted text
Bruce In message: [meta-virtualization][m-c-s][PATCH] mod-wsgi: move to 4.9.0 on 20/12/2021 Jeremy Puhlman wrote:
Older version of mod-wsgi no longer builds against python 3.10
|
|
|
|
[m-c-s][PATCH] mod-wsgi: move to 4.9.0
Older version of mod-wsgi no longer builds against python 3.10
Signed-off-by: Jeremy A. Puhlman <jpuhlman@...> --- ...ow-PYTHON-values-to-be-passed-via-en.patch | 37 +++++++++---------- .../recipes-support/mod-wsgi/mod-wsgi_git.bb | 4 +- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch index 4683db0a..79aedffd 100644 --- a/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch +++ b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch @@ -7,28 +7,31 @@ This allows the recipe to specify specific values instead of them being 'discovered' which may lead to host contamination or similar issues. +Updated for 4.9.0: Jeremy Puhlman + Signed-off-by: Mark Asselstine <mark.asselstine@...> ---- +---- configure.ac | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) + diff --git a/configure.ac b/configure.ac -index 25afe44..b5a9e03 100644 +index 37a0f86..9b77c7f 100644 --- a/configure.ac +++ b/configure.ac -@@ -100,26 +100,38 @@ fi +@@ -106,26 +106,38 @@ fi AC_SUBST(PYTHON) +if test -z "${PYTHON_VERSION}"; then PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("VERSION"))'` +fi +if test -z "${PYTHON_LDVERSION}"; then PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("LDVERSION") or "")'` +fi @@ -38,7 +41,7 @@ index 25afe44..b5a9e03 100644 +if test -z "${PYTHON_INCLUDEPY}"; then CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'` +else +CPPFLAGS1="${PYTHON_INCLUDEPY}" @@ -46,7 +49,7 @@ index 25afe44..b5a9e03 100644 +if test -z "${PYTHON_CFLAGS}"; then CPPFLAGS2=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(" ".join(filter(lambda x: x.startswith("-D"), \ sysconfig.get_config_var("CFLAGS").split())))'` +else @@ -55,13 +58,13 @@ index 25afe44..b5a9e03 100644 if test "${ENABLE_EMBEDDED}" != "yes"; then CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED" -@@ -131,22 +143,43 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}" +@@ -137,22 +149,42 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}" AC_SUBST(CPPFLAGS) +if test -z "${PYTHON_LIBDIR}"; then PYTHONLIBDIR=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("LIBDIR"))'` +else +PYTHONLIBDIR="${PYTHON_LIBDIR}" @@ -76,22 +79,21 @@ index 25afe44..b5a9e03 100644 +fi +if test -z "${PYTHON_FRAMEWORKDIR}"; then PYTHONFRAMEWORKDIR=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'` +else +PYTHONFRAMEWORKDIR="${PYTHON_FRAMEWORKDIR}" +fi -+ +if test -z "${PYTHON_FRAMEWORKPREFIX}"; then PYTHONFRAMEWORKPREFIX=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"))'` +else +PYTHONFRAMEWORKPREFIX="${PYTHON_FRAMEWORKPREFIX}" +fi +if test -z "${PYTHON_FRAMEWORK}"; then PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'` +else +PYTHONFRAMEWORK="${PYTHON_FRAMEWORK}" @@ -99,20 +101,20 @@ index 25afe44..b5a9e03 100644 if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}" -@@ -170,12 +203,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \ +@@ -180,12 +212,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \ LDLIBS1="-lpython${PYTHON_VERSION}" fi + if test -z "${PYTHON_LIBS}"; then LDLIBS2=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("LIBS"))'` + else + LDLIBS2="${PYTHON_LIBS}" + fi + if test -z "${PYTHON_SYSLIBS}"; then LDLIBS3=`${PYTHON} -c 'from sys import stdout; \ - from distutils import sysconfig; \ + import sysconfig; \ stdout.write(sysconfig.get_config_var("SYSLIBS"))'` + else + LDLIBS3="${PYTHON_SYSLIBS}" @@ -120,6 +122,3 @@ index 25afe44..b5a9e03 100644 else LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}" --- -2.7.4 - diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb index 79afba81..910bba1b 100644 --- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb +++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb @@ -9,8 +9,8 @@ HOMEPAGE = "https://github.com/GrahamDumpleton/mod_wsgi" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "217e80b7436035723b80ff02ee349365e8553dfc" -PV = "4.6.8+git${SRCPV}" +SRCREV = "df9faf954a1ab6208f45ba6fde90f0b41f605483" +PV = "4.9.0+git${SRCPV}" S = "${WORKDIR}/git" -- 2.31.1
|
|
|
|
Re: [honister][PATCH] cri-o: switch from master -> main
Bruce Ashfield
Cherry-picked to honister.
toggle quoted messageShow quoted text
Bruce In message: [meta-virtualization][honister][PATCH] cri-o: switch from master -> main on 16/12/2021 Kristian Klausen wrote:
From: Bruce Ashfield <bruce.ashfield@...>
|
|
|
|
[honister][PATCH] cri-o: switch from master -> main
Kristian Klausen <kristian@...>
From: Bruce Ashfield <bruce.ashfield@...>
cri-o has joined the projects switching their default branch to main (and removing the old one). We update our recipe to avoid fetcher errors. Signed-off-by: Bruce Ashfield <bruce.ashfield@...> --- recipes-containers/cri-o/cri-o_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/c= ri-o/cri-o_git.bb index 41b8625..b93c3de 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb @@ -16,7 +16,7 @@ At a high level, we expect the scope of cri-o to be res= tricted to the following =20 SRCREV_cri-o =3D "1d447191ee73ead59f344f354edac5d64f377e15" SRC_URI =3D "\ - git://github.com/kubernetes-sigs/cri-o.git;branch=3Dmaster;name=3Dcri-o= ;protocol=3Dhttps \ + git://github.com/kubernetes-sigs/cri-o.git;branch=3Dmain;name=3Dcri-o;p= rotocol=3Dhttps \ file://0001-Makefile-force-symlinks.patch \ file://crio.conf \ " --=20 2.34.1
|
|
|
|
Re: [PATCH v2 1/3] xen-tools: Load xen related kernel modules during system boot
Bruce Ashfield
v2 looks good to me, but I'd like to get an Ack from Christopher before merging.
toggle quoted messageShow quoted text
Bruce
On Thu, Dec 9, 2021 at 8:58 AM Kamil Dziezyk <kamil.dziezyk@...> wrote:
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
|
|
|
|
Re: Failed build because of lxc-2.0.8
Bruce Ashfield
On Sat, Dec 11, 2021 at 9:56 AM <thitgahamtonghop@...> wrote:
usermerge wasn't tested with lxc in the rocko release, so it is installing parts of the package where usermerge is supposed to overlay/manage things. But at this point Rocko is way out of support, so you'd need to reproduce it on a newer release before anyone can really help. 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
|
|
|
|
Failed build because of lxc-2.0.8
thitgahamtonghop@...
I have successfully build a yocto image with branch rocko. After that, I have cloned the layer meta-virtualization branch rocko and the build has error as bellow. I have checked the lxc-2.0.8.bb file and it is up-to-date to the rocko branch, what could be the problem? And how can I fix this error?
|
|
|
|
List Archives Available at lore.kernel.org
Michael Halstead
This list is now available at https://lore.kernel.org/yocto-meta-virtualization/ for your convenience.
-- Michael Halstead
|
|
|
|
[PATCH v2 3/3] grub-efi: Add xen_boot support when 'xen' is in DISTRO_FEATURES for aarch64
Kamil Dziezyk
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@...>
--- recipes-bsp/grub/grub-efi_%.bbappend | 1 + recipes-bsp/grub/grub-efi_xen.inc | 1 + 2 files changed, 2 insertions(+) create mode 100644 recipes-bsp/grub/grub-efi_%.bbappend create mode 100644 recipes-bsp/grub/grub-efi_xen.inc diff --git a/recipes-bsp/grub/grub-efi_%.bbappend b/recipes-bsp/grub/grub-efi_%.bbappend new file mode 100644 index 0000000..df2b688 --- /dev/null +++ b/recipes-bsp/grub/grub-efi_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${BPN}_xen.inc', '', d)} diff --git a/recipes-bsp/grub/grub-efi_xen.inc b/recipes-bsp/grub/grub-efi_xen.inc new file mode 100644 index 0000000..5aa0958 --- /dev/null +++ b/recipes-bsp/grub/grub-efi_xen.inc @@ -0,0 +1 @@ +GRUB_BUILDIN:append:aarch64 = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' xen_boot', '', d)}" -- 2.17.1
|
|
|
|
[PATCH v2 2/3] xen: Clear TUNE_CCARGS for Xen build for aarch64 machines
Kamil Dziezyk
Xen build may fail for arm machines that have enabled extra flags,
that can be enabled only for specific architecture version, e.g. armv8-2a. Signed-off-by: Kamil Dziezyk <kamil.dziezyk@...> --- recipes-extended/xen/xen.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index d3c7a7d..9ac82ef 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -102,6 +102,11 @@ EXTRA_CFLAGS_XEN_CORE="${DEBUG_PREFIX_MAP}" # EXTRA_CFLAGS_XEN_TOOLS: so clear TUNE_CCARGS on x86 to prevent that. TUNE_CCARGS:x86-64="" +# - The Xen build for aarch64 systems with HVM-mode enabled may include +# architecture specific flags '-march=*' which causes build failure, so clear +# TUNE_CCARGS on aarch64 to prevent that. +TUNE_CCARGS:aarch64="" + # - Yocto supplies the _FORTIFY_SOURCE flag via CC/CPP/CXX but then passes the # optimization -O via C*FLAGS which is problematic when the CFLAGS are cleared # within the build because compilation fails with the compiler stating -- 2.17.1
|
|
|
|
[PATCH v2 1/3] xen-tools: Load xen related kernel modules during system boot
Kamil Dziezyk
This patch changes the location of xen.conf file, that contains list of kernel
modules to be loaded during system boot, to "${nonarch_libdir}". Previous path based on "${systemd_unitdir}" was not considered by default by systemd-modules-load.service. Signed-off-by: Kamil Dziezyk <kamil.dziezyk@...> --- recipes-extended/xen/xen-tools.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc index d831941..17ef0f7 100644 --- a/recipes-extended/xen/xen-tools.inc +++ b/recipes-extended/xen/xen-tools.inc @@ -653,10 +653,10 @@ FILES:${PN}-xm = "\ " FILES:${PN}-xencommons += "\ + ${nonarch_libdir}/modules-load.d/xen.conf \ ${sysconfdir}/default/xencommons \ ${sysconfdir}/init.d/xencommons \ ${sysconfdir}/xen/scripts/launch-xenstore \ - ${systemd_unitdir}/modules-load.d/xen.conf \ ${systemd_unitdir}/system/proc-xen.mount \ ${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \ ${systemd_unitdir}/system/xenconsoled.service \ @@ -744,7 +744,7 @@ SYSTEMD_SERVICE:${PN}-xendomains = "xendomains.service" EXTRA_OECONF += " \ --with-systemd=${systemd_unitdir}/system \ - --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \ + --with-systemd-modules-load=${nonarch_libdir}/modules-load.d \ --with-initddir=${INIT_D_DIR} \ --with-sysconfig-leaf-dir=default \ --with-system-qemu=${bindir}/qemu-system-i386 \ -- 2.17.1
|
|
|
|
Re: [PATCH 1/3] xen-tools: Load xen related kernel modules during system boot
Kamil Dziezyk
Hi Christopher,
I have dropped setting install directory, because it seemed for me to be redundant, but I missed the case, when user customize exec_prefix or nonarch_libdir, so I will apply your suggestion.
|
|
|