meta-google: Purge all avahi support
We never used this and we never intend to pick it back up.
Change-Id: Iaa23d6b9d87129eca8e76d67b8173941342ea2e9
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/meta-google/conf/distro/gbmc.conf b/meta-google/conf/distro/gbmc.conf
index e93a258..1c2c20a 100644
--- a/meta-google/conf/distro/gbmc.conf
+++ b/meta-google/conf/distro/gbmc.conf
@@ -13,6 +13,7 @@
GBMC_CONFIG ?= "dev"
OVERRIDES .= ":${GBMC_CONFIG}:"
+DISTRO_FEATURES:remove = "avahi"
DISTRO_FEATURES:remove = "ldap"
DISTRO_FEATURES:remove = "slp"
diff --git a/meta-google/recipes-connectivity/avahi/avahi_%.bbappend b/meta-google/recipes-connectivity/avahi/avahi_%.bbappend
deleted file mode 100644
index bdf5690..0000000
--- a/meta-google/recipes-connectivity/avahi/avahi_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/files:"
-SRC_URI:append:gbmc = " file://avahi-daemon.conf"
-do_install:append:gbmc() {
- install -m0644 ${WORKDIR}/avahi-daemon.conf ${D}${sysconfdir}/avahi/
-}
diff --git a/meta-google/recipes-connectivity/avahi/files/avahi-daemon.conf b/meta-google/recipes-connectivity/avahi/files/avahi-daemon.conf
deleted file mode 100644
index 57520df..0000000
--- a/meta-google/recipes-connectivity/avahi/files/avahi-daemon.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[server]
-allow-interfaces=mgmt,gbmcbr
-
-[publish]
-disable-user-service-publishing=yes
-add-service-cookie=yes
-publish-hinfo=no
-publish-workstation=no
diff --git a/meta-google/recipes-google/networking/gbmc-bridge.bb b/meta-google/recipes-google/networking/gbmc-bridge.bb
index 09bf2ae..c7b9f5d 100644
--- a/meta-google/recipes-google/networking/gbmc-bridge.bb
+++ b/meta-google/recipes-google/networking/gbmc-bridge.bb
@@ -12,7 +12,6 @@
file://-bmc-gbmcbrdummy.netdev \
file://-bmc-gbmcbrdummy.network \
file://+-bmc-gbmcbrusb.network \
- file://ipmi.service.in \
file://50-gbmc-br.rules \
file://gbmc-br-ula.sh \
file://gbmc-br-from-ra.sh \
@@ -37,7 +36,6 @@
${datadir}/gbmc-br-lib.sh \
${systemd_unitdir}/network \
${sysconfdir}/nftables \
- ${sysconfdir}/avahi/services \
"
RDEPENDS:${PN}:append = " \
@@ -117,13 +115,6 @@
install -m0644 ${WORKDIR}/50-gbmc-br.rules $nftables_dir/
install -m0644 ${WORKDIR}/50-gbmc-br-cn-redirect.rules $nftables_dir/
- avahi_dir=${D}${sysconfdir}/avahi/services
- install -d -m 0755 "$avahi_dir"
- sed -i 's,@MACHINE@,${MACHINE},g' ${WORKDIR}/ipmi.service.in
- sed -i 's,@EXTRA_ATTRS@,,g' ${WORKDIR}/ipmi.service.in
- sed 's,@NAME@,bmc,g' ${WORKDIR}/ipmi.service.in >${avahi_dir}/bmc.ipmi.service
- sed 's,@NAME@,${MACHINE}-bmc,g' ${WORKDIR}/ipmi.service.in >${avahi_dir}/${MACHINE}-bmc.ipmi.service
-
mondir=${D}${datadir}/gbmc-ip-monitor
install -d -m0755 "$mondir"
install -m0644 ${WORKDIR}/gbmc-br-ula.sh "$mondir"/
diff --git a/meta-google/recipes-google/networking/gbmc-bridge/ipmi.service.in b/meta-google/recipes-google/networking/gbmc-bridge/ipmi.service.in
deleted file mode 100644
index 0b940fa..0000000
--- a/meta-google/recipes-google/networking/gbmc-bridge/ipmi.service.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name>@NAME@</name>
- <service>
- <type>_ipmi._udp</type>
- <port>623</port>
- <txt-record>Machine=@MACHINE@</txt-record>
- @EXTRA_ATTRS@
- </service>
-</service-group>