diff options
10 files changed, 77 insertions, 1 deletions
diff --git a/meta-sunxi-extra/conf/layer.conf b/meta-sunxi-extra/conf/layer.conf index 9f13c06..ba85286 100644 --- a/meta-sunxi-extra/conf/layer.conf +++ b/meta-sunxi-extra/conf/layer.conf @@ -12,3 +12,8 @@ BBFILE_PRIORITY_sunxi-extra-layer = "11" LAYERDEPENDS_sunxi-extra-layer += "sunxi" LAYERSERIES_COMPAT_sunxi-extra-layer = "wrynose" + +BBFILES_DYNAMIC += " \ + virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bb \ + virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bbappend \ +" diff --git a/meta-sunxi-extra/dynamic-layers/virtualization-layer/recipes-kernel/linux/files/netfilter-legacy-podman.cfg b/meta-sunxi-extra/dynamic-layers/virtualization-layer/recipes-kernel/linux/files/netfilter-legacy-podman.cfg new file mode 100644 index 0000000..7e06214 --- /dev/null +++ b/meta-sunxi-extra/dynamic-layers/virtualization-layer/recipes-kernel/linux/files/netfilter-legacy-podman.cfg @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: MIT +# +# Kernel 6.18+ split legacy iptables setsockopt support out of +# CONFIG_IP_NF_IPTABLES into CONFIG_IP_NF_IPTABLES_LEGACY, gated by +# CONFIG_NETFILTER_XTABLES_LEGACY. Podman/netavark's iptables backend +# needs this chain enabled or `iptables -t nat` fails with +# "Table does not exist" even when CONFIG_NF_NAT is set. +# +# Supplements features/netfilter/netfilter.cfg from yocto-kernel-cache, +# which predates this split. + +CONFIG_NETFILTER_XTABLES_LEGACY=y +CONFIG_IP_NF_IPTABLES_LEGACY=m +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_BRIDGE_NETFILTER=m diff --git a/meta-sunxi-extra/dynamic-layers/virtualization-layer/recipes-kernel/linux/linux-mainline_%.bbappend b/meta-sunxi-extra/dynamic-layers/virtualization-layer/recipes-kernel/linux/linux-mainline_%.bbappend new file mode 100644 index 0000000..57b2be0 --- /dev/null +++ b/meta-sunxi-extra/dynamic-layers/virtualization-layer/recipes-kernel/linux/linux-mainline_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +SRC_URI:append = " file://netfilter-legacy-podman.cfg" + +KERNEL_FEATURES:append = " features/namespaces/namespaces.cfg" +KERNEL_FEATURES:append = " features/cgroups/cgroups.cfg" +KERNEL_FEATURES:append = " features/netfilter/netfilter.cfg" diff --git a/meta-sunxi-extra/recipes-kernel/linux/linux-mainline_%.bbappend b/meta-sunxi-extra/recipes-kernel/linux/linux-mainline_%.bbappend new file mode 100644 index 0000000..7ce2f20 --- /dev/null +++ b/meta-sunxi-extra/recipes-kernel/linux/linux-mainline_%.bbappend @@ -0,0 +1,5 @@ +SRCREV_meta ?= "24949c3ef490d79a73a821f688efdc2f562fc851" + +SRC_URI:append = " git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.18;destsuffix=${KMETA};protocol=https" + +KMETA = "kernel-meta" diff --git a/meta-unit-core/recipes-core/plymouth/plymouth/beaglebone-yocto/plymouthd.conf b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-core/plymouth/plymouth/beaglebone-yocto/plymouthd.conf index 109b9b6..109b9b6 100644 --- a/meta-unit-core/recipes-core/plymouth/plymouth/beaglebone-yocto/plymouthd.conf +++ b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-core/plymouth/plymouth/beaglebone-yocto/plymouthd.conf diff --git a/meta-unit-core/recipes-core/plymouth/plymouth/radxa-zero-3e/plymouthd.conf b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-core/plymouth/plymouth/radxa-zero-3e/plymouthd.conf index eaa41c6..eaa41c6 100644 --- a/meta-unit-core/recipes-core/plymouth/plymouth/radxa-zero-3e/plymouthd.conf +++ b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-core/plymouth/plymouth/radxa-zero-3e/plymouthd.conf diff --git a/meta-unit-core/recipes-core/plymouth/plymouth/raspberrypi3-64/plymouthd.conf b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-core/plymouth/plymouth/raspberrypi3-64/plymouthd.conf index eaa41c6..eaa41c6 100644 --- a/meta-unit-core/recipes-core/plymouth/plymouth/raspberrypi3-64/plymouthd.conf +++ b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-core/plymouth/plymouth/raspberrypi3-64/plymouthd.conf diff --git a/meta-unit-core/recipes-core/plymouth/plymouth_%.bbappend b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-core/plymouth/plymouth_%.bbappend index 458711f..458711f 100644 --- a/meta-unit-core/recipes-core/plymouth/plymouth_%.bbappend +++ b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-core/plymouth/plymouth_%.bbappend diff --git a/meta-unit-kas/images/unit-poky/olinuxino-a20-emmc/core-image-unit/wrynose.yml b/meta-unit-kas/images/unit-poky/olinuxino-a20-emmc/core-image-unit/wrynose.yml new file mode 100644 index 0000000..3761cda --- /dev/null +++ b/meta-unit-kas/images/unit-poky/olinuxino-a20-emmc/core-image-unit/wrynose.yml @@ -0,0 +1,44 @@ +header: + version: 20 + includes: + - meta-unit-kas/include/build/conf.yml + - meta-unit-kas/include/layers/bitbake/2.18.yml + - meta-unit-kas/include/layers/bitbake/remote.yml + - meta-unit-kas/include/layers/openembedded-core/wrynose.yml + - meta-unit-kas/include/layers/openembedded-core/remote.yml + - meta-unit-kas/include/layers/meta-yocto/wrynose.yml + - meta-unit-kas/include/layers/meta-yocto/remote.yml + - meta-unit-kas/include/layers/meta-yocto/poky.yml + - meta-unit-kas/include/layers/meta-arm/remote.yml + - meta-unit-kas/include/layers/meta-arm/wrynose.yml + - meta-unit-kas/include/layers/meta-openembedded/wrynose.yml + - meta-unit-kas/include/layers/meta-openembedded/remote.yml + - meta-unit-kas/include/layers/meta-sunxi/remote.yml + - meta-unit-kas/include/layers/meta-sunxi/main.yml + - meta-unit-kas/include/layers/meta-sunxi-extra/olinuxino-a20-emmc.yml + - meta-unit-kas/include/layers/meta-virtualization/wrynose.yml + - meta-unit-kas/include/layers/meta-virtualization/remote.yml + - meta-unit-kas/include/layers/meta-unit-core/core-image-unit.yml + - meta-unit-kas/include/layers/meta-unit-distro/unit-poky.yml + +repos: + meta-arm: + layers: + meta-arm-toolchain: + meta-arm: + meta-arm-bsp: + meta-openembedded: + layers: + meta-filesystems: + meta-oe: + meta-networking: + meta-python: + meta-unit: + layers: + meta-sunxi-extra: + meta-unit-core: + meta-unit-distro: + meta-unit-profiling: + meta-unit-users: + meta-unit-virtualization: + meta-virtualization-extra: diff --git a/meta-unit-virtualization/recipes-core/systemd/systemd-regkeygen/regkeygen.sh b/meta-unit-virtualization/recipes-core/systemd/systemd-regkeygen/regkeygen.sh index 48f504f..0ffaabc 100644 --- a/meta-unit-virtualization/recipes-core/systemd/systemd-regkeygen/regkeygen.sh +++ b/meta-unit-virtualization/recipes-core/systemd/systemd-regkeygen/regkeygen.sh @@ -64,7 +64,7 @@ chmod 644 "$XDG_CONFIG_HOME/containers/certs.d/$DISTRIBUTION_REGISTRY_URL/ca.crt echo "Creating signal file..." touch "$XDG_LOCAL_HOME/share/distribution/certs-ready-signal" -chown -R $TARGET_USR:$TARGET_USR "$XDG_LOCAL_HOME/share/distribution" +chown -R $TARGET_USR:$TARGET_USR "$XDG_LOCAL_HOME" chmod 644 "$XDG_LOCAL_HOME/share/distribution/certs-ready-signal" echo "Registry TLS configuration created and ready for use" |