From 124fdf351950804e1cdb43084964523f63c38fdc Mon Sep 17 00:00:00 2001 From: Jiaqing Zhao Date: Fri, 15 Jul 2022 09:27:00 +0800 Subject: phosphor-network: Add persist-mac PACKAGECONFIG The build option persist-mac was introduced in phosphor-network/609c12d ("Allow writing MAC address to networkd config file to be blocked"). This commit adds a PACKAGECONFIG for that option, and enables it by default to keep current behavior. Tested: Build pass with both persist-mac PACKAGECONFIG enabled/disabled. Change-Id: I900f09516ec10f0aecfa78117fe85d13e170eb1b Signed-off-by: Jiaqing Zhao --- meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 0ab2ccbe9c..f8500a40aa 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -21,7 +21,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "libnl" DEPENDS += "stdplus" -PACKAGECONFIG ??= "uboot-env default-link-local-autoconf default-ipv6-accept-ra" +PACKAGECONFIG ??= "uboot-env default-link-local-autoconf default-ipv6-accept-ra persist-mac" UBOOT_ENV_RDEPENDS = "${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'}" PACKAGECONFIG[uboot-env] = "-Duboot-env=true,-Duboot-env=false,,${UBOOT_ENV_RDEPENDS}" @@ -30,6 +30,7 @@ PACKAGECONFIG[default-ipv6-accept-ra] = "-Ddefault-ipv6-accept-ra=true,-Ddefault PACKAGECONFIG[nic-ethtool] = "-Dnic-ethtool=true,-Dnic-ethtool=false,," PACKAGECONFIG[sync-mac] = "-Dsync-mac=true,-Dsync-mac=false,nlohmann-json," PACKAGECONFIG[hyp-nw-config] = "-Dhyp-nw-config=true, -Dhyp-nw-config=false,," +PACKAGECONFIG[persist-mac] = "-Dpersist-mac=true, -persist-mac=false,," S = "${WORKDIR}/git" -- cgit v1.2.3