From 4c96bed812c4b1371944ad84659a2877a28678d1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 2 Feb 2022 19:27:36 +0100 Subject: at: update 3.2.2 -> 3.2.4 Drop patch for issue fixed upstream. Change additional source copying to be a part of do_configure to allow automated upgrades. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../at/at/fix_parallel_build_error.patch | 37 ----------- meta/recipes-extended/at/at_3.2.2.bb | 76 ---------------------- meta/recipes-extended/at/at_3.2.4.bb | 74 +++++++++++++++++++++ 3 files changed, 74 insertions(+), 113 deletions(-) delete mode 100644 meta/recipes-extended/at/at/fix_parallel_build_error.patch delete mode 100644 meta/recipes-extended/at/at_3.2.2.bb create mode 100644 meta/recipes-extended/at/at_3.2.4.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/meta/recipes-extended/at/at/fix_parallel_build_error.patch deleted file mode 100644 index e4f32b82b6..0000000000 --- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -| compilation terminated. -| make: *** [lex.yy.o] Error 1 -| make: *** Waiting for unfinished jobs.... - -Fixed the issue by adding a dependency in the makefile. -Nitin -2010/09/02 - -Upstream-Status: Pending - -Signed-off-by: Scott Garman -Signed-off-by: Chen Qi ---- - Makefile.in | 2 ++ - 1 file changed, 2 insertions(+) - -Index: at-3.2.1/Makefile.in -=================================================================== ---- at-3.2.1.orig/Makefile.in -+++ at-3.2.1/Makefile.in -@@ -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 - cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ - diff --git a/meta/recipes-extended/at/at_3.2.2.bb b/meta/recipes-extended/at/at_3.2.2.bb deleted file mode 100644 index 14b9dace2a..0000000000 --- a/meta/recipes-extended/at/at_3.2.2.bb +++ /dev/null @@ -1,76 +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://software.calhariz.com/at/${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[sha256sum] = "2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088" - -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_system_unitdir} - install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir} - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/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 - rm -f ${D}${datadir}/at/batch-job -} diff --git a/meta/recipes-extended/at/at_3.2.4.bb b/meta/recipes-extended/at/at_3.2.4.bb new file mode 100644 index 0000000000..af8c3d6b4c --- /dev/null +++ b/meta/recipes-extended/at/at_3.2.4.bb @@ -0,0 +1,74 @@ +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://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \ + 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[sha256sum] = "76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684" + +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" + +do_configure:prepend() { + cp -f ${WORKDIR}/posixtm.[ch] ${S} +} + +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_system_unitdir} + install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir} + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/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 + rm -f ${D}${datadir}/at/batch-job +} -- cgit 1.2.3-korg