poky-stx.conf: remove zeroconf from DISTRO_FEATURES

The zeroconf distro feature will install packagegroup-base-zeroconf
that depends on libnss-mdns, which will breaks dns resolution for
StarlingX, so remove it from DISTRO_FEATURES

Issue-ID: INF-128
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I23f947e2163596f27081344bdfd23b88d7038ce4

diff --git a/meta-stx/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg b/meta-stx/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg
index ceb743d..8831a3a 100644 (file)
--- a/meta-stx/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg
+++ b/meta-stx/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg
@@ -3671,7 +3671,6 @@ libnpth0-1.6-r0.corei7_64
 libnsl2-1.2.0+git0+37c5ffe303-r0.corei7_64
 libnsl-dev-1.2.0+git0+37c5ffe303-r0.corei7_64
 libnss-db2-2.29-r0.corei7_64
-libnss-mdns-0.10-r7.corei7_64
 libnss-myhostname2-241+0+d1cc09a6ea-r0.corei7_64
 libpam-1.3.0-r5.corei7_64
 libpam-dev-1.3.0-r5.corei7_64
@@ -4085,7 +4084,6 @@ packagegroup-base-pci-1.0-r83.intel_corei7_64
 packagegroup-base-usbgadget-1.0-r83.intel_corei7_64
 packagegroup-base-usbhost-1.0-r83.intel_corei7_64
 packagegroup-base-wifi-1.0-r83.intel_corei7_64
-packagegroup-base-zeroconf-1.0-r83.intel_corei7_64
 packagegroup-basic-1.0-r13.intel_corei7_64
 packagegroup-core-base-utils-1.0-r0.noarch
 packagegroup-core-boot-1.0-r17.intel_corei7_64

diff --git a/meta-stx/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg b/meta-stx/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg
index cdcbfdc..d789e53 100644 (file)
--- a/meta-stx/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg
+++ b/meta-stx/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg
@@ -3660,7 +3660,6 @@ libnpth0-1.6-r0.corei7_64
 libnsl2-1.2.0+git0+37c5ffe303-r0.corei7_64
 libnsl-dev-1.2.0+git0+37c5ffe303-r0.corei7_64
 libnss-db2-2.29-r0.corei7_64
-libnss-mdns-0.10-r7.corei7_64
 libnss-myhostname2-241+0+d1cc09a6ea-r0.corei7_64
 libpam-1.3.0-r5.corei7_64
 libpam-dev-1.3.0-r5.corei7_64
@@ -4077,7 +4076,6 @@ packagegroup-base-pci-1.0-r83.intel_corei7_64
 packagegroup-base-usbgadget-1.0-r83.intel_corei7_64
 packagegroup-base-usbhost-1.0-r83.intel_corei7_64
 packagegroup-base-wifi-1.0-r83.intel_corei7_64
-packagegroup-base-zeroconf-1.0-r83.intel_corei7_64
 packagegroup-basic-1.0-r13.intel_corei7_64
 packagegroup-core-base-utils-1.0-r0.noarch
 packagegroup-core-boot-1.0-r17.intel_corei7_64

diff --git a/meta-stx/conf/distro/include/stx-features.inc b/meta-stx/conf/distro/include/stx-features.inc
index 531b170..b2a6a6d 100644 (file)
--- a/meta-stx/conf/distro/include/stx-features.inc
+++ b/meta-stx/conf/distro/include/stx-features.inc
@@ -50,6 +50,10 @@ DISTRO_FEATURES_append = " kvm"
 DISTRO_FEATURES_append = " openstack"
 PREFERRED_PROVIDER_virtual/containerd = "containerd-opencontainers"
 
+# packagegroup-base-zeroconf depends on libnss-mdns which breaks
+# the dns resolution for StarlingX
+DISTRO_FEATURES_remove = "zeroconf"
+
 #Graphics and misc
 #DISTRO_FEATURES_append = " x11 opengl"
 #EXTRA_IMAGE_FEATURES_append = " x11-base"

diff --git a/meta-stx/recipes-connectivity/avahi/avahi_%.bbappend b/meta-stx/recipes-connectivity/avahi/avahi_%.bbappend
new file mode 100644 (file)
index 0000000..90a15a8
--- /dev/null
+++ b/meta-stx/recipes-connectivity/avahi/avahi_%.bbappend
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2019 Wind River Systems, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+RRECOMMENDS_${PN}_remove_libc-glibc = "libnss-mdns"
+RRECOMMENDS_${PN}-daemon_remove_libc-glibc = "libnss-mdns"