From 79c0e2afd5078656d208ae3752284c5cc8fd8bd3 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Mon, 14 Dec 2020 15:33:34 +0100 Subject: [PATCH] nm-image: Include mac address service only when requested Each distro can choose to have custom mac-address by setting the flag custom-mac-addresses in DISTRO_FEATURES. BugzID: 65928 --- recipes-core/images/netmodule-linux-image-oem.bb | 1 - recipes-core/images/netmodule-linux-image.bb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-core/images/netmodule-linux-image-oem.bb b/recipes-core/images/netmodule-linux-image-oem.bb index 7c81f84..15f7037 100644 --- a/recipes-core/images/netmodule-linux-image-oem.bb +++ b/recipes-core/images/netmodule-linux-image-oem.bb @@ -3,7 +3,6 @@ require netmodule-linux-image.bb IMAGE_INSTALL_remove_am335x-nmhw21 = " \ battery-test \ socket-uart \ - mac-address-set \ " COMPATIBLE_MACHINE = "am335x-nmhw21" diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb index f265ee6..08ed9e6 100644 --- a/recipes-core/images/netmodule-linux-image.bb +++ b/recipes-core/images/netmodule-linux-image.bb @@ -59,6 +59,7 @@ IMAGE_INSTALL_append = " \ nmhw-fwupdate \ ${@bb.utils.contains("MACHINE_FEATURES", "imx-boot", "", "bootloader-config", d)} \ mmc-utils \ + ${@bb.utils.contains("DISTRO_FEATURES", "custom-mac-addresses", "mac-address-set", "", d)} \ " IMAGE_INSTALL_append_am335x-nrhw16 = " \ @@ -77,7 +78,6 @@ IMAGE_INSTALL_append_am335x-nmhw21 = " \ battery-test \ cryptodev-module \ socket-uart \ - mac-address-set \ imu-setup \ gnss-mgr \ chrony \