Patchwork [08/13] file: Update to 5.12

login
register
mail settings
Submitter Saul Wold
Date Jan. 28, 2013, 9:15 a.m.
Message ID <14f408c0ce7205dbbfffee0990b5000f2830ba21.1359364462.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/43517/
State Accepted
Commit 7fed40399c232385e562a3b367dd7e5a1bfaf79b
Headers show

Comments

Saul Wold - Jan. 28, 2013, 9:15 a.m.
Remove the backported automake patch, now fixed upstream

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../file/file/obsolete_automake_macros.patch              | 15 ---------------
 meta/recipes-devtools/file/{file_5.11.bb => file_5.12.bb} |  7 +++----
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 meta/recipes-devtools/file/file/obsolete_automake_macros.patch
 rename meta/recipes-devtools/file/{file_5.11.bb => file_5.12.bb} (81%)

Patch

diff --git a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
deleted file mode 100644
index 84a78a5..0000000
--- a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@ 
-Upstream-Status: Backport [fixed in file-5.12]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd file-5.11/configure.ac file-5.11/configure.ac
---- file-5.11/configure.ac	2012-02-21 21:16:29.000000000 +0200
-+++ file-5.11/configure.ac	2013-01-02 07:18:23.004856505 +0200
-@@ -3,7 +3,7 @@
- AM_INIT_AUTOMAKE()
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR([m4])
-
- AC_MSG_CHECKING(for builtin ELF support)
diff --git a/meta/recipes-devtools/file/file_5.11.bb b/meta/recipes-devtools/file/file_5.12.bb
similarity index 81%
rename from meta/recipes-devtools/file/file_5.11.bb
rename to meta/recipes-devtools/file/file_5.12.bb
index 52ae460..4677a6d 100644
--- a/meta/recipes-devtools/file/file_5.11.bb
+++ b/meta/recipes-devtools/file/file_5.12.bb
@@ -10,16 +10,15 @@  LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
 
 DEPENDS = "zlib file-native"
 DEPENDS_class-native = "zlib-native"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
            file://fix_version_check.patch \
-           file://obsolete_automake_macros.patch \
            file://dump \
            file://filesystems"
 
-SRC_URI[md5sum] = "16a407bd66d6c7a832f3a5c0d609c27b"
-SRC_URI[sha256sum] = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7"
+SRC_URI[md5sum] = "1d7d85cb9354f79e5e351deef36be6ba"
+SRC_URI[sha256sum] = "199d0dab2e32814cbced8dc30d3d2d5b7e45587598160a2c401358b573273d22"
 
 inherit autotools