summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/at
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-03-14 23:39:08 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-19 14:37:45 (GMT)
commit35c4c79fa423715c8aaf9a6db0f18bee700af457 (patch)
treede2965ce603b7ca72668413ec4c45dc77873eb46 /meta/recipes-extended/at
parentc5d196063dace7842d24db0a2bafd99e726603da (diff)
downloadpoky-35c4c79fa423715c8aaf9a6db0f18bee700af457.tar.gz
at: upgrade to 3.1.13
Moved patches into a common directory. Added SOB to use-ldflags.patch. Removed nonstripbinaries patch which was included in this release. Minor formatting cleanups. (From OE-Core rev: 768eb8e8590e3b9cc033d8544a01ae34d3ed16b1) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/at')
-rw-r--r--meta/recipes-extended/at/at_3.1.13.bb (renamed from meta/recipes-extended/at/at_3.1.12.bb)13
-rw-r--r--meta/recipes-extended/at/files/configure-add-enable-pam.patch (renamed from meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch)0
-rw-r--r--meta/recipes-extended/at/files/configure.patch (renamed from meta/recipes-extended/at/at-3.1.12/configure.patch)0
-rw-r--r--meta/recipes-extended/at/files/fix_parallel_build_error.patch (renamed from meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch)0
-rw-r--r--meta/recipes-extended/at/files/nonstripbinaries.patch26
-rw-r--r--meta/recipes-extended/at/files/pam.conf.patch (renamed from meta/recipes-extended/at/at-3.1.12/pam.conf.patch)0
-rw-r--r--meta/recipes-extended/at/files/use-ldflags.patch5
7 files changed, 9 insertions, 35 deletions
diff --git a/meta/recipes-extended/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.13.bb
index f2017b7..bcc08aa 100644
--- a/meta/recipes-extended/at/at_3.1.12.bb
+++ b/meta/recipes-extended/at/at_3.1.13.bb
@@ -11,12 +11,11 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
11 11
12RCONFLICTS_${PN} = "atd" 12RCONFLICTS_${PN} = "atd"
13RREPLACES_${PN} = "atd" 13RREPLACES_${PN} = "atd"
14PR = "r7" 14PR = "r0"
15 15
16SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ 16SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
17 file://configure.patch \ 17 file://configure.patch \
18 file://use-ldflags.patch \ 18 file://use-ldflags.patch \
19 file://nonstripbinaries.patch \
20 file://fix_parallel_build_error.patch \ 19 file://fix_parallel_build_error.patch \
21 file://posixtm.c \ 20 file://posixtm.c \
22 file://posixtm.h \ 21 file://posixtm.h \
@@ -27,8 +26,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
27PAM_SRC_URI = "file://pam.conf.patch \ 26PAM_SRC_URI = "file://pam.conf.patch \
28 file://configure-add-enable-pam.patch" 27 file://configure-add-enable-pam.patch"
29 28
30SRC_URI[md5sum] = "1e67991776148fb319fd77a2e599a765" 29SRC_URI[md5sum] = "1da61af6c29e323abaaf13ee1a8dad79"
31SRC_URI[sha256sum] = "7c55c6ab4fbe8add9e68f31b2b0ebf3fe805c9a4e7cfb2623a3d8a4789cc18f3" 30SRC_URI[sha256sum] = "3a8b90868d615d21a92f4986ea9a823886329af8fae8dd7ab4eed9b273bca072"
32 31
33EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ 32EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
34 --with-daemon_username=root \ 33 --with-daemon_username=root \
@@ -39,6 +38,8 @@ EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
39 38
40inherit autotools 39inherit autotools
41 40
41PARALLEL_MAKE = ""
42
42do_compile_prepend () { 43do_compile_prepend () {
43 cp -f ${WORKDIR}/posixtm.[ch] ${S} 44 cp -f ${WORKDIR}/posixtm.[ch] ${S}
44} 45}
@@ -49,7 +50,7 @@ do_install () {
49 install -d ${D}${sysconfdir}/init.d 50 install -d ${D}${sysconfdir}/init.d
50 install -d ${D}${sysconfdir}/rcS.d 51 install -d ${D}${sysconfdir}/rcS.d
51 install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd 52 install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd
52 ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at 53 ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at
53 cp -r ${D}/usr/doc/at ${D}${docdir}/ 54 cp -r ${D}/usr/doc/at ${D}${docdir}/
54 rm -rf ${D}/usr/doc 55 rm -rf ${D}/usr/doc
55 56
@@ -60,5 +61,3 @@ do_install () {
60 fi 61 fi
61 done 62 done
62} 63}
63
64PARALLEL_MAKE = ""
diff --git a/meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch b/meta/recipes-extended/at/files/configure-add-enable-pam.patch
index 1e5efef..1e5efef 100644
--- a/meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch
+++ b/meta/recipes-extended/at/files/configure-add-enable-pam.patch
diff --git a/meta/recipes-extended/at/at-3.1.12/configure.patch b/meta/recipes-extended/at/files/configure.patch
index 14310e3..14310e3 100644
--- a/meta/recipes-extended/at/at-3.1.12/configure.patch
+++ b/meta/recipes-extended/at/files/configure.patch
diff --git a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch b/meta/recipes-extended/at/files/fix_parallel_build_error.patch
index 877be35..877be35 100644
--- a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch
+++ b/meta/recipes-extended/at/files/fix_parallel_build_error.patch
diff --git a/meta/recipes-extended/at/files/nonstripbinaries.patch b/meta/recipes-extended/at/files/nonstripbinaries.patch
deleted file mode 100644
index 2b251db..0000000
--- 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/at-3.1.12/pam.conf.patch b/meta/recipes-extended/at/files/pam.conf.patch
index dfe76d7..dfe76d7 100644
--- a/meta/recipes-extended/at/at-3.1.12/pam.conf.patch
+++ b/meta/recipes-extended/at/files/pam.conf.patch
diff --git a/meta/recipes-extended/at/files/use-ldflags.patch b/meta/recipes-extended/at/files/use-ldflags.patch
index fdd1908..4c69800 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 @@