summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-01-23 13:25:42 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 12:29:32 +0000
commit7fed40399c232385e562a3b367dd7e5a1bfaf79b (patch)
treeec7a16b361f342eff16a46df7beea2bc3f0eb25d
parent6c11a8d8b260b6eded707f786983db1a284d59d3 (diff)
downloadpoky-7fed40399c232385e562a3b367dd7e5a1bfaf79b.tar.gz
file: Update to 5.12
Remove the backported automake patch, now fixed upstream (From OE-Core rev: a7d06efe4856ea76b1ffa15ed398099cc963d14a) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/file/file/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-devtools/file/file_5.12.bb (renamed from meta/recipes-devtools/file/file_5.11.bb)7
2 files changed, 3 insertions, 19 deletions
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 84a78a5770..0000000000
--- a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Backport [fixed in file-5.12]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd file-5.11/configure.ac file-5.11/configure.ac
5--- file-5.11/configure.ac 2012-02-21 21:16:29.000000000 +0200
6+++ file-5.11/configure.ac 2013-01-02 07:18:23.004856505 +0200
7@@ -3,7 +3,7 @@
8 AM_INIT_AUTOMAKE()
9 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
10
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13 AC_CONFIG_MACRO_DIR([m4])
14
15 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
index 52ae460e60..4677a6d4c7 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
10 10
11DEPENDS = "zlib file-native" 11DEPENDS = "zlib file-native"
12DEPENDS_class-native = "zlib-native" 12DEPENDS_class-native = "zlib-native"
13PR = "r1" 13PR = "r0"
14 14
15SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ 15SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
16 file://fix_version_check.patch \ 16 file://fix_version_check.patch \
17 file://obsolete_automake_macros.patch \
18 file://dump \ 17 file://dump \
19 file://filesystems" 18 file://filesystems"
20 19
21SRC_URI[md5sum] = "16a407bd66d6c7a832f3a5c0d609c27b" 20SRC_URI[md5sum] = "1d7d85cb9354f79e5e351deef36be6ba"
22SRC_URI[sha256sum] = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7" 21SRC_URI[sha256sum] = "199d0dab2e32814cbced8dc30d3d2d5b7e45587598160a2c401358b573273d22"
23 22
24inherit autotools 23inherit autotools
25 24