diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-06-18 12:03:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-21 13:03:01 +0100 |
commit | 6a5a4a1c489a23871b6f25c60ed0b079971a2c83 (patch) | |
tree | 3252dc46eae82889ca69dde7000c28b83466a307 | |
parent | 9bdb9c687dbdc3f8102707afa542f9a53405d7b5 (diff) | |
download | poky-6a5a4a1c489a23871b6f25c60ed0b079971a2c83.tar.gz |
curl: Clean up FILES_* after PACKAGES reoder
(From OE-Core rev: 760ee565b9c29f65e4c019c080274d5144f8c0ff)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/curl/curl_7.24.0.bb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.24.0.bb index 2c5369c014..832254ff65 100644 --- a/meta/recipes-support/curl/curl_7.24.0.bb +++ b/meta/recipes-support/curl/curl_7.24.0.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66 | |||
8 | DEPENDS = "zlib gnutls" | 8 | DEPENDS = "zlib gnutls" |
9 | DEPENDS_virtclass-native = "zlib-native openssl-native" | 9 | DEPENDS_virtclass-native = "zlib-native openssl-native" |
10 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk" | 10 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk" |
11 | PR = "r2" | 11 | PR = "r3" |
12 | 12 | ||
13 | SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ | 13 | SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ |
14 | file://noldlibpath.patch \ | 14 | file://noldlibpath.patch \ |
@@ -35,25 +35,20 @@ do_configure_prepend() { | |||
35 | sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac | 35 | sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac |
36 | } | 36 | } |
37 | 37 | ||
38 | PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" | 38 | PACKAGES =+ "${PN}-certs libcurl libcurl-dev libcurl-staticdev libcurl-doc" |
39 | |||
40 | FILES_${PN} = "${bindir}/curl" | ||
41 | 39 | ||
42 | FILES_${PN}-certs = "${datadir}/curl/curl-*" | 40 | FILES_${PN}-certs = "${datadir}/curl/curl-*" |
43 | PACKAGE_ARCH_${PN}-certs = "all" | 41 | PACKAGE_ARCH_${PN}-certs = "all" |
44 | 42 | ||
45 | FILES_${PN}-doc = "${mandir}/man1/curl.1" | ||
46 | |||
47 | FILES_lib${BPN} = "${libdir}/lib*.so.*" | 43 | FILES_lib${BPN} = "${libdir}/lib*.so.*" |
48 | RRECOMMENDS_lib${BPN} += "${PN}-certs" | 44 | RRECOMMENDS_lib${BPN} += "${PN}-certs" |
49 | FILES_lib${BPN}-dev = "${includedir} \ | 45 | FILES_lib${BPN}-dev = "${includedir} \ |
50 | ${libdir}/lib*.so \ | 46 | ${libdir}/lib*.so \ |
51 | ${libdir}/lib*.a \ | ||
52 | ${libdir}/lib*.la \ | 47 | ${libdir}/lib*.la \ |
53 | ${libdir}/pkgconfig \ | 48 | ${libdir}/pkgconfig \ |
54 | ${datadir}/aclocal \ | 49 | ${datadir}/aclocal \ |
55 | ${bindir}/*-config" | 50 | ${bindir}/*-config" |
56 | 51 | FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" | |
57 | FILES_lib${BPN}-doc = "${mandir}/man3 \ | 52 | FILES_lib${BPN}-doc = "${mandir}/man3 \ |
58 | ${mandir}/man1/curl-config.1" | 53 | ${mandir}/man1/curl-config.1" |
59 | 54 | ||