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/recipes-extended | |
parent | f1377da142f2fb954ad982f39d90706d140800ea (diff) | |
download | meta-openembedded-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/recipes-extended')
-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 b9334a8fd..000000000 --- a/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 56cadbc45c5ef98a7b775638d2109c4a09a58c06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 22 Feb 2014 18:09:57 +0100 | ||
4 | Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login | ||
5 | |||
6 | * they were merged into libsystemd in systemd-209 | ||
7 | |||
8 | Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this) | ||
9 | |||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | configure.ac | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index a7b0148..64d513d 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -196,7 +196,7 @@ AC_ARG_ENABLE([libsystemd-login], | ||
20 | [enable_libsystemd_login=auto]) | ||
21 | if test "$enable_libsystemd_login" != "no"; then | ||
22 | PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, | ||
23 | - [libsystemd-login], | ||
24 | + [libsystemd], | ||
25 | have_libsystemd_login=yes, | ||
26 | have_libsystemd_login=no) | ||
27 | if test "$have_libsystemd_login" = "yes"; then | ||
28 | @@ -223,7 +223,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [ | ||
29 | AS_IF([test "$enable_libsystemd_login" = "no" ], [ | ||
30 | AC_MSG_WARN([ConsoleKit requested but system appears to use systemd]) | ||
31 | ], [ | ||
32 | - AC_MSG_ERROR([ConsoleKit autoconfigured, but systemd is in use (missing libsystemd-login pkg-config?)]) | ||
33 | + AC_MSG_ERROR([ConsoleKit autoconfigured, but systemd is in use (missing libsystemd pkg-config?)]) | ||
34 | ]) | ||
35 | ]) | ||
36 | ]) | ||
37 | -- | ||
38 | 1.8.5.3 | ||
39 | |||
diff --git a/meta-oe/recipes-extended/polkit/polkit_0.112.bb b/meta-oe/recipes-extended/polkit/polkit_0.113.bb index f20e1a40e..29e889615 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" | |||
20 | PAM_SRC_URI = "file://polkit-1_pam.patch" | 20 | PAM_SRC_URI = "file://polkit-1_pam.patch" |
21 | SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ | 21 | SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ |
22 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 22 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
23 | file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ | ||
24 | file://0001-do-not-hardcoded-libdir.patch \ | 23 | file://0001-do-not-hardcoded-libdir.patch \ |
25 | " | 24 | " |
26 | 25 | SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" | |
27 | SRC_URI[md5sum] = "b0f2fa00a55f47c6a5d88e9b73f80127" | 26 | SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" |
28 | SRC_URI[sha256sum] = "d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6" | ||
29 | 27 | ||
30 | EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection" | 28 | EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection" |
31 | 29 | ||