diff options
| author | Saul Wold <sgw@linux.intel.com> | 2013-01-23 13:25:42 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-28 12:25:37 +0000 |
| commit | a7d06efe4856ea76b1ffa15ed398099cc963d14a (patch) | |
| tree | c045cb9e79876a6192c0f94eca956634bd186760 /meta | |
| parent | e21c57c204024be06ac5ac0c56a065b271b9ba5c (diff) | |
| download | openembedded-core-a7d06efe4856ea76b1ffa15ed398099cc963d14a.tar.gz openembedded-core-a7d06efe4856ea76b1ffa15ed398099cc963d14a.tar.bz2 openembedded-core-a7d06efe4856ea76b1ffa15ed398099cc963d14a.zip | |
file: Update to 5.12
Remove the backported automake patch, now fixed upstream
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/file/file/obsolete_automake_macros.patch | 15 | ||||
| -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 @@ -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 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 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 |