Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

1 files changed, 0 insertions, 40 deletions

diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch b/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch
deleted file mode 100644
index 130ead084..000000000
--- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/files/0001-configure.ac-Fix-no-libsystemd-daemon.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 73ee7e68402a77287054df779f0e44ae1a4f9f0b Mon Sep 17 00:00:00 2001
-From: Leon Anavi <leon.anavi@konsulko.com>
-Date: Mon, 11 May 2020 17:01:35 +0000
-Subject: [PATCH] configure.ac: Fix no libsystemd-daemon
-
-Replace libsystemd-daemon with libsystemd.
-
-Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
----
- configure.ac | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index df8cb5007..9a6fb9b2e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -249,10 +249,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
-             [Add support for systemd startup notification (default is autodetected)]),
-             [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
- AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
--    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
-         [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
-         [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
--            [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
-+            [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
-         )]
-     )
- ])
-@@ -558,7 +558,6 @@ if test "x$enable_nls" = "xyes" ; then
-     GETTEXT_PACKAGE=transmission-gtk
-     AC_SUBST(GETTEXT_PACKAGE)
-     AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
--    AM_GLIB_GNU_GETTEXT
-     transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
-     AC_SUBST(transmissionlocaledir)
- fi
--- 
-2.17.1
-