commit 64f612649d5e5543fa18b7b866d7f022080054d3
author William A. Kennington III <wak@google.com> Sun Nov 06 16:59:41 2022 -0800
committer Ravi Teja <raviteja28031990@gmail.com> Sat Apr 26 12:26:20 2025 -0500
tree f05eb8c7db02868e0c807b1ccdbc1502f25073fd
parent f7116de80882b7edad729e7d8747639eff600b08

ethernet_interface: Runtime detect uboot-env

We don't need a build time option as systems not using it don't include
uboot fw_setenv.

Change-Id: I922fb9ebb0309ab1a792892c28417794f5ed6ef0
Signed-off-by: William A. Kennington III <wak@google.com>

meson.build

diff --git a/meson.build b/meson.build
index 1ce272b..549b4df 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,6 @@
 
 conf_data = configuration_data()
 conf_data.set_quoted('DEFAULT_BUSNAME', default_busname)
-conf_data.set('HAVE_UBOOT_ENV', get_option('uboot-env'))
 conf_data.set(
     'LINK_LOCAL_AUTOCONFIGURATION',
     get_option('default-link-local-autoconf'),

meson.options

diff --git a/meson.options b/meson.options
index b7f2531..6cb3bf9 100644
--- a/meson.options
+++ b/meson.options
@@ -1,11 +1,6 @@
 option('tests', type: 'feature', description: 'Build tests')
 
 option(
-    'uboot-env',
-    type: 'boolean',
-    description: 'Update u-boot env for MAC changes',
-)
-option(
     'default-link-local-autoconf',
     type: 'boolean',
     description: 'Enable link local autoconfiguration by default',

src/ethernet_interface.cpp

diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp
index 9cef02f..c965ddc 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -966,17 +966,18 @@
         manager.get().reloadConfigs();
     }
 
-#ifdef HAVE_UBOOT_ENV
-    // Ensure that the valid address is stored in the u-boot-env
-    auto envVar = interfaceToUbootEthAddr(interface);
-    if (envVar)
+    std::error_code ec;
+    const auto fw_setenv = std::filesystem::path("/sbin/fw_setenv");
+    if (std::filesystem::exists(fw_setenv, ec))
     {
-        // Trimming MAC addresses that are out of range. eg: AA:FF:FF:FF:FF:100;
-        // and those having more than 6 bytes. eg: AA:AA:AA:AA:AA:AA:BB
-        execute("/sbin/fw_setenv", "fw_setenv", envVar->c_str(),
-                validMAC.c_str());
+        // Ensure that the valid address is stored in the u-boot-env
+        auto envVar = interfaceToUbootEthAddr(interface);
+        if (envVar)
+        {
+            execute(fw_setenv.native(), "fw_setenv", envVar->c_str(),
+                    validMAC.c_str());
+        }
     }
-#endif // HAVE_UBOOT_ENV
 
     return value;
 #else