From 1fdd1d1ced34de8eefe6d34da03c6db20b98f141 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Wed, 6 Mar 2019 10:58:00 +0100 Subject: Define virtual/network-configuration Now provided by connman and networkd-dhcp-conf, added to images in our supported platforms Signed-off-by: Laurent Bonnans --- classes/sota_m3ulcb.bbclass | 3 ++- classes/sota_minnowboard.bbclass | 5 +++-- classes/sota_porter.bbclass | 3 ++- classes/sota_qemux86-64.bbclass | 2 +- classes/sota_raspberrypi.bbclass | 4 +++- conf/distro/poky-sota-systemd.conf | 1 + recipes-connectivity/connman/connman_%.bbappend | 1 + recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb | 2 ++ recipes-test/images/secondary-image.bb | 4 +--- 9 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 recipes-connectivity/connman/connman_%.bbappend diff --git a/classes/sota_m3ulcb.bbclass b/classes/sota_m3ulcb.bbclass index 9bbd5c2..b93cc40 100644 --- a/classes/sota_m3ulcb.bbclass +++ b/classes/sota_m3ulcb.bbclass @@ -7,4 +7,5 @@ IMAGE_BOOT_FILES_sota += "m3ulcb-ota-bootfiles/*" OSTREE_BOOTLOADER ?= "u-boot" UBOOT_MACHINE_sota = "m3ulcb_defconfig" -IMAGE_INSTALL_append_sota = " connman connman-client" +PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" +IMAGE_INSTALL_append_sota = " virtual/network-configuration " diff --git a/classes/sota_minnowboard.bbclass b/classes/sota_minnowboard.bbclass index 0304ef3..a907217 100644 --- a/classes/sota_minnowboard.bbclass +++ b/classes/sota_minnowboard.bbclass @@ -6,6 +6,7 @@ IMAGE_BOOT_FILES_sota = "" IMAGE_FSTYPES_remove_sota = "live hddimg" OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0" - -IMAGE_INSTALL_append_sota = " connman connman-client" IMAGE_INSTALL_append = " minnowboard-efi-startup" + +PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" +IMAGE_INSTALL_append_sota = " virtual/network-configuration " diff --git a/classes/sota_porter.bbclass b/classes/sota_porter.bbclass index 9beea33..80062e1 100644 --- a/classes/sota_porter.bbclass +++ b/classes/sota_porter.bbclass @@ -7,4 +7,5 @@ IMAGE_BOOT_FILES_sota += "porter-bootfiles/*" OSTREE_BOOTLOADER ?= "u-boot" UBOOT_MACHINE_sota = "porter_config" -IMAGE_INSTALL_append_sota = " connman connman-client" +PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" +IMAGE_INSTALL_append_sota = " virtual/network-configuration " diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass index 8dae0c5..fc4aa7c 100644 --- a/classes/sota_qemux86-64.bbclass +++ b/classes/sota_qemux86-64.bbclass @@ -13,4 +13,4 @@ IMAGE_ROOTFS_EXTRA_SPACE = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', '655 # fix for u-boot/swig build issue HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc" -IMAGE_INSTALL_append_sota = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'networkd-dhcp-conf', '', d)} " +IMAGE_INSTALL_append_sota = " virtual/network-configuration " diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index c603b23..1b54558 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass @@ -11,7 +11,9 @@ UBOOT_DTBO_LOADADDRESS = "0x06000000" # Deploy config fragment list to OSTree root fs IMAGE_INSTALL_append = " fit-conf" -IMAGE_INSTALL_append_sota = " connman connman-client" + +PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" +IMAGE_INSTALL_append_sota = " virtual/network-configuration " PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" UBOOT_ENTRYPOINT_sota ?= "0x00008000" diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf index 3b7de35..b30b322 100644 --- a/conf/distro/poky-sota-systemd.conf +++ b/conf/distro/poky-sota-systemd.conf @@ -9,3 +9,4 @@ DISTRO_CODENAME = "sota" DISTRO_FEATURES_append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" +PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf" diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend new file mode 100644 index 0000000..b3633cc --- /dev/null +++ b/recipes-connectivity/connman/connman_%.bbappend @@ -0,0 +1 @@ +RPROVIDES_${PN} += "virtual/network-configuration" diff --git a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb index 60eae44..39500c7 100644 --- a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb +++ b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 inherit systemd +RPROVIDES_${PN} = "virtual/network-configuration" + SRC_URI_append = " file://20-wired-dhcp.network" PR = "r1" diff --git a/recipes-test/images/secondary-image.bb b/recipes-test/images/secondary-image.bb index 371d517..61df85b 100644 --- a/recipes-test/images/secondary-image.bb +++ b/recipes-test/images/secondary-image.bb @@ -15,9 +15,7 @@ IMAGE_INSTALL_remove = " \ aktualizr-ca-implicit-prov-creds \ aktualizr-hsm-prov \ aktualizr-uboot-env-rollback \ - connman \ - connman-client \ - networkd-dhcp-conf \ + virtual/network-configuration \ " IMAGE_INSTALL_append = " \ -- cgit v1.2.3-54-g00ecf