[PATCH V3] add option -p for mkir command
Changqing Li
From: Changqing Li <changqing.li@...>
To avoid "cannot create directory '/var/log/openvswitch': File exists" when service is restart Signed-off-by: Changqing Li <changqing.li@...> --- ...01-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch index f7ec3fa..8bda865 100644 --- a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch +++ b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch @@ -96,7 +96,7 @@ index 74e5acb7f..39698f238 100644 ExecStartPre=/bin/rm -f /run/openvswitch.useropts -ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch -ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch -+ExecStartPre=-/bin/mkdir /run/openvswitch /var/log/openvswitch ++ExecStartPre=-/bin/mkdir -p /run/openvswitch /var/log/openvswitch +ExecStartPre=-/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi' -- 2.17.1
|
|
[PATCH v3 2/2] 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-hypervisor.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-extended/xen/xen-hypervisor.inc b/recipes-extended/xen/xen-hypervisor.inc index cffd491..81e361f 100644 --- a/recipes-extended/xen/xen-hypervisor.inc +++ b/recipes-extended/xen/xen-hypervisor.inc @@ -103,3 +103,7 @@ CROSS_CURSES_LIB += "-L${STAGING_LIBDIR_NATIVE}" # Specify the root dir of the .config file for do_menuconfig and do_diffconfig # tasks KCONFIG_CONFIG_ROOTDIR = "${S}/xen" + +# Xen is setting all CC flags on its own. Make sure that they are not modified +# for aarch64, e.g. with architecture-specific optimizations. +TUNE_CCARGS:aarch64="" -- 2.17.1 IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
|
|
[PATCH v3 1/2] 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}". This is done by removing '--with-systemd-modules-load=' flag from EXTRA_OECONF variable. 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc index ca924f4..6e25046 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,6 @@ SYSTEMD_SERVICE:${PN}-xendomains = "xendomains.service" EXTRA_OECONF += " \ --with-systemd=${systemd_unitdir}/system \ - --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \ --with-initddir=${INIT_D_DIR} \ --with-sysconfig-leaf-dir=default \ --with-system-qemu=${bindir}/qemu-system-i386 \ -- 2.17.1 IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
|
|
Re: [PATCH] busybox-initrd: oe-core has upgraded to 1.35.0
Bruce Ashfield
Hi Peter,
toggle quoted messageShow quoted text
Thanks for the patch! I had made a similar change myself this morning (when I saw my builds break), and then noticed this patch on the list. I've updated master, so we should be up and building again. Cheers, Bruce
On Tue, Jan 11, 2022 at 7:21 AM Peter Hoyes <peter.hoyes@...> 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
|
|
[PATCH] busybox-initrd: oe-core has upgraded to 1.35.0
Peter Hoyes
From: Peter Hoyes <Peter.Hoyes@...>
Signed-off-by: Peter Hoyes <Peter.Hoyes@...> --- .../{busybox-initrd_1.34.1.bb =3D> busybox-initrd_1.35.0.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes-core/busybox/{busybox-initrd_1.34.1.bb =3D> busybox-initr= d_1.35.0.bb} (100%) diff --git a/recipes-core/busybox/busybox-initrd_1.34.1.bb b/recipes-core= /busybox/busybox-initrd_1.35.0.bb similarity index 100% rename from recipes-core/busybox/busybox-initrd_1.34.1.bb rename to recipes-core/busybox/busybox-initrd_1.35.0.bb --=20 2.25.1
|
|
Re: [PATCH V2] add option -p for mkir command
Bruce Ashfield
In message: [meta-virtualization][PATCH V2] add option -p for mkir command
on 07/01/2022 Changqing Li wrote: From: Changqing Li <changqing.li@...>Is this happening all the time ? I've never seen it in my logs. I'm assuming it is on some sort of stop, restart ? or on a second boot ? It is worth capturing that in this commit message Otherwise, this looks fine to me. Bruce
|
|
Re: [hardknott][PATCH] busybox-initrd: oe-core has upgraded to 1.33.2
Bruce Ashfield
merged!
toggle quoted messageShow quoted text
Bruce In message: [meta-virtualization][hardknott][PATCH] busybox-initrd: oe-core has upgraded to 1.33.2 on 10/01/2022 Ross Burton wrote:
Signed-off-by: Ross Burton <ross.burton@...>
|
|
Re: Where is docker.cfg file in rocko?
#meta-virtualization
#yocto
Bruce Ashfield
On Wed, Jan 5, 2022 at 4:46 AM <thitgahamtonghop@...> wrote: > > [Edited Message Follows] > > 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. > ERRO[0000] error waiting for container: context canceled > > 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 > > > info: reading kernel config from /proc/config.gz ... > > Generally Necessary: > - check-config.sh: line 159: [: missing `]' > check-config.sh: line 160: /sys/fs/cgroup/memory: Is a directory > cgroup hierarchy: single mountpoint! [/sys/fs/cgroup/memory] > (see https://github.com/tianon/cgroupfs-mount) > - CONFIG_NAMESPACES: enabled > - CONFIG_NET_NS: enabled > - CONFIG_PID_NS: enabled > - CONFIG_IPC_NS: enabled > - CONFIG_UTS_NS: enabled > - CONFIG_CGROUPS: enabled > - CONFIG_CGROUP_CPUACCT: enabled > - CONFIG_CGROUP_DEVICE: enabled > - CONFIG_CGROUP_FREEZER: enabled > - CONFIG_CGROUP_SCHED: enabled > - CONFIG_CPUSETS: enabled > - CONFIG_MEMCG: enabled > - CONFIG_KEYS: enabled > - CONFIG_VETH: missing > - CONFIG_BRIDGE: enabled (as module) > - CONFIG_BRIDGE_NETFILTER: enabled (as module) > - CONFIG_NF_NAT_IPV4: enabled (as module) > - CONFIG_IP_NF_FILTER: enabled (as module) > - CONFIG_IP_NF_TARGET_MASQUERADE: missing > - CONFIG_NETFILTER_XT_MATCH_ADDRTYPE: missing > - CONFIG_NETFILTER_XT_MATCH_CONNTRACK: enabled (as module) > - CONFIG_NETFILTER_XT_MATCH_IPVS: missing > - CONFIG_IP_NF_NAT: missing > - CONFIG_NF_NAT: enabled (as module) > - CONFIG_NF_NAT_NEEDED: enabled > - CONFIG_POSIX_MQUEUE: enabled > - CONFIG_DEVPTS_MULTIPLE_INSTANCES: missing > > Optional Features: > - CONFIG_USER_NS: enabled > - CONFIG_SECCOMP: enabled > - CONFIG_CGROUP_PIDS: missing > - CONFIG_MEMCG_SWAP: enabled > - CONFIG_MEMCG_SWAP_ENABLED: enabled > (cgroup swap accounting is currently enabled) > - CONFIG_LEGACY_VSYSCALL_EMULATE: enabled > - CONFIG_MEMCG_KMEM: enabled > - CONFIG_BLK_CGROUP: enabled > - CONFIG_BLK_DEV_THROTTLING: missing > - CONFIG_IOSCHED_CFQ: enabled > - CONFIG_CFQ_GROUP_IOSCHED: missing > - CONFIG_CGROUP_PERF: missing > - CONFIG_CGROUP_HUGETLB: missing > - CONFIG_NET_CLS_CGROUP: enabled > - CONFIG_CGROUP_NET_PRIO: missing > - CONFIG_CFS_BANDWIDTH: missing > - CONFIG_FAIR_GROUP_SCHED: enabled > - CONFIG_RT_GROUP_SCHED: enabled > - CONFIG_IP_VS: missing > - CONFIG_IP_VS_NFCT: missing > - CONFIG_IP_VS_RR: missing > - CONFIG_EXT3_FS: enabled > - CONFIG_EXT3_FS_XATTR: missing > - CONFIG_EXT3_FS_POSIX_ACL: enabled > - CONFIG_EXT3_FS_SECURITY: enabled > (enable these ext3 configs if you are using ext3 as backing filesystem) > - CONFIG_EXT4_FS: enabled > - CONFIG_EXT4_FS_POSIX_ACL: enabled > - CONFIG_EXT4_FS_SECURITY: enabled > - Network Drivers: > - "overlay": > - CONFIG_VXLAN: missing > Optional (for encrypted networks): > - CONFIG_CRYPTO: enabled > - CONFIG_CRYPTO_AEAD: enabled > - CONFIG_CRYPTO_GCM: enabled (as module) > - CONFIG_CRYPTO_SEQIV: enabled (as module) > - CONFIG_CRYPTO_GHASH: enabled (as module) > - CONFIG_XFRM: enabled > - CONFIG_XFRM_USER: enabled (as module) > - CONFIG_XFRM_ALGO: enabled > - CONFIG_INET_ESP: enabled (as module) > - CONFIG_INET_XFRM_MODE_TRANSPORT: enabled > - "ipvlan": > - CONFIG_IPVLAN: missing > - "macvlan": > - CONFIG_MACVLAN: missing > - CONFIG_DUMMY: enabled (as module) > - "ftp,tftp client in container": > - CONFIG_NF_NAT_FTP: enabled (as module) > - CONFIG_NF_CONNTRACK_FTP: enabled (as module) > - CONFIG_NF_NAT_TFTP: enabled (as module) > - CONFIG_NF_CONNTRACK_TFTP: enabled (as module) > - Storage Drivers: > - "aufs": > - CONFIG_AUFS_FS: enabled > - "btrfs": > - CONFIG_BTRFS_FS: enabled > - CONFIG_BTRFS_FS_POSIX_ACL: enabled > - "devicemapper": > - CONFIG_BLK_DEV_DM: enabled > - CONFIG_DM_THIN_PROVISIONING: missing > - "overlay": > - CONFIG_OVERLAY_FS: missing > - "zfs": > - /dev/zfs: missing > - zfs command: missing > - zpool command: missing > > Limits: > - /proc/sys/kernel/keys/root_maxkeys: 1000000 > > Even running modprobe veth showing that veth is not there: > > modprobe: FATAL: Module veth not found in directory /lib/modules/4.4.113-yocto-standard > > And here is the output of lxc-checkconfig > > --- Namespaces --- > Namespaces: enabled > Utsname namespace: enabled > Ipc namespace: enabled > Pid namespace: enabled > User namespace: enabled > Network namespace: enabled > Multiple /dev/pts instances: missing > > --- Control groups --- > Cgroup: enabled > Cgroup clone_children flag: enabled > Cgroup device: enabled > Cgroup sched: enabled > Cgroup cpu account: enabled > Cgroup memory controller: enabled > Cgroup cpuset: enabled > > --- Misc --- > Veth pair device: missing > Macvlan: missing > Vlan: enabled > Bridges: enabled > Advanced netfilter: enabled > CONFIG_NF_NAT_IPV4: enabled > CONFIG_NF_NAT_IPV6: missing > CONFIG_IP_NF_TARGET_MASQUERADE: missing > CONFIG_IP6_NF_TARGET_MASQUERADE: missing > CONFIG_NETFILTER_XT_TARGET_CHECKSUM: missing > FUSE (for use with lxcfs): enabled > > --- Checkpoint/Restore --- > checkpoint restore: missing > CONFIG_FHANDLE: enabled > CONFIG_EVENTFD: enabled > CONFIG_EPOLL: enabled > CONFIG_UNIX_DIAG: missing > CONFIG_INET_DIAG: enabled > CONFIG_PACKET_DIAG: missing > CONFIG_NETLINK_DIAG: missing > File capabilities: enabled > > Note : Before booting a new kernel, you can check its configuration > usage : CONFIG=/path/to/config /usr/bin/lxc-checkconfig > > 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 OS > > So 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? > Correct. Similar fragments did exist in the rocko timeframe, but if you are looking for docker support .. a newer (and supported) release is highly recommended. Using the fragments depends on your kernel provider. If it is linux yocto, then there is a .inc file in the layer that is enabled whenever virtualization is in the DISTRO_FEATURES. That .inc file adds the fragments to the linux-yocto SRC_URI, and the options will be enabled (https://git.yoctoproject.org/meta-virtualization/tree/recipes-kernel/linux/linux-yocto_virtualization.inc?h=rocko) If your kernel provider is linux-yocto based (i.e. it supports fragments), then you could individually add the fragments via KERNEL_FEATURES (check the yocto docs for details). And finally, if you do have CONFIG_VETH enabled as a module (versus built in), you'd also need to make sure the specific kernel module package is installed to your image, or all modules are installed (via the kernel-modules package that you have mentioned above). 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
|
|
[hardknott][PATCH] busybox-initrd: oe-core has upgraded to 1.33.2
Ross Burton <ross@...>
Signed-off-by: Ross Burton <ross.burton@...>
--- .../{busybox-initrd_1.33.1.bb =3D> busybox-initrd_1.33.2.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes-core/busybox/{busybox-initrd_1.33.1.bb =3D> busybox-initr= d_1.33.2.bb} (100%) diff --git a/recipes-core/busybox/busybox-initrd_1.33.1.bb b/recipes-core= /busybox/busybox-initrd_1.33.2.bb similarity index 100% rename from recipes-core/busybox/busybox-initrd_1.33.1.bb rename to recipes-core/busybox/busybox-initrd_1.33.2.bb --=20 2.25.1
|
|
[PATCH V2] add option -p for mkir command
Changqing Li
From: Changqing Li <changqing.li@...>
To avoid "cannot create directory '/var/log/openvswitch': File exists" Signed-off-by: Changqing Li <changqing.li@...> --- ...01-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch index f7ec3fa..8bda865 100644 --- a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch +++ b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch @@ -96,7 +96,7 @@ index 74e5acb7f..39698f238 100644 ExecStartPre=/bin/rm -f /run/openvswitch.useropts -ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch -ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch -+ExecStartPre=-/bin/mkdir /run/openvswitch /var/log/openvswitch ++ExecStartPre=-/bin/mkdir -p /run/openvswitch /var/log/openvswitch +ExecStartPre=-/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi' -- 2.17.1
|
|
[PATCH] add option -p for mkir command
Changqing Li
From: Changqing Li <changqing.li@...>
To avoid "cannot create directory '/var/log/openvswitch': File exists" Signed-off-by: Changqing Li <changqing.li@...> --- .../openvswitch-git/systemd-create-runtime-dirs.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch b/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch index 12b9e17..111aace 100644 --- a/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch +++ b/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch @@ -23,7 +23,7 @@ index 5002ddf10..74e5acb7f 100644 # OVS_USER_ID from default.conf or sysconfig. ExecStartPre=/bin/rm -f /run/openvswitch.useropts - -+ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch ++ExecStartPre=-/bin/mkdir -p /var/run/openvswitch /var/log/openvswitch ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi' -- 2.17.1
|
|
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
|
|