diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-09-02 10:04:19 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-02 22:17:11 +0100 |
| commit | 2eeb0943ac5b3d8f942ae7f9cf655c12827483ae (patch) | |
| tree | a9851783ca24013d11b34c76d8f0bf73cf1840eb /meta | |
| parent | 558ef570975f6f83a1878a41ecd984ef07a1a443 (diff) | |
| download | poky-2eeb0943ac5b3d8f942ae7f9cf655c12827483ae.tar.gz | |
at: fix for parallel build issue & bug #180
parallel build was failing inconsistently due to missing dependancy
specification in the make file. Fixed it with a new patch.
Bug 180 reported this issue:
| arm-poky-linux-gnueabi-gcc -march=armv5te -mtune=arm926ej-s -c -I.
-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2
-ggdb
-feliminate-unused-debug-types -DHAVE_CONFIG_H -DVERSION=\"3.1.12\"
-DETCDIR=\"/etc\" -DLOADAVG_MX=0.8 -DDAEMON_USERNAME=\"daemon\"
-DDAEMON_GROUPNAME=\"daemon\" -DLFILE=\"/var/spool/cron/atjobs/.SEQ\"
-Wall
atd.c
| atd.c:511:2: error: #error "No mail command specified."
| make: *** [atd.o] Error 1
Fixed it with the recommended solution of defining SENDMAIL as /bin/true
Fixes [BUGID #180]
Reorganized the recipe file for cleanlyness.
Add the init script for at
As per Scott's wiki instructions added the this init script for at:
http://git.buildroot.net/buildroot/tree/package/at/S99at
add libpam to dependancy
And bumped PR.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-extended/at/at.inc | 11 | ||||
| -rw-r--r-- | meta/recipes-extended/at/at_3.1.12.bb | 32 | ||||
| -rw-r--r-- | meta/recipes-extended/at/files/S99at | 39 |
4 files changed, 89 insertions, 17 deletions
diff --git a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch new file mode 100644 index 0000000000..6383660e80 --- /dev/null +++ b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | make -j was failing sometimesa like this | ||
| 2 | | 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 | ||
| 3 | | parsetime.l:5:19: fatal error: y.tab.h: No such file or directory | ||
| 4 | | compilation terminated. | ||
| 5 | | make: *** [lex.yy.o] Error 1 | ||
| 6 | | make: *** Waiting for unfinished jobs.... | ||
| 7 | |||
| 8 | Fixed the issue by adding a dependancy in the makefile. | ||
| 9 | Nitin <nitin.a.kamble@intel.com> | ||
| 10 | 2010/09/02 | ||
| 11 | |||
| 12 | Index: at-3.1.12/Makefile.in | ||
| 13 | =================================================================== | ||
| 14 | --- at-3.1.12.orig/Makefile.in | ||
| 15 | +++ at-3.1.12/Makefile.in | ||
| 16 | @@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y | ||
| 17 | lex.yy.c: parsetime.l | ||
| 18 | $(LEX) -i parsetime.l | ||
| 19 | |||
| 20 | +parsetime.l: y.tab.h | ||
| 21 | + | ||
| 22 | atrun: atrun.in | ||
| 23 | configure | ||
| 24 | |||
diff --git a/meta/recipes-extended/at/at.inc b/meta/recipes-extended/at/at.inc deleted file mode 100644 index 64ae9c2b6a..0000000000 --- a/meta/recipes-extended/at/at.inc +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | DESCRIPTION = "Delayed job execution and batch processing" | ||
| 2 | SECTION = "base" | ||
| 3 | DEPENDS = "flex" | ||
| 4 | RCONFLICTS_${PN} = "atd" | ||
| 5 | RREPLACES_${PN} = "atd" | ||
| 6 | |||
| 7 | inherit autotools | ||
| 8 | |||
| 9 | do_install () { | ||
| 10 | oe_runmake "IROOT=${D}" install | ||
| 11 | } | ||
diff --git a/meta/recipes-extended/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.12.bb index 605179b21f..bec09b6958 100644 --- a/meta/recipes-extended/at/at_3.1.12.bb +++ b/meta/recipes-extended/at/at_3.1.12.bb | |||
| @@ -1,19 +1,39 @@ | |||
| 1 | require at.inc | 1 | DESCRIPTION = "Delayed job execution and batch processing" |
| 2 | 2 | SECTION = "base" | |
| 3 | LICENSE="GPLv2+" | 3 | LICENSE="GPLv2+" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" |
| 5 | 5 | DEPENDS = "flex libpam initscripts" | |
| 6 | PR = "r1" | 6 | RCONFLICTS_${PN} = "atd" |
| 7 | RREPLACES_${PN} = "atd" | ||
| 8 | PR = "r2" | ||
| 7 | 9 | ||
| 8 | SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ | 10 | SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ |
| 9 | file://configure.patch \ | 11 | file://configure.patch \ |
| 10 | file://nonrootinstall.patch \ | 12 | file://nonrootinstall.patch \ |
| 11 | file://use-ldflags.patch \ | 13 | file://use-ldflags.patch \ |
| 14 | file://fix_parallel_build_error.patch \ | ||
| 12 | file://posixtm.c \ | 15 | file://posixtm.c \ |
| 13 | file://posixtm.h \ | 16 | file://posixtm.h \ |
| 14 | file://file_replacement_with_gplv2.patch" | 17 | file://file_replacement_with_gplv2.patch \ |
| 18 | file://S99at" | ||
| 19 | |||
| 20 | EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ | ||
| 21 | --with-daemon_username=root \ | ||
| 22 | --with-daemon_groupname=root \ | ||
| 23 | --with-jobdir=/var/spool/cron/atjobs \ | ||
| 24 | --with-atspool=/var/spool/cron/atspool" | ||
| 25 | |||
| 26 | inherit autotools | ||
| 15 | 27 | ||
| 16 | do_compile_prepend () { | 28 | do_compile_prepend () { |
| 17 | mv ${WORKDIR}/posixtm.[ch] ${S} | 29 | cp -f ${WORKDIR}/posixtm.[ch] ${S} |
| 18 | } | 30 | } |
| 19 | 31 | ||
| 32 | do_install () { | ||
| 33 | oe_runmake "IROOT=${D}" install | ||
| 34 | |||
| 35 | install -d ${D}${sysconfdir}/init.d | ||
| 36 | install -d ${D}${sysconfdir}/rcS.d | ||
| 37 | install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/at | ||
| 38 | ln -sf ../init.d/at ${D}${sysconfdir}/rcS.d/S99at | ||
| 39 | } | ||
diff --git a/meta/recipes-extended/at/files/S99at b/meta/recipes-extended/at/files/S99at new file mode 100644 index 0000000000..bcfcbdae21 --- /dev/null +++ b/meta/recipes-extended/at/files/S99at | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | # | ||
| 3 | # Starts at daemon | ||
| 4 | # | ||
| 5 | |||
| 6 | umask 077 | ||
| 7 | |||
| 8 | start() { | ||
| 9 | echo -n "Starting atd: " | ||
| 10 | start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/atd.pid --background --exec /usr/sbin/atd -- -f | ||
| 11 | echo "OK" | ||
| 12 | } | ||
| 13 | stop() { | ||
| 14 | echo -n "Stopping atd: " | ||
| 15 | start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid | ||
| 16 | echo "OK" | ||
| 17 | } | ||
| 18 | restart() { | ||
| 19 | stop | ||
| 20 | start | ||
| 21 | } | ||
| 22 | |||
| 23 | case "$1" in | ||
| 24 | start) | ||
| 25 | start | ||
| 26 | ;; | ||
| 27 | stop) | ||
| 28 | stop | ||
| 29 | ;; | ||
| 30 | restart|reload) | ||
| 31 | restart | ||
| 32 | ;; | ||
| 33 | *) | ||
| 34 | echo $"Usage: $0 {start|stop|restart}" | ||
| 35 | exit 1 | ||
| 36 | esac | ||
| 37 | |||
| 38 | exit $? | ||
| 39 | |||
