summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wang <hsienchiang@gmail.com>2017-03-16 04:07:23 +0300
committerPatrick Williams <patrick@stwcx.xyz>2017-03-17 00:41:33 +0300
commitdcb5b7652f9a1e9134bdad60d9de85b9a87e1623 (patch)
tree16c133632a1f0206cd39f4a12cf6ce0cb4d020bd
parentc8d495b679dfdb81520a3fe7171a11cf43ffe9d5 (diff)
downloadopenbmc-dcb5b7652f9a1e9134bdad60d9de85b9a87e1623.tar.xz
obmc-phosphor-image.bbclass: Remove inarp from default build
This service was implemented for Barreleye to send out the ARP packet for BMC discovery. We can remove it from default build since it's not necessary for other platforms. Also need to inherit obmc-phosphor-systemd so it can be installed once built in on specific platform. Resolves openbmc/openbmc#1306 Change-Id: I20865177aa939fb729d15e9ba373c80ff8ea59bf Signed-off-by: John Wang <hsienchiang@gmail.com>
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-barreleye/recipes-phosphor/image/obmc-phosphor-image.bbappend1
-rw-r--r--meta-phosphor/classes/obmc-phosphor-image.bbclass1
-rw-r--r--meta-phosphor/common/recipes-phosphor/network/inarp.bb1
3 files changed, 2 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-barreleye/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-barreleye/recipes-phosphor/image/obmc-phosphor-image.bbappend
new file mode 100644
index 000000000..99d2a6b0a
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-barreleye/recipes-phosphor/image/obmc-phosphor-image.bbappend
@@ -0,0 +1 @@
+OBMC_IMAGE_EXTRA_INSTALL_append = " inarp"
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index 3b5b5595b..0800cfe5d 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -71,7 +71,6 @@ CORE_IMAGE_EXTRA_INSTALL_append = " bash \
packagegroup-obmc-apps-extrasdev \
i2c-tools \
screen \
- inarp \
obmc-console \
pam-plugin-access \
${OBMC_IMAGE_EXTRA_INSTALL} \
diff --git a/meta-phosphor/common/recipes-phosphor/network/inarp.bb b/meta-phosphor/common/recipes-phosphor/network/inarp.bb
index 10a5196d9..55525ba09 100644
--- a/meta-phosphor/common/recipes-phosphor/network/inarp.bb
+++ b/meta-phosphor/common/recipes-phosphor/network/inarp.bb
@@ -5,6 +5,7 @@ PR = "r1"
inherit autotools
inherit obmc-phosphor-license
+inherit obmc-phosphor-systemd
DEPENDS += "autoconf-archive-native"
RDEPENDS_${PN} += "network"