diff options
author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-03-05 16:53:41 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2019-04-26 15:41:32 +0200 |
commit | c4855e5d6ed4778227444dcae1c03f0abb71c399 (patch) | |
tree | 65ef9e09e977e625c7a817ab3d8a0c2fc6f0947c | |
parent | 5b9aa5dc203f8ad4d67b7259bf02d37f06e2c457 (diff) | |
download | meta-updater-c4855e5d6ed4778227444dcae1c03f0abb71c399.tar.gz |
Remove connman* from base IMAGE_INSTALL_append
No sense to force that if poky does not, let's move it to
platform-specific for now.
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
-rw-r--r-- | classes/sota_am335x-evm-wifi.bbclass | 1 | ||||
-rw-r--r-- | classes/sota_m3ulcb.bbclass | 2 | ||||
-rw-r--r-- | classes/sota_minnowboard.bbclass | 1 | ||||
-rw-r--r-- | classes/sota_porter.bbclass | 1 | ||||
-rw-r--r-- | classes/sota_qemux86-64.bbclass | 2 | ||||
-rw-r--r-- | classes/sota_raspberrypi.bbclass | 2 | ||||
-rw-r--r-- | conf/distro/poky-sota-systemd.conf | 2 | ||||
-rw-r--r-- | conf/distro/poky-sota.conf | 2 |
8 files changed, 8 insertions, 5 deletions
diff --git a/classes/sota_am335x-evm-wifi.bbclass b/classes/sota_am335x-evm-wifi.bbclass index adefb47..1458d44 100644 --- a/classes/sota_am335x-evm-wifi.bbclass +++ b/classes/sota_am335x-evm-wifi.bbclass | |||
@@ -7,7 +7,6 @@ IMAGE_BOOT_FILES_sota = "bootfiles/*" | |||
7 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p2 console=ttyO0,115200n8l" | 7 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk0p2 console=ttyO0,115200n8l" |
8 | 8 | ||
9 | IMAGE_INSTALL_append_sota = " uim iw wl18xx-calibrator wlconf wl18xx-fw hostapd wpa-supplicant" | 9 | IMAGE_INSTALL_append_sota = " uim iw wl18xx-calibrator wlconf wl18xx-fw hostapd wpa-supplicant" |
10 | IMAGE_INSTALL_remove_sota = " connman connman-client" | ||
11 | 10 | ||
12 | PREFERRED_VERSION_linux-ti-staging_sota = "4.4.54+gitAUTOINC+ecd4eada6f" | 11 | PREFERRED_VERSION_linux-ti-staging_sota = "4.4.54+gitAUTOINC+ecd4eada6f" |
13 | 12 | ||
diff --git a/classes/sota_m3ulcb.bbclass b/classes/sota_m3ulcb.bbclass index 6b63af4..9bbd5c2 100644 --- a/classes/sota_m3ulcb.bbclass +++ b/classes/sota_m3ulcb.bbclass | |||
@@ -6,3 +6,5 @@ IMAGE_BOOT_FILES_sota += "m3ulcb-ota-bootfiles/*" | |||
6 | 6 | ||
7 | OSTREE_BOOTLOADER ?= "u-boot" | 7 | OSTREE_BOOTLOADER ?= "u-boot" |
8 | UBOOT_MACHINE_sota = "m3ulcb_defconfig" | 8 | UBOOT_MACHINE_sota = "m3ulcb_defconfig" |
9 | |||
10 | IMAGE_INSTALL_append_sota = " connman connman-client" | ||
diff --git a/classes/sota_minnowboard.bbclass b/classes/sota_minnowboard.bbclass index 63510e3..0304ef3 100644 --- a/classes/sota_minnowboard.bbclass +++ b/classes/sota_minnowboard.bbclass | |||
@@ -7,4 +7,5 @@ IMAGE_BOOT_FILES_sota = "" | |||
7 | IMAGE_FSTYPES_remove_sota = "live hddimg" | 7 | 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 | 9 | ||
10 | IMAGE_INSTALL_append_sota = " connman connman-client" | ||
10 | IMAGE_INSTALL_append = " minnowboard-efi-startup" | 11 | IMAGE_INSTALL_append = " minnowboard-efi-startup" |
diff --git a/classes/sota_porter.bbclass b/classes/sota_porter.bbclass index 75ae579..9beea33 100644 --- a/classes/sota_porter.bbclass +++ b/classes/sota_porter.bbclass | |||
@@ -7,3 +7,4 @@ 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 | IMAGE_INSTALL_append_sota = " connman connman-client" | ||
diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass index 82efe52..5d82bde 100644 --- a/classes/sota_qemux86-64.bbclass +++ b/classes/sota_qemux86-64.bbclass | |||
@@ -12,3 +12,5 @@ IMAGE_ROOTFS_EXTRA_SPACE = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', '655 | |||
12 | 12 | ||
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 | |||
16 | IMAGE_INSTALL_append_sota = " connman connman-client" | ||
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index 49aa298..73f36ee 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass | |||
@@ -3,6 +3,8 @@ RPI_USE_U_BOOT_sota = "1" | |||
3 | KERNEL_CLASSES_append_sota = " kernel-fitimage" | 3 | KERNEL_CLASSES_append_sota = " kernel-fitimage" |
4 | KERNEL_IMAGETYPE_sota = "fitImage" | 4 | KERNEL_IMAGETYPE_sota = "fitImage" |
5 | 5 | ||
6 | IMAGE_INSTALL_append_sota = " connman connman-client" | ||
7 | |||
6 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" | 8 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" |
7 | UBOOT_ENTRYPOINT_sota ?= "0x00008000" | 9 | UBOOT_ENTRYPOINT_sota ?= "0x00008000" |
8 | 10 | ||
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf index 7d008a9..3b7de35 100644 --- a/conf/distro/poky-sota-systemd.conf +++ b/conf/distro/poky-sota-systemd.conf | |||
@@ -9,5 +9,3 @@ DISTRO_CODENAME = "sota" | |||
9 | 9 | ||
10 | DISTRO_FEATURES_append = " systemd" | 10 | DISTRO_FEATURES_append = " systemd" |
11 | VIRTUAL-RUNTIME_init_manager = "systemd" | 11 | VIRTUAL-RUNTIME_init_manager = "systemd" |
12 | |||
13 | IMAGE_INSTALL_append = " connman connman-client" | ||
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf index 2bbc62b..3fb1d20 100644 --- a/conf/distro/poky-sota.conf +++ b/conf/distro/poky-sota.conf | |||
@@ -5,5 +5,3 @@ DISTRO = "poky-sota" | |||
5 | DISTRO_NAME = "OTA-enabled Linux" | 5 | DISTRO_NAME = "OTA-enabled Linux" |
6 | DISTRO_VERSION = "1.0" | 6 | DISTRO_VERSION = "1.0" |
7 | DISTRO_CODENAME = "sota" | 7 | DISTRO_CODENAME = "sota" |
8 | |||
9 | IMAGE_INSTALL_append = " connman connman-client" | ||