summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/at/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/at/files')
-rw-r--r--meta/recipes-extended/at/files/configure-add-enable-pam.patch25
-rw-r--r--meta/recipes-extended/at/files/configure.patch29
-rw-r--r--meta/recipes-extended/at/files/fix_parallel_build_error.patch28
-rw-r--r--meta/recipes-extended/at/files/nonstripbinaries.patch26
-rw-r--r--meta/recipes-extended/at/files/pam.conf.patch21
-rw-r--r--meta/recipes-extended/at/files/use-ldflags.patch5
6 files changed, 106 insertions, 28 deletions
diff --git a/meta/recipes-extended/at/files/configure-add-enable-pam.patch b/meta/recipes-extended/at/files/configure-add-enable-pam.patch
new file mode 100644
index 0000000000..1e5efef128
--- /dev/null
+++ b/meta/recipes-extended/at/files/configure-add-enable-pam.patch
@@ -0,0 +1,25 @@
1Upstream-Status: Pending
2
3--- at-3.1.12/configure.ac 2011-06-23 14:51:03.653572945 +0800
4+++ at-3.1.12/configure.ac.new 2011-06-27 16:12:14.903572945 +0800
5@@ -81,10 +81,18 @@
6 AC_FUNC_VPRINTF
7 AC_FUNC_GETLOADAVG
8 AC_CHECK_FUNCS(getcwd mktime strftime setreuid setresuid sigaction waitpid)
9+
10+AC_ARG_WITH([pam],
11+ [AS_HELP_STRING([--without-pam], [without PAM support])])
12+
13+if test "x$with_pam" != xno; then
14 AC_CHECK_HEADERS(security/pam_appl.h, [
15 PAMLIB="-lpam"
16- AC_DEFINE(HAVE_PAM, 1, [Define to 1 for PAM support])
17-])
18+ AC_DEFINE(HAVE_PAM, 1, [Define to 1 for PAM support])],
19+ [if test "x$with_pam" = xyes; then
20+ AC_MSG_ERROR([PAM selected but security/pam_misc.h not found])
21+ fi])
22+fi
23
24 dnl Checking for programs
25
diff --git a/meta/recipes-extended/at/files/configure.patch b/meta/recipes-extended/at/files/configure.patch
new file mode 100644
index 0000000000..14310e3354
--- /dev/null
+++ b/meta/recipes-extended/at/files/configure.patch
@@ -0,0 +1,29 @@
1
2Fix cross-compilation issues in configure.ac
3Derived from an OE patch for at-3.1.8
4
5Upstream-Status: Pending
6
7Signed-off-by: Scott Garman <scott.a.garman@intel.com>
8
9Index: at-3.1.12/configure.ac
10===================================================================
11--- at-3.1.12.orig/configure.ac
12+++ at-3.1.12/configure.ac
13@@ -38,12 +38,11 @@ case "$host" in
14 AC_MSG_RESULT(no)
15 ;;
16 esac
17+if [ X"${cross_compiling}" = Xno ]; then
18 AC_MSG_CHECKING(Trying to compile a trivial ANSI C program)
19-AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
20- AC_MSG_RESULT(yes),
21- AC_MSG_RESULT(no)
22- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),
23- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.))
24+AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
25+ 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.)])
26+fi
27
28 AC_MSG_CHECKING(__attribute__((noreturn)))
29 AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
diff --git a/meta/recipes-extended/at/files/fix_parallel_build_error.patch b/meta/recipes-extended/at/files/fix_parallel_build_error.patch
new file mode 100644
index 0000000000..877be35aaf
--- /dev/null
+++ b/meta/recipes-extended/at/files/fix_parallel_build_error.patch
@@ -0,0 +1,28 @@
1make -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
8Fixed the issue by adding a dependancy in the makefile.
9Nitin <nitin.a.kamble@intel.com>
102010/09/02
11
12Upstream-Status: Pending
13
14Signed-off-by: Scott Garman <scott.a.garman@intel.com>
15
16Index: at-3.1.12/Makefile.in
17===================================================================
18--- at-3.1.12.orig/Makefile.in
19+++ at-3.1.12/Makefile.in
20@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y
21 lex.yy.c: parsetime.l
22 $(LEX) -i parsetime.l
23
24+parsetime.l: y.tab.h
25+
26 atrun: atrun.in
27 configure
28
diff --git a/meta/recipes-extended/at/files/nonstripbinaries.patch b/meta/recipes-extended/at/files/nonstripbinaries.patch
deleted file mode 100644
index 2b251db131..0000000000
--- a/meta/recipes-extended/at/files/nonstripbinaries.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Upstream-Status: Pending
2#Because remove nonrootinstall patch, the stripping of the binaries can not
3#be handled.
4#This patch is to handle the stripping of the binaries.
5#Mei Lei<lei.mei@intel.com> make this change
6diff --git at-3.1.12.orig/Makefile.in at-3.1.12/Makefile.in
7index dae6b7d..71a5d89 100644
8--- at-3.1.12.orig/Makefile.in
9+++ at-3.1.12/Makefile.in
10@@ -97,14 +97,14 @@ install: all
11 chmod 600 $(IROOT)$(LFILE)
12 chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
13 test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
14- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir)
15+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir)
16 $(LN_S) -f at $(IROOT)$(bindir)/atq
17 $(LN_S) -f at $(IROOT)$(bindir)/atrm
18 $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
19 $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
20 $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
21 $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
22- $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir)
23+ $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir)
24 $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
25 $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
26 cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
diff --git a/meta/recipes-extended/at/files/pam.conf.patch b/meta/recipes-extended/at/files/pam.conf.patch
new file mode 100644
index 0000000000..dfe76d7487
--- /dev/null
+++ b/meta/recipes-extended/at/files/pam.conf.patch
@@ -0,0 +1,21 @@
1oe doesn't support "@include", use the concrete directive instead.
2
3Upstream-Status: Pending
4
5Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
6--- at-3.1.12/pam.conf.orig 2009-11-23 23:11:52.000000000 +0800
7+++ at-3.1.12/pam.conf 2011-07-15 11:14:04.132818950 +0800
8@@ -2,8 +2,8 @@
9 # The PAM configuration file for the at daemon
10 #
11
12-auth required pam_env.so
13-@include common-auth
14-@include common-account
15-@include common-session-noninteractive
16-session required pam_limits.so
17+auth required pam_env.so
18+auth include common-auth
19+account include common-account
20+session include common-session-noninteractive
21+session required pam_limits.so
diff --git a/meta/recipes-extended/at/files/use-ldflags.patch b/meta/recipes-extended/at/files/use-ldflags.patch
index fdd1908efc..4c698003d0 100644
--- a/meta/recipes-extended/at/files/use-ldflags.patch
+++ b/meta/recipes-extended/at/files/use-ldflags.patch
@@ -1,8 +1,9 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3# Ensure use of $LDFLAGS during build 3Ensure use of $LDFLAGS during build
4# Derived from an OE patch for at-3.1.8 4Derived from an OE patch for at-3.1.8
5 5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6--- at-3.1.12.orig/Makefile.in 2009-11-23 07:11:52.000000000 -0800 7--- at-3.1.12.orig/Makefile.in 2009-11-23 07:11:52.000000000 -0800
7+++ at-3.1.12/Makefile.in 2010-07-20 16:28:04.000000000 -0700 8+++ at-3.1.12/Makefile.in 2010-07-20 16:28:04.000000000 -0700
8@@ -65,13 +65,13 @@ 9@@ -65,13 +65,13 @@