diff options
Diffstat (limited to 'meta/recipes-extended/at')
-rw-r--r-- | meta/recipes-extended/at/at/fix_parallel_build_error.patch | 37 | ||||
-rw-r--r-- | meta/recipes-extended/at/at_3.2.5.bb (renamed from meta/recipes-extended/at/at_3.2.1.bb) | 53 |
2 files changed, 27 insertions, 63 deletions
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 @@ | |||
1 | From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 5 Dec 2018 09:46:22 +0800 | ||
4 | Subject: [PATCH] fix parallel build error | ||
5 | |||
6 | make -j was failing sometimesa like this | ||
7 | | 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 | ||
8 | | parsetime.l:5:19: fatal error: y.tab.h: No such file or directory | ||
9 | | compilation terminated. | ||
10 | | make: *** [lex.yy.o] Error 1 | ||
11 | | make: *** Waiting for unfinished jobs.... | ||
12 | |||
13 | Fixed the issue by adding a dependency in the makefile. | ||
14 | Nitin <nitin.a.kamble@intel.com> | ||
15 | 2010/09/02 | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
20 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
21 | --- | ||
22 | Makefile.in | 2 ++ | ||
23 | 1 file changed, 2 insertions(+) | ||
24 | |||
25 | Index: at-3.2.1/Makefile.in | ||
26 | =================================================================== | ||
27 | --- at-3.2.1.orig/Makefile.in | ||
28 | +++ at-3.2.1/Makefile.in | ||
29 | @@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y | ||
30 | lex.yy.c: parsetime.l | ||
31 | $(LEX) -i parsetime.l | ||
32 | |||
33 | +parsetime.l: y.tab.h | ||
34 | + | ||
35 | atd.service: atd.service.in | ||
36 | cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e 's![@]atjobdir[@]!$(atjobdir)!g' > $@ | ||
37 | |||
diff --git a/meta/recipes-extended/at/at_3.2.1.bb b/meta/recipes-extended/at/at_3.2.5.bb index ae15df8662..112d1c4adc 100644 --- a/meta/recipes-extended/at/at_3.2.1.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "http://blog.calhariz.com/" | |||
3 | DESCRIPTION = "At allows for commands to be run at a particular time. Batch will execute commands when \ | 3 | DESCRIPTION = "At allows for commands to be run at a particular time. Batch will execute commands when \ |
4 | the system load levels drop to a particular level." | 4 | the system load levels drop to a particular level." |
5 | SECTION = "base" | 5 | SECTION = "base" |
6 | LICENSE = "GPLv2+" | 6 | LICENSE = "GPL-2.0-or-later" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" |
8 | DEPENDS = "flex flex-native bison-native \ | 8 | DEPENDS = "flex flex-native bison-native \ |
9 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 9 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
@@ -14,30 +14,29 @@ PACKAGECONFIG ?= "\ | |||
14 | 14 | ||
15 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," | 15 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," |
16 | 16 | ||
17 | RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ | 17 | RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ |
18 | " | 18 | " |
19 | 19 | ||
20 | PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" | 20 | PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" |
21 | 21 | ||
22 | RCONFLICTS_${PN} = "atd" | 22 | RCONFLICTS:${PN} = "atd" |
23 | RREPLACES_${PN} = "atd" | 23 | RREPLACES:${PN} = "atd" |
24 | 24 | ||
25 | SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \ | 25 | SRC_URI = "${DEBIAN_MIRROR}/main/a/at/${BPN}_${PV}.orig.tar.gz \ |
26 | file://fix_parallel_build_error.patch \ | 26 | file://posixtm.c \ |
27 | file://posixtm.c \ | 27 | file://posixtm.h \ |
28 | file://posixtm.h \ | 28 | file://file_replacement_with_gplv2.patch \ |
29 | file://file_replacement_with_gplv2.patch \ | 29 | file://atd.init \ |
30 | file://atd.init \ | 30 | file://atd.service \ |
31 | file://atd.service \ | 31 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
32 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 32 | file://makefile-fix-parallel.patch \ |
33 | file://makefile-fix-parallel.patch \ | 33 | file://0001-remove-glibc-assumption.patch \ |
34 | file://0001-remove-glibc-assumption.patch \ | 34 | " |
35 | " | ||
36 | 35 | ||
37 | PAM_SRC_URI = "file://pam.conf.patch \ | 36 | PAM_SRC_URI = "file://pam.conf.patch \ |
38 | file://configure-add-enable-pam.patch" | 37 | file://configure-add-enable-pam.patch" |
39 | 38 | ||
40 | SRC_URI[sha256sum] = "aabe6e5cb6dd19fe9fb25c2747492f2db38762b95ea41b86f949609c39fb55c4" | 39 | SRC_URI[sha256sum] = "bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8" |
41 | 40 | ||
42 | EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ | 41 | EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ |
43 | --with-daemon_username=root \ | 42 | --with-daemon_username=root \ |
@@ -51,25 +50,27 @@ inherit autotools-brokensep systemd update-rc.d | |||
51 | INITSCRIPT_NAME = "atd" | 50 | INITSCRIPT_NAME = "atd" |
52 | INITSCRIPT_PARAMS = "defaults" | 51 | INITSCRIPT_PARAMS = "defaults" |
53 | 52 | ||
54 | SYSTEMD_SERVICE_${PN} = "atd.service" | 53 | SYSTEMD_SERVICE:${PN} = "atd.service" |
54 | |||
55 | do_patch[postfuncs] += "copy_posix_files" | ||
55 | 56 | ||
56 | copy_sources() { | 57 | copy_posix_files() { |
57 | cp -f ${WORKDIR}/posixtm.[ch] ${S} | 58 | cp -f ${UNPACKDIR}/posixtm.[ch] ${S} |
58 | } | 59 | } |
59 | do_patch[postfuncs] += "copy_sources" | ||
60 | 60 | ||
61 | do_install () { | 61 | do_install () { |
62 | oe_runmake -e "IROOT=${D}" install | 62 | oe_runmake -e "IROOT=${D}" install |
63 | 63 | ||
64 | install -d ${D}${sysconfdir}/init.d | 64 | install -d ${D}${sysconfdir}/init.d |
65 | install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd | 65 | install -m 0755 ${UNPACKDIR}/atd.init ${D}${sysconfdir}/init.d/atd |
66 | 66 | ||
67 | # install systemd unit files | 67 | # install systemd unit files |
68 | install -d ${D}${systemd_unitdir}/system | 68 | install -d ${D}${systemd_system_unitdir} |
69 | install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system | 69 | install -m 0644 ${UNPACKDIR}/atd.service ${D}${systemd_system_unitdir} |
70 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service | 70 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service |
71 | 71 | ||
72 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 72 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
73 | install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd | 73 | install -D -m 0644 ${S}/pam.conf ${D}${sysconfdir}/pam.d/atd |
74 | fi | 74 | fi |
75 | rm -f ${D}${datadir}/at/batch-job | ||
75 | } | 76 | } |