From 5e08158e9eae225ce74017f5ea51fdf1ba27943b Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sun, 10 May 2020 10:36:20 +0200 Subject: meta: change virtual/network-configuration to network-configuration The name 'virtual' is a recipe specific concept but not a package specific one, it's confusing that a package provides 'virtual/' names. Let's drop 'virtual/' from network-configuration, to keep consistent with yocto naming styles. Signed-off-by: Ming Liu --- classes/sota_m3ulcb.bbclass | 4 ++-- classes/sota_minnowboard.bbclass | 4 ++-- classes/sota_porter.bbclass | 4 ++-- classes/sota_qemux86-64.bbclass | 2 +- classes/sota_raspberrypi.bbclass | 2 +- conf/distro/poky-sota-systemd.conf | 2 +- conf/local.conf.nonostree.append | 2 +- lib/oeqa/selftest/cases/updater_qemux86_64.py | 2 +- recipes-connectivity/connman/connman_%.bbappend | 2 +- recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb | 2 +- recipes-test/images/primary-image.bb | 2 +- recipes-test/images/secondary-image.bb | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/classes/sota_m3ulcb.bbclass b/classes/sota_m3ulcb.bbclass index e7fa9c2..7ea273d 100644 --- a/classes/sota_m3ulcb.bbclass +++ b/classes/sota_m3ulcb.bbclass @@ -8,5 +8,5 @@ OSTREE_BOOTLOADER ?= "u-boot" UBOOT_MACHINE_sota = "${@d.getVar('SOC_FAMILY').split(':')[1]}_ulcb_defconfig" -PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" -IMAGE_INSTALL_append_sota = " virtual/network-configuration " +PREFERRED_RPROVIDER_network-configuration ?= "connman" +IMAGE_INSTALL_append_sota = " network-configuration " diff --git a/classes/sota_minnowboard.bbclass b/classes/sota_minnowboard.bbclass index a907217..3128965 100644 --- a/classes/sota_minnowboard.bbclass +++ b/classes/sota_minnowboard.bbclass @@ -8,5 +8,5 @@ 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 = " minnowboard-efi-startup" -PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" -IMAGE_INSTALL_append_sota = " virtual/network-configuration " +PREFERRED_RPROVIDER_network-configuration ?= "connman" +IMAGE_INSTALL_append_sota = " network-configuration " diff --git a/classes/sota_porter.bbclass b/classes/sota_porter.bbclass index 80062e1..6c6fe70 100644 --- a/classes/sota_porter.bbclass +++ b/classes/sota_porter.bbclass @@ -7,5 +7,5 @@ IMAGE_BOOT_FILES_sota += "porter-bootfiles/*" OSTREE_BOOTLOADER ?= "u-boot" UBOOT_MACHINE_sota = "porter_config" -PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" -IMAGE_INSTALL_append_sota = " virtual/network-configuration " +PREFERRED_RPROVIDER_network-configuration ?= "connman" +IMAGE_INSTALL_append_sota = " network-configuration " diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass index fc4aa7c..3dc2428 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 = " virtual/network-configuration " +IMAGE_INSTALL_append_sota = " network-configuration " diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index d5d89a9..744ba22 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass @@ -13,7 +13,7 @@ UBOOT_DTBO_LOADADDRESS = "0x06000000" IMAGE_INSTALL_append = " fit-conf" DEV_MATCH_DIRECTIVE_pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx" -IMAGE_INSTALL_append_sota = " virtual/network-configuration " +IMAGE_INSTALL_append_sota = " network-configuration " PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" UBOOT_ENTRYPOINT_sota ?= "0x00080000" diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf index 0dc50b0..4b7990f 100644 --- a/conf/distro/poky-sota-systemd.conf +++ b/conf/distro/poky-sota-systemd.conf @@ -9,4 +9,4 @@ DISTRO_CODENAME = "sota" DISTRO_FEATURES_append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" -PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf" +PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" diff --git a/conf/local.conf.nonostree.append b/conf/local.conf.nonostree.append index 0e63e98..ee56b69 100644 --- a/conf/local.conf.nonostree.append +++ b/conf/local.conf.nonostree.append @@ -2,7 +2,7 @@ DISTRO_FEATURES_append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" -PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf" +PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" SOTA_DEPLOY_CREDENTIALS ?= "1" PACKAGECONFIG_pn-aktualizr = "" diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py index 08220f4..dfcb8e0 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py @@ -130,7 +130,7 @@ class SharedCredProvTestsNonOSTree(SharedCredProvTests): self.append_config('DISTRO = "poky"') self.append_config('DISTRO_FEATURES_append = " systemd"') self.append_config('VIRTUAL-RUNTIME_init_manager = "systemd"') - self.append_config('PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf"') + self.append_config('PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf"') self.append_config('PACKAGECONFIG_pn-aktualizr = ""') self.append_config('SOTA_DEPLOY_CREDENTIALS = "1"') self.append_config('IMAGE_INSTALL_append += "aktualizr"') diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend index b3633cc..cd1b95d 100644 --- a/recipes-connectivity/connman/connman_%.bbappend +++ b/recipes-connectivity/connman/connman_%.bbappend @@ -1 +1 @@ -RPROVIDES_${PN} += "virtual/network-configuration" +RPROVIDES_${PN} += "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 40a3958..20a1a17 100644 --- a/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb +++ b/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 inherit systemd -RPROVIDES_${PN} = "virtual/network-configuration" +RPROVIDES_${PN} = "network-configuration" SRC_URI = " \ file://20-wired-dhcp.network \ diff --git a/recipes-test/images/primary-image.bb b/recipes-test/images/primary-image.bb index ba1dc1f..e6896ea 100644 --- a/recipes-test/images/primary-image.bb +++ b/recipes-test/images/primary-image.bb @@ -5,7 +5,7 @@ SUMMARY = "A minimal Uptane Primary image running aktualizr, for testing with a LICENSE = "MPL-2.0" IMAGE_INSTALL_remove = " \ - virtual/network-configuration \ + network-configuration \ " IMAGE_INSTALL_append = " \ diff --git a/recipes-test/images/secondary-image.bb b/recipes-test/images/secondary-image.bb index 7db2c68..22fb7f3 100644 --- a/recipes-test/images/secondary-image.bb +++ b/recipes-test/images/secondary-image.bb @@ -16,7 +16,7 @@ IMAGE_INSTALL_remove = " \ aktualizr-device-prov \ aktualizr-device-prov-hsm \ aktualizr-uboot-env-rollback \ - virtual/network-configuration \ + network-configuration \ " IMAGE_INSTALL_append = " \ -- cgit v1.2.3-54-g00ecf