diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-14 17:38:34 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-14 17:38:34 +0100 |
| commit | f60aa088b3cd00dcf60e499f789981970f05ed89 (patch) | |
| tree | e685170610ef7d9537856e191e0e5e7c157d87fe | |
| parent | abf39a181a25fe4c77c28d0f20339ce35e37f8eb (diff) | |
| download | openembedded-core-f60aa088b3cd00dcf60e499f789981970f05ed89.tar.gz openembedded-core-f60aa088b3cd00dcf60e499f789981970f05ed89.tar.bz2 openembedded-core-f60aa088b3cd00dcf60e499f789981970f05ed89.tar.xz openembedded-core-f60aa088b3cd00dcf60e499f789981970f05ed89.zip | |
Revert "file: upgrade to version 5.04"
This reverts commit 21d586b47c8c5338913c5e8ca2ee604409cc57a0 as it breaks rpm-native.
| -rw-r--r-- | meta/packages/file/file/native-fix.diff | 13 | ||||
| -rw-r--r-- | meta/packages/file/file_4.18.bb (renamed from meta/packages/file/file_5.04.bb) | 10 |
2 files changed, 17 insertions, 6 deletions
diff --git a/meta/packages/file/file/native-fix.diff b/meta/packages/file/file/native-fix.diff new file mode 100644 index 000000000..d17215a1b --- /dev/null +++ b/meta/packages/file/file/native-fix.diff @@ -0,0 +1,13 @@ +Index: file-4.16/magic/Makefile.am +=================================================================== +--- file-4.16.orig/magic/Makefile.am 2005-08-18 17:20:49.000000000 +0200 ++++ file-4.16/magic/Makefile.am 2006-03-08 17:01:13.000000000 +0100 +@@ -18,7 +18,7 @@ + if IS_CROSS_COMPILE + FILE_COMPILE = file + else +-FILE_COMPILE = $(top_builddir)/src/file ++FILE_COMPILE = ../src/file + endif + + magic.mgc: magic diff --git a/meta/packages/file/file_5.04.bb b/meta/packages/file/file_4.18.bb index d872be5df..4c8e64c30 100644 --- a/meta/packages/file/file_5.04.bb +++ b/meta/packages/file/file_4.18.bb @@ -5,23 +5,21 @@ SECTION = "console/utils" # two clause BSD LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188" -DEPENDS = "zlib file-native" -DEPENDS_virtclass-native = "zlib-native" -PR = "r0" +DEPENDS = "file-native" +DEPENDS_virtclass-native = "" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://dump \ file://filesystems" +SRC_URI_append_virtclass-native = " file://native-fix.diff;patch=1" inherit autotools do_configure_prepend() { + sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am cp ${WORKDIR}/dump ${S}/magic/Magdir/ cp ${WORKDIR}/filesystems ${S}/magic/Magdir/ } -FILES_${PN} += "${datadir}/misc/*.mgc" - BBCLASSEXTEND = "native" |