diff options
| author |   Li xin <lixin.fnst@cn.fujitsu.com> | 2015-07-28 18:00:35 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 11:38:01 +0200 |
| commit | 175fb665516874a0b196efd9a77795ee70083c68 (patch) | |
| tree | 26eeee42529900561ca783f9d9e4d46b1426467e /meta-oe | |
| parent | f1377da142f2fb954ad982f39d90706d140800ea (diff) | |
| download | meta-openembedded-contrib-175fb665516874a0b196efd9a77795ee70083c68.tar.gz | |
polkit: 0.112 -> 0.113
Remove 0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch,
it is not needed anymore.
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch | 39 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/polkit/polkit_0.113.bb (renamed from meta-oe/recipes-extended/polkit/polkit_0.112.bb) | 6 |
2 files changed, 2 insertions, 43 deletions
diff --git a/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch deleted file mode 100644 index b9334a8fdfc..00000000000 --- a/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 56cadbc45c5ef98a7b775638d2109c4a09a58c06 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 22 Feb 2014 18:09:57 +0100 -Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login - -* they were merged into libsystemd in systemd-209 - -Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this) - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a7b0148..64d513d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -196,7 +196,7 @@ AC_ARG_ENABLE([libsystemd-login], - [enable_libsystemd_login=auto]) - if test "$enable_libsystemd_login" != "no"; then - PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, -- [libsystemd-login], -+ [libsystemd], - have_libsystemd_login=yes, - have_libsystemd_login=no) - if test "$have_libsystemd_login" = "yes"; then -@@ -223,7 +223,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [ - AS_IF([test "$enable_libsystemd_login" = "no" ], [ - AC_MSG_WARN([ConsoleKit requested but system appears to use systemd]) - ], [ -- AC_MSG_ERROR([ConsoleKit autoconfigured, but systemd is in use (missing libsystemd-login pkg-config?)]) -+ AC_MSG_ERROR([ConsoleKit autoconfigured, but systemd is in use (missing libsystemd pkg-config?)]) - ]) - ]) - ]) --- -1.8.5.3 - diff --git a/meta-oe/recipes-extended/polkit/polkit_0.112.bb b/meta-oe/recipes-extended/polkit/polkit_0.113.bb index f20e1a40e29..29e889615da 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.112.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.113.bb @@ -20,12 +20,10 @@ PACKAGECONFIG[consolekit] = ",,,consolekit" PAM_SRC_URI = "file://polkit-1_pam.patch" SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ file://0001-do-not-hardcoded-libdir.patch \ " - -SRC_URI[md5sum] = "b0f2fa00a55f47c6a5d88e9b73f80127" -SRC_URI[sha256sum] = "d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6" +SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" +SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection" |