summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend1
-rw-r--r--meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend1
-rw-r--r--meta-fii/meta-mori/recipes-phosphor/network/phosphor-network_%.bbappend1
-rw-r--r--meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb1
-rw-r--r--meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend1
-rw-r--r--meta-quanta/meta-s6q/recipes-phosphor/network/phosphor-network_%.bbappend2
6 files changed, 1 insertions, 6 deletions
diff --git a/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend
deleted file mode 100644
index ef2e2bab41..0000000000
--- a/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG:append = " nic-ethtool"
diff --git a/meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend
deleted file mode 100644
index 6618bf117b..0000000000
--- a/meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG:append:kudo = " nic-ethtool"
diff --git a/meta-fii/meta-mori/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/network/phosphor-network_%.bbappend
deleted file mode 100644
index c7d192bd88..0000000000
--- a/meta-fii/meta-mori/recipes-phosphor/network/phosphor-network_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG:append:mori = " nic-ethtool"
diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb
index 45a59563c7..c12a8e2eee 100644
--- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb
+++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb
@@ -15,7 +15,6 @@ PACKAGECONFIG ??= "uboot-env default-link-local-autoconf default-ipv6-accept-ra
PACKAGECONFIG[uboot-env] = "-Duboot-env=true,-Duboot-env=false,,${UBOOT_ENV_RDEPENDS}"
PACKAGECONFIG[default-link-local-autoconf] = "-Ddefault-link-local-autoconf=true,-Ddefault-link-local-autoconf=false,,"
PACKAGECONFIG[default-ipv6-accept-ra] = "-Ddefault-ipv6-accept-ra=true,-Ddefault-ipv6-accept-ra=false,,"
-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,,"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend
index 195838d052..fdc3201282 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,2 +1 @@
-PACKAGECONFIG:append:gbs = " nic-ethtool"
PACKAGECONFIG:remove:gbs = "uboot-env"
diff --git a/meta-quanta/meta-s6q/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-quanta/meta-s6q/recipes-phosphor/network/phosphor-network_%.bbappend
index 89beaa9149..876efe663b 100644
--- a/meta-quanta/meta-s6q/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-quanta/meta-s6q/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG:append:s6q = " sync-mac nic-ethtool"
+PACKAGECONFIG:append:s6q = " sync-mac"
FILES:${PN}:append:s6q = " ${datadir}/network/config.json"