diff options
Diffstat (limited to 'yocto-poky/meta/recipes-extended/at')
-rw-r--r-- | yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch | 53 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch | 21 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-extended/at/at_3.1.18.bb (renamed from yocto-poky/meta/recipes-extended/at/at_3.1.16.bb) | 11 |
3 files changed, 73 insertions, 12 deletions
diff --git a/yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch b/yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch new file mode 100644 index 000000000..389af1e07 --- /dev/null +++ b/yocto-poky/meta/recipes-extended/at/at/configure-fix-with-without-selinux.patch @@ -0,0 +1,53 @@ +From c02354af7f3d9426da31503abfae70952c699a9d Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Fri, 18 Mar 2016 03:23:11 -0400 +Subject: [PATCH] configure: fix with/without selinux + +Problem: +without-selinux doesn't work since WITH_SELINUX is always be defined no +matter which option is given: with-selinux, without-selinux. + +Fix: +Disable selinux support if without-selinux is given; otherwise check +libselinux to determine if selinux support should be enabled. + +Upstream-Status: Submitted [at@packages.debian.org] + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + configure.ac | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5a43419..8c9de62 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -240,10 +240,21 @@ AC_ARG_WITH(daemon_username, + AC_SUBST(DAEMON_USERNAME) + + AC_ARG_WITH(selinux, +-[ --with-selinux Define to run with selinux], +-AC_DEFINE(WITH_SELINUX, 1, [Define if you are building with_selinux]), +-) +-AC_CHECK_LIB(selinux, is_selinux_enabled, SELINUXLIB=-lselinux) ++[ --with-selinux Define to run with selinux (default=check)], ++[], ++[with_selinux=check]) ++ ++if test "x$with_selinux" != xno; then ++ AC_CHECK_LIB([selinux], [is_selinux_enabled], ++ [SELINUXLIB=-lselinux ++ AC_DEFINE(WITH_SELINUX, 1, [Define if you are building with_selinux]) ++ ], ++ [if test "x$with_selinux" != xcheck; then ++ AC_MSG_FAILURE([--with-selinux is given, but test for selinux failed]) ++ fi ++ ] ++ ) ++fi + AC_SUBST(SELINUXLIB) + AC_SUBST(WITH_SELINUX) + +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/yocto-poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch index 66ff3e1c1..100f8898e 100644 --- a/yocto-poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch +++ b/yocto-poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch @@ -13,16 +13,23 @@ Upstream-Status: Pending Signed-off-by: Scott Garman <scott.a.garman@intel.com> -Index: at-3.1.12/Makefile.in -=================================================================== ---- at-3.1.12.orig/Makefile.in -+++ at-3.1.12/Makefile.in -@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y +--- + Makefile.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.in b/Makefile.in +index dd3c2f8..7897e45 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -82,6 +82,8 @@ y.tab.c y.tab.h: parsetime.y lex.yy.c: parsetime.l $(LEX) -i parsetime.l +parsetime.l: y.tab.h + - atrun: atrun.in - configure + atd.service: atd.service.in + sed -e 's![@]sbindir[@]!$(sbindir)!g' < $< > $@ +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-extended/at/at_3.1.16.bb b/yocto-poky/meta/recipes-extended/at/at_3.1.18.bb index 0512bcb83..93044f53e 100644 --- a/yocto-poky/meta/recipes-extended/at/at_3.1.16.bb +++ b/yocto-poky/meta/recipes-extended/at/at_3.1.18.bb @@ -15,7 +15,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" RCONFLICTS_${PN} = "atd" RREPLACES_${PN} = "atd" -SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz;subdir=${BP} \ file://fix_parallel_build_error.patch \ file://posixtm.c \ file://posixtm.h \ @@ -25,13 +25,14 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://makefile-fix-parallel.patch \ file://0001-remove-glibc-assumption.patch \ + file://configure-fix-with-without-selinux.patch \ " PAM_SRC_URI = "file://pam.conf.patch \ file://configure-add-enable-pam.patch" -SRC_URI[md5sum] = "d05da75d9b75d93917ffb16ab48b1e19" -SRC_URI[sha256sum] = "cb9af59c6a54edce9536ba629841055409d1f89d8ae26494727a97141fb4d5c1" +SRC_URI[md5sum] = "f67a7aab557cd5b4a1311079a08acebe" +SRC_URI[sha256sum] = "dbd5c8cb8edd53ef467363c3af0391c08769f1dbbd4d5002c59a4cd4cac11d52" EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ --with-daemon_username=root \ @@ -47,10 +48,10 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE_${PN} = "atd.service" - -do_compile_prepend () { +copy_sources() { cp -f ${WORKDIR}/posixtm.[ch] ${S} } +do_patch[postfuncs] += "copy_sources" do_install () { oe_runmake -e "IROOT=${D}" install |