diff options
| -rw-r--r-- | meta/recipes-devtools/file/file/fix_version_check.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-devtools/file/file_5.09.bb (renamed from meta/recipes-devtools/file/file_5.04.bb) | 9 |
2 files changed, 25 insertions, 5 deletions
diff --git a/meta/recipes-devtools/file/file/fix_version_check.patch b/meta/recipes-devtools/file/file/fix_version_check.patch new file mode 100644 index 000000000..bd24ccb49 --- /dev/null +++ b/meta/recipes-devtools/file/file/fix_version_check.patch @@ -0,0 +1,21 @@ +Since we are cross-compiling and need to have a cover script this +version check sees "file.real-5.09" not "file-5.09", so fix the +sed. + +Upstream-Status: Inapproriate [build-specific] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: file-5.09/magic/Makefile.am +=================================================================== +--- file-5.09.orig/magic/Makefile.am ++++ file-5.09/magic/Makefile.am +@@ -260,7 +260,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_D + @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ + echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ + else \ +- v=$$(file --version | sed -e s/file-// -e q); \ ++ v=$$(file --version | sed -e s/file.real-// -e q); \ + if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ + echo "Cannot use the installed version of file ($$v) to"; \ + echo "cross-compile file ${PACKAGE_VERSION}"; \ diff --git a/meta/recipes-devtools/file/file_5.04.bb b/meta/recipes-devtools/file/file_5.09.bb index 1f9c78eb7..9b2f3a42a 100644 --- a/meta/recipes-devtools/file/file_5.04.bb +++ b/meta/recipes-devtools/file/file_5.09.bb @@ -10,16 +10,15 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03 DEPENDS = "zlib file-native" DEPENDS_virtclass-native = "zlib-native" -PR = "r2" +PR = "r0" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ - file://stringb-compat.patch \ - file://ge-le.patch \ + file://fix_version_check.patch \ file://dump \ file://filesystems" -SRC_URI[md5sum] = "accade81ff1cc774904b47c72c8aeea0" -SRC_URI[sha256sum] = "4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c" +SRC_URI[md5sum] = "6fd7cd6c4281e68fe9ec6644ce0fac6f" +SRC_URI[sha256sum] = "bde1c9830ee6c234871778faae8277fdcf775fbb16dea63c8251e24b7c2f869c" inherit autotools |