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 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'classes') 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" -- cgit v1.2.3-54-g00ecf