summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-11 22:30:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-11 23:53:30 (GMT)
commit83b91fcd3d019965ab74d787bfb93073028c98d1 (patch)
treec336e32c9d3b3dc1eafd3c996f79a5acb780aa22
parent18c88fcec85f96d2495457928be913807971aea7 (diff)
downloadpoky-83b91fcd3d019965ab74d787bfb93073028c98d1.tar.gz
rpm: Fix magic file name magic -> magic.mgc
(From OE-Core rev: aee38df69073fe5b3c1e8ee180912d1f0360f651) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index bbc404f..83ee890 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" 45DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
46extrarpmdeps = "python perl" 46extrarpmdeps = "python perl"
47extrarpmdeps_virtclass-native = "file-native" 47extrarpmdeps_virtclass-native = "file-native"
48PR = "r28" 48PR = "r29"
49 49
50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed 50# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
51# in order to extract the distribution SRPM into a format we can extract... 51# in order to extract the distribution SRPM into a format we can extract...
@@ -123,7 +123,7 @@ EXTRA_OECONF = "--verbose \
123 ${WITH_DB} \ 123 ${WITH_DB} \
124 ${WITH_Z} \ 124 ${WITH_Z} \
125 --with-file \ 125 --with-file \
126 --with-path-magic=%{_usrlibrpm}/../../share/misc/magic \ 126 --with-path-magic=%{_usrlibrpm}/../../share/misc/magic.mgc \
127 --without-lua \ 127 --without-lua \
128 --without-tcl \ 128 --without-tcl \
129 --with-syck=internal \ 129 --with-syck=internal \