From ff1707449d851a365e686e6d2cbe822631001147 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Thu, 24 Oct 2013 11:01:48 +0300 Subject: at: upgrade to 3.1.14 Removed 2 patches because they were merged upstream Signed-off-by: Cristiana Voicu Signed-off-by: Saul Wold --- meta/recipes-extended/at/at_3.1.13.bb | 66 ------------------------ meta/recipes-extended/at/at_3.1.14.bb | 63 ++++++++++++++++++++++ meta/recipes-extended/at/files/configure.patch | 29 ----------- meta/recipes-extended/at/files/use-ldflags.patch | 24 --------- 4 files changed, 63 insertions(+), 119 deletions(-) delete mode 100644 meta/recipes-extended/at/at_3.1.13.bb create mode 100644 meta/recipes-extended/at/at_3.1.14.bb delete mode 100644 meta/recipes-extended/at/files/configure.patch delete mode 100644 meta/recipes-extended/at/files/use-ldflags.patch diff --git a/meta/recipes-extended/at/at_3.1.13.bb b/meta/recipes-extended/at/at_3.1.13.bb deleted file mode 100644 index 6fa13b91fb..0000000000 --- a/meta/recipes-extended/at/at_3.1.13.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Delayed job execution and batch processing" -DESCRIPTION = "At allows for commands to be run at a particular time. Batch will execute commands when \ -the system load levels drop to a particular level." -SECTION = "base" -LICENSE="GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -DEPENDS = "flex flex-native \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -VIRTUAL-RUNTIME_initscripts ?= "initscripts" -RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ - ${VIRTUAL-RUNTIME_initscripts} \ -" - -PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" - -RCONFLICTS_${PN} = "atd" -RREPLACES_${PN} = "atd" -PR = "r5" - -SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ - file://configure.patch \ - file://use-ldflags.patch \ - file://fix_parallel_build_error.patch \ - file://posixtm.c \ - file://posixtm.h \ - file://file_replacement_with_gplv2.patch \ - file://S99at \ - ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" - -PAM_SRC_URI = "file://pam.conf.patch \ - file://configure-add-enable-pam.patch" - -SRC_URI[md5sum] = "1da61af6c29e323abaaf13ee1a8dad79" -SRC_URI[sha256sum] = "3a8b90868d615d21a92f4986ea9a823886329af8fae8dd7ab4eed9b273bca072" - -EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ - --with-daemon_username=root \ - --with-daemon_groupname=root \ - --with-jobdir=/var/spool/at/jobs \ - --with-atspool=/var/spool/at/spool \ - ac_cv_header_security_pam_appl_h=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} " - -inherit autotools - -PARALLEL_MAKE = "" - -do_compile_prepend () { - cp -f ${WORKDIR}/posixtm.[ch] ${S} -} - -do_install () { - oe_runmake -e "IROOT=${D}" install - - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/rcS.d - install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd - ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at - - for feature in ${DISTRO_FEATURES}; do - if [ "$feature" = "pam" ]; then - install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd - break - fi - done -} diff --git a/meta/recipes-extended/at/at_3.1.14.bb b/meta/recipes-extended/at/at_3.1.14.bb new file mode 100644 index 0000000000..f80b620e68 --- /dev/null +++ b/meta/recipes-extended/at/at_3.1.14.bb @@ -0,0 +1,63 @@ +SUMMARY = "Delayed job execution and batch processing" +DESCRIPTION = "At allows for commands to be run at a particular time. Batch will execute commands when \ +the system load levels drop to a particular level." +SECTION = "base" +LICENSE="GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" +DEPENDS = "flex flex-native \ + ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +VIRTUAL-RUNTIME_initscripts ?= "initscripts" +RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ + ${VIRTUAL-RUNTIME_initscripts} \ +" + +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 \ + file://fix_parallel_build_error.patch \ + file://posixtm.c \ + file://posixtm.h \ + file://file_replacement_with_gplv2.patch \ + file://S99at \ + ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + +PAM_SRC_URI = "file://pam.conf.patch \ + file://configure-add-enable-pam.patch" + +SRC_URI[md5sum] = "d41cfd79033b6e49a8838add59a42ac6" +SRC_URI[sha256sum] = "cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae" + +EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ + --with-daemon_username=root \ + --with-daemon_groupname=root \ + --with-jobdir=/var/spool/at/jobs \ + --with-atspool=/var/spool/at/spool \ + ac_cv_header_security_pam_appl_h=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} " + +inherit autotools + +PARALLEL_MAKE = "" + +do_compile_prepend () { + cp -f ${WORKDIR}/posixtm.[ch] ${S} +} + +do_install () { + oe_runmake -e "IROOT=${D}" install + + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/rcS.d + install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd + ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at + + for feature in ${DISTRO_FEATURES}; do + if [ "$feature" = "pam" ]; then + install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd + break + fi + done +} diff --git a/meta/recipes-extended/at/files/configure.patch b/meta/recipes-extended/at/files/configure.patch deleted file mode 100644 index 14310e3354..0000000000 --- a/meta/recipes-extended/at/files/configure.patch +++ /dev/null @@ -1,29 +0,0 @@ - -Fix cross-compilation issues in configure.ac -Derived from an OE patch for at-3.1.8 - -Upstream-Status: Pending - -Signed-off-by: Scott Garman - -Index: at-3.1.12/configure.ac -=================================================================== ---- at-3.1.12.orig/configure.ac -+++ at-3.1.12/configure.ac -@@ -38,12 +38,11 @@ case "$host" in - AC_MSG_RESULT(no) - ;; - esac -+if [ X"${cross_compiling}" = Xno ]; then - AC_MSG_CHECKING(Trying to compile a trivial ANSI C program) --AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) -- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), -- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)) -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+ AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)],[AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)]) -+fi - - AC_MSG_CHECKING(__attribute__((noreturn))) - AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], diff --git a/meta/recipes-extended/at/files/use-ldflags.patch b/meta/recipes-extended/at/files/use-ldflags.patch deleted file mode 100644 index 4c698003d0..0000000000 --- a/meta/recipes-extended/at/files/use-ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Pending - -Ensure use of $LDFLAGS during build -Derived from an OE patch for at-3.1.8 - -Signed-off-by: Scott Garman ---- at-3.1.12.orig/Makefile.in 2009-11-23 07:11:52.000000000 -0800 -+++ at-3.1.12/Makefile.in 2010-07-20 16:28:04.000000000 -0700 -@@ -65,13 +65,13 @@ - all: at atd atrun - - at: $(ATOBJECTS) -- $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) -+ $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) $(LDFLAGS) - rm -f $(CLONES) - $(LN_S) -f at atq - $(LN_S) -f at atrm - - atd: $(RUNOBJECTS) -- $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) -+ $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(LDFLAGS) - - y.tab.c y.tab.h: parsetime.y - $(YACC) -d parsetime.y -- cgit v1.2.3