From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 08/13] file: Update to 5.12
Date: Mon, 28 Jan 2013 01:15:55 -0800 [thread overview]
Message-ID: <14f408c0ce7205dbbfffee0990b5000f2830ba21.1359364462.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1359364462.git.sgw@linux.intel.com>
In-Reply-To: <cover.1359364462.git.sgw@linux.intel.com>
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%)
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
--
1.8.0.2
next prev parent reply other threads:[~2013-01-28 9:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 9:15 [PATCH 00/13] Updates for M4 Saul Wold
2013-01-28 9:15 ` [PATCH 01/13] libnl: Update to 3.2.21 Saul Wold
2013-01-28 9:15 ` [PATCH 02/13] rgb: Update to 1.0.5 Saul Wold
2013-01-28 9:15 ` [PATCH 03/13] sysstat: Update to 10.1.3 Saul Wold
2013-01-28 9:15 ` [PATCH 04/13] mc: Update to 4.8.7 Saul Wold
2013-01-28 9:15 ` [PATCH 05/13] man-pages: Update to 3.45 Saul Wold
2013-01-28 9:15 ` [PATCH 06/13] libidn: Update to 1.26 Saul Wold
2013-01-28 9:15 ` [PATCH 07/13] cracklib: Update to 2.8.22 Saul Wold
2013-01-28 9:15 ` Saul Wold [this message]
2013-01-28 9:15 ` [PATCH 09/13] dhcp: Update to 4.2.5 Saul Wold
2013-01-28 9:15 ` [PATCH 10/13] util-linux: Update to 2.22.2 Saul Wold
2013-01-28 9:15 ` [PATCH 11/13] resolvconf: Update to 1.69 Saul Wold
2013-01-28 9:15 ` [PATCH 12/13] libcgroup: Update to 0.38 Saul Wold
2013-01-28 9:16 ` [PATCH 13/13] sqlite3: Update to 3.7.15.2 Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=14f408c0ce7205dbbfffee0990b5000f2830ba21.1359364462.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox