diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2020-06-22 09:29:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-22 09:29:26 +0200 |
commit | bed1238b211417fa68bd8fcb301ce7d112da6ef1 (patch) | |
tree | 6f7f472c40d7f03afbd616be3bb28b4af32f47bf /classes | |
parent | 80072521db9312965d8c52a09bbfb29a633d2274 (diff) | |
parent | 5e08158e9eae225ce74017f5ea51fdf1ba27943b (diff) | |
download | meta-updater-bed1238b211417fa68bd8fcb301ce7d112da6ef1.tar.gz |
Merge pull request #722 from liuming50/fix-network-configuration-naming
meta: change virtual/network-configuration to network-configuration
Diffstat (limited to 'classes')
-rw-r--r-- | classes/sota_m3ulcb.bbclass | 4 | ||||
-rw-r--r-- | classes/sota_minnowboard.bbclass | 4 | ||||
-rw-r--r-- | classes/sota_porter.bbclass | 4 | ||||
-rw-r--r-- | classes/sota_qemux86-64.bbclass | 2 | ||||
-rw-r--r-- | classes/sota_raspberrypi.bbclass | 2 |
5 files changed, 8 insertions, 8 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" | |||
8 | 8 | ||
9 | UBOOT_MACHINE_sota = "${@d.getVar('SOC_FAMILY').split(':')[1]}_ulcb_defconfig" | 9 | UBOOT_MACHINE_sota = "${@d.getVar('SOC_FAMILY').split(':')[1]}_ulcb_defconfig" |
10 | 10 | ||
11 | PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" | 11 | PREFERRED_RPROVIDER_network-configuration ?= "connman" |
12 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | 12 | 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" | |||
8 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0" | 8 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0" |
9 | IMAGE_INSTALL_append = " minnowboard-efi-startup" | 9 | IMAGE_INSTALL_append = " minnowboard-efi-startup" |
10 | 10 | ||
11 | PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" | 11 | PREFERRED_RPROVIDER_network-configuration ?= "connman" |
12 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | 12 | 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/*" | |||
7 | OSTREE_BOOTLOADER ?= "u-boot" | 7 | OSTREE_BOOTLOADER ?= "u-boot" |
8 | UBOOT_MACHINE_sota = "porter_config" | 8 | UBOOT_MACHINE_sota = "porter_config" |
9 | 9 | ||
10 | PREFERRED_RPROVIDER_virtual/network-configuration ?= "connman" | 10 | PREFERRED_RPROVIDER_network-configuration ?= "connman" |
11 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | 11 | 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 | |||
13 | # fix for u-boot/swig build issue | 13 | # fix for u-boot/swig build issue |
14 | HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc" | 14 | HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc" |
15 | 15 | ||
16 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | 16 | 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" | |||
13 | IMAGE_INSTALL_append = " fit-conf" | 13 | IMAGE_INSTALL_append = " fit-conf" |
14 | 14 | ||
15 | DEV_MATCH_DIRECTIVE_pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx" | 15 | DEV_MATCH_DIRECTIVE_pn-networkd-dhcp-conf = "Driver=smsc95xx lan78xx" |
16 | IMAGE_INSTALL_append_sota = " virtual/network-configuration " | 16 | IMAGE_INSTALL_append_sota = " network-configuration " |
17 | 17 | ||
18 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" | 18 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" |
19 | UBOOT_ENTRYPOINT_sota ?= "0x00080000" | 19 | UBOOT_ENTRYPOINT_sota ?= "0x00080000" |