summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/file/file
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 /meta/recipes-devtools/file/file
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>
Diffstat (limited to 'meta/recipes-devtools/file/file')
-rw-r--r--meta/recipes-devtools/file/file/obsolete_automake_macros.patch15
1 files changed, 0 insertions, 15 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)