Patchwork [2/4] at: upgrade to 3.1.14

login
register
mail settings
Submitter Cristiana Voicu
Date Oct. 24, 2013, 8:01 a.m.
Message ID <6c2f4f1b0f2e102d02dea470d20b69485488dcfe.1382601179.git.cristiana.voicu@intel.com>
Download mbox | patch
Permalink /patch/60437/
State New
Headers show

Comments

Cristiana Voicu - Oct. 24, 2013, 8:01 a.m.
Removed 2 patches because they were merged upstream

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 .../at/{at_3.1.13.bb => at_3.1.14.bb}              |    7 ++---
 meta/recipes-extended/at/files/configure.patch     |   29 --------------------
 meta/recipes-extended/at/files/use-ldflags.patch   |   24 ----------------
 3 files changed, 2 insertions(+), 58 deletions(-)
 rename meta/recipes-extended/at/{at_3.1.13.bb => at_3.1.14.bb} (90%)
 delete mode 100644 meta/recipes-extended/at/files/configure.patch
 delete mode 100644 meta/recipes-extended/at/files/use-ldflags.patch

Patch

diff --git a/meta/recipes-extended/at/at_3.1.13.bb b/meta/recipes-extended/at/at_3.1.14.bb
similarity index 90%
rename from meta/recipes-extended/at/at_3.1.13.bb
rename to meta/recipes-extended/at/at_3.1.14.bb
index 6fa13b9..f80b620 100644
--- a/meta/recipes-extended/at/at_3.1.13.bb
+++ b/meta/recipes-extended/at/at_3.1.14.bb
@@ -16,11 +16,8 @@  PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
 
 RCONFLICTS_${PN} = "atd"
 RREPLACES_${PN} = "atd"
-PR = "r5"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
-    file://configure.patch \
-    file://use-ldflags.patch \
     file://fix_parallel_build_error.patch \
     file://posixtm.c \
     file://posixtm.h \
@@ -31,8 +28,8 @@  SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
 PAM_SRC_URI = "file://pam.conf.patch \
                file://configure-add-enable-pam.patch"
 
-SRC_URI[md5sum] = "1da61af6c29e323abaaf13ee1a8dad79"
-SRC_URI[sha256sum] = "3a8b90868d615d21a92f4986ea9a823886329af8fae8dd7ab4eed9b273bca072"
+SRC_URI[md5sum] = "d41cfd79033b6e49a8838add59a42ac6"
+SRC_URI[sha256sum] = "cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae"
 
 EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
                  --with-daemon_username=root \
diff --git a/meta/recipes-extended/at/files/configure.patch b/meta/recipes-extended/at/files/configure.patch
deleted file mode 100644
index 14310e3..0000000
--- a/meta/recipes-extended/at/files/configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-
-Fix cross-compilation issues in configure.ac
-Derived from an OE patch for at-3.1.8
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-Index: at-3.1.12/configure.ac
-===================================================================
---- at-3.1.12.orig/configure.ac
-+++ at-3.1.12/configure.ac
-@@ -38,12 +38,11 @@ case "$host" in
-     AC_MSG_RESULT(no)
-     ;;
- esac
-+if [ X"${cross_compiling}" = Xno ]; then
- AC_MSG_CHECKING(Trying to compile a trivial ANSI C program)
--AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
--    AC_MSG_RESULT(yes),
--    AC_MSG_RESULT(no)
--    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.))
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
-+    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.)])
-+fi
- 
- AC_MSG_CHECKING(__attribute__((noreturn)))
- AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],
diff --git a/meta/recipes-extended/at/files/use-ldflags.patch b/meta/recipes-extended/at/files/use-ldflags.patch
deleted file mode 100644
index 4c69800..0000000
--- a/meta/recipes-extended/at/files/use-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
-Upstream-Status: Pending
-
-Ensure use of $LDFLAGS during build
-Derived from an OE patch for at-3.1.8
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---- at-3.1.12.orig/Makefile.in	2009-11-23 07:11:52.000000000 -0800
-+++ at-3.1.12/Makefile.in	2010-07-20 16:28:04.000000000 -0700
-@@ -65,13 +65,13 @@
- all: at atd atrun
- 
- at: $(ATOBJECTS)
--	$(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
-+	$(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) $(LDFLAGS)
- 	rm -f $(CLONES)
- 	$(LN_S) -f at atq
- 	$(LN_S) -f at atrm
- 
- atd: $(RUNOBJECTS)
--	$(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
-+	$(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(LDFLAGS)
- 
- y.tab.c y.tab.h: parsetime.y
- 	$(YACC) -d parsetime.y