From 30fa97ec4c9d0553f1566bc26a6949e93cb6da90 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 5 Dec 2018 16:40:46 +0800 Subject: at: upgrade to 3.1.23 The following patches are rebased. fix_parallel_build_error.patch pam.conf.patch Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- .../at/at/fix_parallel_build_error.patch | 15 +++-- meta/recipes-extended/at/at/pam.conf.patch | 40 ++++++----- meta/recipes-extended/at/at_3.1.20.bb | 78 ---------------------- meta/recipes-extended/at/at_3.1.23.bb | 78 ++++++++++++++++++++++ 4 files changed, 112 insertions(+), 99 deletions(-) delete mode 100644 meta/recipes-extended/at/at_3.1.20.bb create mode 100644 meta/recipes-extended/at/at_3.1.23.bb diff --git a/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/meta/recipes-extended/at/at/fix_parallel_build_error.patch index 100f8898e0..30d2324126 100644 --- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch +++ b/meta/recipes-extended/at/at/fix_parallel_build_error.patch @@ -1,3 +1,8 @@ +From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Wed, 5 Dec 2018 09:46:22 +0800 +Subject: [PATCH] fix parallel build error + make -j was failing sometimesa like this | ccache i586-poky-linux-gcc -march=i586 --sysroot=/home/nitin/build/build0/tmp/sysroots/i586-poky-linux -I. -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -o atd atd.o daemon.o -lfl -lpam -Wl,-O1 -Wl,--as-needed | parsetime.l:5:19: fatal error: y.tab.h: No such file or directory @@ -12,24 +17,24 @@ Nitin Upstream-Status: Pending Signed-off-by: Scott Garman - +Signed-off-by: Chen Qi --- Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.in b/Makefile.in -index dd3c2f8..7897e45 100644 +index 4c11913..18ecc23 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -82,6 +82,8 @@ y.tab.c y.tab.h: parsetime.y +@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y lex.yy.c: parsetime.l $(LEX) -i parsetime.l +parsetime.l: y.tab.h + atd.service: atd.service.in - sed -e 's![@]sbindir[@]!$(sbindir)!g' < $< > $@ + cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ -- -1.9.1 +2.7.4 diff --git a/meta/recipes-extended/at/at/pam.conf.patch b/meta/recipes-extended/at/at/pam.conf.patch index b5ceb9ae82..c9f337ede0 100644 --- a/meta/recipes-extended/at/at/pam.conf.patch +++ b/meta/recipes-extended/at/at/pam.conf.patch @@ -1,27 +1,35 @@ +From 8c8a0b6ba199327d2eafefd6611353e1c483a854 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Wed, 5 Dec 2018 10:00:36 +0800 +Subject: [PATCH] fix pam.conf + oe doesn't support "@include", use the concrete directive instead. Upstream-Status: Pending Signed-off-by: Wenzong Fan -Index: at-3.1.15/pam.conf -=================================================================== ---- at-3.1.15.orig/pam.conf -+++ at-3.1.15/pam.conf -@@ -1,10 +1,11 @@ - # +Signed-off-by: Chen Qi +--- + pam.conf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pam.conf b/pam.conf +index 3674c0a..2f8d586 100644 +--- a/pam.conf ++++ b/pam.conf +@@ -2,9 +2,9 @@ # The PAM configuration file for the at daemon # -+ -+auth required pam_env.so -+auth include common-auth -+account include common-account -+session include common-session-noninteractive -+session required pam_limits.so -+session required pam_loginuid.so --auth required pam_env.so -@include common-auth -@include common-account --session required pam_loginuid.so ++auth include common-auth ++acount include common-account + session required pam_loginuid.so -@include common-session-noninteractive --session required pam_limits.so ++session include common-session-noninteractive + session required pam_limits.so + auth required pam_env.so user_readenv=1 +-- +2.7.4 + diff --git a/meta/recipes-extended/at/at_3.1.20.bb b/meta/recipes-extended/at/at_3.1.20.bb deleted file mode 100644 index b76e83d1d4..0000000000 --- a/meta/recipes-extended/at/at_3.1.20.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "Delayed job execution and batch processing" -HOMEPAGE = "http://blog.calhariz.com/" -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 bison-native \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -PACKAGECONFIG ?= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ -" - -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," - -RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ -" - -PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" - -RCONFLICTS_${PN} = "atd" -RREPLACES_${PN} = "atd" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \ - file://fix_parallel_build_error.patch \ - file://posixtm.c \ - file://posixtm.h \ - file://file_replacement_with_gplv2.patch \ - file://atd.init \ - file://atd.service \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://makefile-fix-parallel.patch \ - file://0001-remove-glibc-assumption.patch \ - " - -PAM_SRC_URI = "file://pam.conf.patch \ - file://configure-add-enable-pam.patch" - -SRC_URI[md5sum] = "e7bd7b785b2cbb17e133d6bdc0fb099e" -SRC_URI[sha256sum] = "0871923cab73050b98ace020664eb2ddc1e669e4166b5abb64d864d02fcefab9" - -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/" - -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=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} " - -inherit autotools-brokensep systemd update-rc.d - -INITSCRIPT_NAME = "atd" -INITSCRIPT_PARAMS = "defaults" - -SYSTEMD_SERVICE_${PN} = "atd.service" - -copy_sources() { - cp -f ${WORKDIR}/posixtm.[ch] ${S} -} -do_patch[postfuncs] += "copy_sources" - -do_install () { - oe_runmake -e "IROOT=${D}" install - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd - - # install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service - - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd - fi -} diff --git a/meta/recipes-extended/at/at_3.1.23.bb b/meta/recipes-extended/at/at_3.1.23.bb new file mode 100644 index 0000000000..b74882d342 --- /dev/null +++ b/meta/recipes-extended/at/at_3.1.23.bb @@ -0,0 +1,78 @@ +SUMMARY = "Delayed job execution and batch processing" +HOMEPAGE = "http://blog.calhariz.com/" +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 bison-native \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +PACKAGECONFIG ?= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ +" + +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," + +RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ +" + +PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" + +RCONFLICTS_${PN} = "atd" +RREPLACES_${PN} = "atd" + +SRC_URI = "http://snapshot.debian.org/archive/debian/20180825T090248Z/pool/main/a/${BPN}/${BPN}_${PV}.orig.tar.gz \ + file://fix_parallel_build_error.patch \ + file://posixtm.c \ + file://posixtm.h \ + file://file_replacement_with_gplv2.patch \ + file://atd.init \ + file://atd.service \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + file://makefile-fix-parallel.patch \ + file://0001-remove-glibc-assumption.patch \ + " + +PAM_SRC_URI = "file://pam.conf.patch \ + file://configure-add-enable-pam.patch" + +SRC_URI[md5sum] = "1cec945506b5ddf1d776c92c315fc581" +SRC_URI[sha256sum] = "97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710" + +UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/at/" + +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=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} " + +inherit autotools-brokensep systemd update-rc.d + +INITSCRIPT_NAME = "atd" +INITSCRIPT_PARAMS = "defaults" + +SYSTEMD_SERVICE_${PN} = "atd.service" + +copy_sources() { + cp -f ${WORKDIR}/posixtm.[ch] ${S} +} +do_patch[postfuncs] += "copy_sources" + +do_install () { + oe_runmake -e "IROOT=${D}" install + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd + + # install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service + + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then + install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd + fi +} -- cgit 1.2.3-korg