summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-07-15 09:49:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-20 10:28:50 +0100
commite53630ee3af75455294e8fbac8552e8581c4791e (patch)
tree458984e9fb6a34dfa0363a19f7c76cb4d8e86b96 /meta/recipes-extended
parent096b4c639b6326b0bc14bcb279e04ca4939ad1aa (diff)
downloadpoky-e53630ee3af75455294e8fbac8552e8581c4791e.tar.gz
at: upgrade to 3.1.20
configure-fix-with-without-selinux.patch is removed as it has been merged. (From OE-Core rev: c28379fbe62b75a3156bef4d9191fc69155a6297) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch53
-rw-r--r--meta/recipes-extended/at/at_3.1.20.bb (renamed from meta/recipes-extended/at/at_3.1.18.bb)7
2 files changed, 3 insertions, 57 deletions
diff --git a/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch b/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch
deleted file mode 100644
index 389af1e072..0000000000
--- a/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From c02354af7f3d9426da31503abfae70952c699a9d Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Fri, 18 Mar 2016 03:23:11 -0400
4Subject: [PATCH] configure: fix with/without selinux
5
6Problem:
7without-selinux doesn't work since WITH_SELINUX is always be defined no
8matter which option is given: with-selinux, without-selinux.
9
10Fix:
11Disable selinux support if without-selinux is given; otherwise check
12libselinux to determine if selinux support should be enabled.
13
14Upstream-Status: Submitted [at@packages.debian.org]
15
16Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
17---
18 configure.ac | 19 +++++++++++++++----
19 1 file changed, 15 insertions(+), 4 deletions(-)
20
21diff --git a/configure.ac b/configure.ac
22index 5a43419..8c9de62 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -240,10 +240,21 @@ AC_ARG_WITH(daemon_username,
26 AC_SUBST(DAEMON_USERNAME)
27
28 AC_ARG_WITH(selinux,
29-[ --with-selinux Define to run with selinux],
30-AC_DEFINE(WITH_SELINUX, 1, [Define if you are building with_selinux]),
31-)
32-AC_CHECK_LIB(selinux, is_selinux_enabled, SELINUXLIB=-lselinux)
33+[ --with-selinux Define to run with selinux (default=check)],
34+[],
35+[with_selinux=check])
36+
37+if test "x$with_selinux" != xno; then
38+ AC_CHECK_LIB([selinux], [is_selinux_enabled],
39+ [SELINUXLIB=-lselinux
40+ AC_DEFINE(WITH_SELINUX, 1, [Define if you are building with_selinux])
41+ ],
42+ [if test "x$with_selinux" != xcheck; then
43+ AC_MSG_FAILURE([--with-selinux is given, but test for selinux failed])
44+ fi
45+ ]
46+ )
47+fi
48 AC_SUBST(SELINUXLIB)
49 AC_SUBST(WITH_SELINUX)
50
51--
521.9.1
53
diff --git a/meta/recipes-extended/at/at_3.1.18.bb b/meta/recipes-extended/at/at_3.1.20.bb
index 93044f53e2..1c3eefc828 100644
--- a/meta/recipes-extended/at/at_3.1.18.bb
+++ b/meta/recipes-extended/at/at_3.1.20.bb
@@ -15,7 +15,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
15RCONFLICTS_${PN} = "atd" 15RCONFLICTS_${PN} = "atd"
16RREPLACES_${PN} = "atd" 16RREPLACES_${PN} = "atd"
17 17
18SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz;subdir=${BP} \ 18SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
19 file://fix_parallel_build_error.patch \ 19 file://fix_parallel_build_error.patch \
20 file://posixtm.c \ 20 file://posixtm.c \
21 file://posixtm.h \ 21 file://posixtm.h \
@@ -25,14 +25,13 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz;subdir=${BP} \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 25 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
26 file://makefile-fix-parallel.patch \ 26 file://makefile-fix-parallel.patch \
27 file://0001-remove-glibc-assumption.patch \ 27 file://0001-remove-glibc-assumption.patch \
28 file://configure-fix-with-without-selinux.patch \
29 " 28 "
30 29
31PAM_SRC_URI = "file://pam.conf.patch \ 30PAM_SRC_URI = "file://pam.conf.patch \
32 file://configure-add-enable-pam.patch" 31 file://configure-add-enable-pam.patch"
33 32
34SRC_URI[md5sum] = "f67a7aab557cd5b4a1311079a08acebe" 33SRC_URI[md5sum] = "e7bd7b785b2cbb17e133d6bdc0fb099e"
35SRC_URI[sha256sum] = "dbd5c8cb8edd53ef467363c3af0391c08769f1dbbd4d5002c59a4cd4cac11d52" 34SRC_URI[sha256sum] = "0871923cab73050b98ace020664eb2ddc1e669e4166b5abb64d864d02fcefab9"
36 35
37EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ 36EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
38 --with-daemon_username=root \ 37 --with-daemon_username=root \