From f2433d706b01e739076f432f1c9539f24e89fe85 Mon Sep 17 00:00:00 2001 From: unitexe Date: Fri, 27 Feb 2026 11:21:16 -0600 Subject: Load IP tables module by default so pubd kube will work --- meta-unit-core/recipes-support/pubd/pubd_git.bb | 22 ---------------------- .../recipes-containers/pubd-kube/pubd-kube.bb | 1 + .../load-ip-tables-module/files/ip_tables.conf | 1 + .../load-ip-tables-module/load-ip-tables-module.bb | 13 +++++++++++++ .../recipes-support/pubd/pubd_git.bb | 22 ++++++++++++++++++++++ 5 files changed, 37 insertions(+), 22 deletions(-) delete mode 100644 meta-unit-core/recipes-support/pubd/pubd_git.bb create mode 100644 meta-unit-virtualization/recipes-support/load-ip-tables-module/files/ip_tables.conf create mode 100644 meta-unit-virtualization/recipes-support/load-ip-tables-module/load-ip-tables-module.bb create mode 100644 meta-unit-virtualization/recipes-support/pubd/pubd_git.bb diff --git a/meta-unit-core/recipes-support/pubd/pubd_git.bb b/meta-unit-core/recipes-support/pubd/pubd_git.bb deleted file mode 100644 index af645af..0000000 --- a/meta-unit-core/recipes-support/pubd/pubd_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Pubd protobuf files" -DESCRIPTION = "Protobuf files for pubd application" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a77c12e0c0e8a14cebb1494195720ccc" - -SRC_URI = "git://git.closedcircuitconsulting.com/pubd;branch=main;protocol=https" - -SRCREV = "53dbe597ae5b46812fc98d1da059e08a7e73047c" - -PV = "0.1.0" - -RDEPENDS:${PN}:append = " add-user-svc" - -S = "${UNPACKDIR}/${PN}-${PV}" - -ROOTLESS_USER_NAME ?= "svc" - -do_install() { - install -D -m 0644 ${S}/proto/countah.proto ${D}/home/${ROOTLESS_USER_NAME}/.config/proto/pubd/countah.proto -} - -FILES:${PN} = "/home/${ROOTLESS_USER_NAME}/.config/proto/pubd/countah.proto" diff --git a/meta-unit-virtualization/recipes-containers/pubd-kube/pubd-kube.bb b/meta-unit-virtualization/recipes-containers/pubd-kube/pubd-kube.bb index ed1e4e1..ce3bd58 100644 --- a/meta-unit-virtualization/recipes-containers/pubd-kube/pubd-kube.bb +++ b/meta-unit-virtualization/recipes-containers/pubd-kube/pubd-kube.bb @@ -11,6 +11,7 @@ SRC_URI = "\ RDEPENDS:${PN}:append = " podman" RDEPENDS:${PN}:append = " add-user-svc" RDEPENDS:${PN}:append = " pubd" +RDEPENDS:${PN}:append = " load-ip-tables-module" S = "${UNPACKDIR}" diff --git a/meta-unit-virtualization/recipes-support/load-ip-tables-module/files/ip_tables.conf b/meta-unit-virtualization/recipes-support/load-ip-tables-module/files/ip_tables.conf new file mode 100644 index 0000000..d1b7e90 --- /dev/null +++ b/meta-unit-virtualization/recipes-support/load-ip-tables-module/files/ip_tables.conf @@ -0,0 +1 @@ +ip_tables \ No newline at end of file diff --git a/meta-unit-virtualization/recipes-support/load-ip-tables-module/load-ip-tables-module.bb b/meta-unit-virtualization/recipes-support/load-ip-tables-module/load-ip-tables-module.bb new file mode 100644 index 0000000..80a20dd --- /dev/null +++ b/meta-unit-virtualization/recipes-support/load-ip-tables-module/load-ip-tables-module.bb @@ -0,0 +1,13 @@ +SUMMARY = "Modules load drop-in configuration for ip tables module" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${UNIT_VIRTUALIZATION_LAYERDIR}/LICENSE;md5=a77c12e0c0e8a14cebb1494195720ccc" + +SRC_URI = "file://ip_tables.conf" + +S = "${UNPACKDIR}" + +do_install() { + install -D -m 0644 ${S}/ip_tables.conf ${D}${sysconfdir}/modules-load.d/ip_tables.conf +} + +FILES:${PN} = "${sysconfdir}/modules-load.d/ip_tables.conf" diff --git a/meta-unit-virtualization/recipes-support/pubd/pubd_git.bb b/meta-unit-virtualization/recipes-support/pubd/pubd_git.bb new file mode 100644 index 0000000..af645af --- /dev/null +++ b/meta-unit-virtualization/recipes-support/pubd/pubd_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "Pubd protobuf files" +DESCRIPTION = "Protobuf files for pubd application" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a77c12e0c0e8a14cebb1494195720ccc" + +SRC_URI = "git://git.closedcircuitconsulting.com/pubd;branch=main;protocol=https" + +SRCREV = "53dbe597ae5b46812fc98d1da059e08a7e73047c" + +PV = "0.1.0" + +RDEPENDS:${PN}:append = " add-user-svc" + +S = "${UNPACKDIR}/${PN}-${PV}" + +ROOTLESS_USER_NAME ?= "svc" + +do_install() { + install -D -m 0644 ${S}/proto/countah.proto ${D}/home/${ROOTLESS_USER_NAME}/.config/proto/pubd/countah.proto +} + +FILES:${PN} = "/home/${ROOTLESS_USER_NAME}/.config/proto/pubd/countah.proto" -- cgit v1.2.3