diff options
author | Jonathan Liu <net147@gmail.com> | 2013-05-31 14:11:40 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-31 08:06:57 +0100 |
commit | 254b93224ab7397373aabef6830407ad9417f350 (patch) | |
tree | 06bbadf3e7fee890739cfb2b785e016ca048f8a5 /meta/recipes-devtools | |
parent | b98129c3461ee1082a71c701e8a7badaa7b7ae76 (diff) | |
download | poky-254b93224ab7397373aabef6830407ad9417f350.tar.gz |
file: remove obsolete version check patch
After e8d2a2a3646f964ec61ece62e14788cd7184dd01 [OE-Core], file --version
returns file-5.14 instead of file.real-5.14 so the patch is no longer
necessary and causes the build to fail with the following:
| Cannot use the installed version of file (file-5.14) to
| cross-compile file 5.14
| Please install file 5.14 locally first
(From OE-Core rev: f89f705da9bffd9d10628e90a415db4411d22b4e)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/file/file/fix_version_check.patch | 21 | ||||
-rw-r--r-- | meta/recipes-devtools/file/file_5.14.bb | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-devtools/file/file/fix_version_check.patch b/meta/recipes-devtools/file/file/fix_version_check.patch deleted file mode 100644 index bd24ccb49f..0000000000 --- a/meta/recipes-devtools/file/file/fix_version_check.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Since we are cross-compiling and need to have a cover script this | ||
2 | version check sees "file.real-5.09" not "file-5.09", so fix the | ||
3 | sed. | ||
4 | |||
5 | Upstream-Status: Inapproriate [build-specific] | ||
6 | |||
7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
8 | |||
9 | Index: file-5.09/magic/Makefile.am | ||
10 | =================================================================== | ||
11 | --- file-5.09.orig/magic/Makefile.am | ||
12 | +++ file-5.09/magic/Makefile.am | ||
13 | @@ -260,7 +260,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_D | ||
14 | @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ | ||
15 | echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ | ||
16 | else \ | ||
17 | - v=$$(file --version | sed -e s/file-// -e q); \ | ||
18 | + v=$$(file --version | sed -e s/file.real-// -e q); \ | ||
19 | if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ | ||
20 | echo "Cannot use the installed version of file ($$v) to"; \ | ||
21 | echo "cross-compile file ${PACKAGE_VERSION}"; \ | ||
diff --git a/meta/recipes-devtools/file/file_5.14.bb b/meta/recipes-devtools/file/file_5.14.bb index 4270ff22f4..c8b902cf03 100644 --- a/meta/recipes-devtools/file/file_5.14.bb +++ b/meta/recipes-devtools/file/file_5.14.bb | |||
@@ -13,7 +13,6 @@ DEPENDS_class-native = "zlib-native" | |||
13 | PR = "r0" | 13 | PR = "r0" |
14 | 14 | ||
15 | SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ | 15 | SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ |
16 | file://fix_version_check.patch \ | ||
17 | file://dump \ | 16 | file://dump \ |
18 | file://filesystems" | 17 | file://filesystems" |
19 | 18 | ||