diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-25 22:55:05 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 14:22:49 +0000 |
commit | d7bf8c17eca8f8c89898a7794462c773c449e983 (patch) | |
tree | d18618fca85ca5f0c077032cc7b009344b60f663 /import-layers/yocto-poky/meta/recipes-connectivity/avahi | |
parent | e2b5abdc9f28cdf8578e5b9be803c8e697443c20 (diff) | |
download | blackbird-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.tar.gz blackbird-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.zip |
Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-connectivity/avahi')
2 files changed, 5 insertions, 9 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc b/import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc index faa8741dc..781446494 100644 --- a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc +++ b/import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc @@ -63,10 +63,6 @@ EXTRA_OECONF = "--with-avahi-priv-access-group=adm \ EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" - -LDFLAGS_append_libc-uclibc = " -lintl" -LDFLAGS_append_uclinux-uclibc = " -lintl" - do_configure_prepend() { sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac @@ -111,7 +107,6 @@ FILES_avahi-utils = "${bindir}/avahi-*" RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" -# uclibc has no nss RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch b/import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch index 8ccef08df..942607a84 100644 --- a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch +++ b/import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch @@ -1,17 +1,18 @@ -From a59f13fab31a6e25bb03b2c2bc3aea576f857b6c Mon Sep 17 00:00:00 2001 +From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Sun, 12 Jun 2016 18:32:49 +0300 Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3 too -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/lathiat/avahi/pull/130] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Signed-off-by: Dengke Du <dengke.du@windriver.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index aebb716..48bdf63 100644 +index 87a9a17..9860dcc 100644 --- a/configure.ac +++ b/configure.ac @@ -965,7 +965,7 @@ AC_SUBST(avahi_socket) @@ -24,5 +25,5 @@ index aebb716..48bdf63 100644 AC_SUBST(interfacesdir) fi -- -2.1.4 +2.8.1 |