busybox: Consolidate rules into a single file

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

5 files changed, 10 insertions, 10 deletions

diff --git a/meta-google/recipes-core/busybox/busybox_%.bbappend b/meta-google/recipes-core/busybox/busybox_%.bbappend
index affe663e7..9d8cb2d97 100644
--- a/meta-google/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-google/recipes-core/busybox/busybox_%.bbappend
@@ -1,7 +1,2 @@
 FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/files:"
-SRC_URI_append_gbmc = " \
-    file://udhcpc6.cfg \
-    file://ip.cfg \
-    file://ls.cfg \
-    file://lsusb.cfg \
-"
+SRC_URI_append_gbmc = " file://gbmc.cfg"
diff --git a/meta-google/recipes-core/busybox/files/udhcpc6.cfg b/meta-google/recipes-core/busybox/files/gbmc.cfg
index 1c2766fda..51d15d1c7 100644
--- a/meta-google/recipes-core/busybox/files/udhcpc6.cfg
+++ b/meta-google/recipes-core/busybox/files/gbmc.cfg
@@ -1,3 +1,12 @@
+# gBMC uses iproute2
+CONFIG_IP=n
+CONFIG_NETSTAT=n
+
+# Debugging utilities
+CONFIG_LSOF=y
+CONFIG_LSUSB=y
+
+# Used by NC-SId
 CONFIG_FEATURE_IPV6=y
 CONFIG_UDHCPC6=y
 CONFIG_FEATURE_UDHCPC6_RFC3646=y
diff --git a/meta-google/recipes-core/busybox/files/ip.cfg b/meta-google/recipes-core/busybox/files/ip.cfg
deleted file mode 100644
index e8acf56b5..000000000
--- a/meta-google/recipes-core/busybox/files/ip.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_IP=n
-CONFIG_NETSTAT=n
diff --git a/meta-google/recipes-core/busybox/files/ls.cfg b/meta-google/recipes-core/busybox/files/ls.cfg
deleted file mode 100644
index a302cb8b1..000000000
--- a/meta-google/recipes-core/busybox/files/ls.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LSOF=y
diff --git a/meta-google/recipes-core/busybox/files/lsusb.cfg b/meta-google/recipes-core/busybox/files/lsusb.cfg
deleted file mode 100644
index 2aba6ef60..000000000
--- a/meta-google/recipes-core/busybox/files/lsusb.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LSUSB=y