From d4cfeea4e2ab3d830b81c8022744e2a6511528fd Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Wed, 13 Oct 2021 07:06:06 +0900 Subject: Enable network connection in ivi guest In ivi guest, must require to internet connections. This patch enable network connection in ivi guest. Detaille: Bind eth0 device to ivi guest. Enable systemd-networkd to manage network connection. Add network interface setting to set IP address using dhcp. Bug-AGL: SPEC-4132 Signed-off-by: Naoto Yamaguchi Change-Id: Icf0fb386d1efafb060a66e0cab727f93d5e8e7fd --- meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf | 3 +++ .../lxc-config/files/config.ivi-demo.in | 3 ++- .../systemd/systemd-netif-config/20-wired.network | 6 ++++++ .../recipes-core/systemd/systemd-netif-config_0.1.bb | 19 +++++++++++++++++++ .../recipes-platform/images/guest-image-ivi-demo.bb | 1 + 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta-agl-lxc/recipes-core/systemd/systemd-netif-config/20-wired.network create mode 100644 meta-agl-lxc/recipes-core/systemd/systemd-netif-config_0.1.bb diff --git a/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf b/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf index 08dc9935..9c44da98 100644 --- a/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf +++ b/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf @@ -26,4 +26,7 @@ EXTRA_IMAGEDEPENDS:remove:aglcontainerguest = "arm-trusted-firmware optee-os u-b # We assume rngd is running on the host, so unnecessary in container VIRTUAL-RUNTIME_rngd = "" +# network manager to use +VIRTUAL-RUNTIME_net_manager = "systemd" + hostname:append:aglcontainerivi = "-ivi" diff --git a/meta-agl-lxc/recipes-container/lxc-config/files/config.ivi-demo.in b/meta-agl-lxc/recipes-container/lxc-config/files/config.ivi-demo.in index 01b42802..9b0d52fc 100644 --- a/meta-agl-lxc/recipes-container/lxc-config/files/config.ivi-demo.in +++ b/meta-agl-lxc/recipes-container/lxc-config/files/config.ivi-demo.in @@ -21,7 +21,8 @@ lxc.mount.entry = /run/drm-lease-manager/@DRM_LEASE_DEVICE@ var/display/drm-leas lxc.cgroup.devices.allow = c 10:* rwm lxc.mount.entry = /dev/pvr_sync dev/pvr_sync none bind,optional,create=file -lxc.net.0.type = empty +lxc.net.0.type = phys +lxc.net.0.link = eth0 lxc.environment = QT_QPA_PLATFORM=wayland lxc.environment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ diff --git a/meta-agl-lxc/recipes-core/systemd/systemd-netif-config/20-wired.network b/meta-agl-lxc/recipes-core/systemd/systemd-netif-config/20-wired.network new file mode 100644 index 00000000..abd371bd --- /dev/null +++ b/meta-agl-lxc/recipes-core/systemd/systemd-netif-config/20-wired.network @@ -0,0 +1,6 @@ +[Match] +Name=eth0 + +[Network] +DHCP=ipv4 + diff --git a/meta-agl-lxc/recipes-core/systemd/systemd-netif-config_0.1.bb b/meta-agl-lxc/recipes-core/systemd/systemd-netif-config_0.1.bb new file mode 100644 index 00000000..cd34dc75 --- /dev/null +++ b/meta-agl-lxc/recipes-core/systemd/systemd-netif-config_0.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Systemd network interface configuration" +DESCRIPTION = "Systemd network interface configuration \ + " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = " \ + file://20-wired.network \ + " + +do_install() { + install -D -m0644 ${WORKDIR}/20-wired.network ${D}/etc/systemd/network/20-wired.network +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES:${PN} = "\ + /etc/systemd/network/* \ +" diff --git a/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb index 82ccbed2..9a18444d 100644 --- a/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb +++ b/meta-agl-lxc/recipes-platform/images/guest-image-ivi-demo.bb @@ -13,4 +13,5 @@ IMAGE_INSTALL += " \ qtquickcontrols \ qtquickcontrols2 \ qtwayland \ + systemd-netif-config \ " -- cgit 1.2.3-korg