diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-04-07 13:24:55 +0000 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-04-09 22:56:43 -0400 |
| commit | 5c69bdef4ca0d8413477db32cc82b82395806504 (patch) | |
| tree | a14223e0fef041c8c63b5179eb6f41aaa3db3e3b | |
| parent | cda3a2428521adac4749fc0c71afcedd50a9307a (diff) | |
curl: move PACKAGES and FILES_* from the .inc file
this resolves the lockfile() trying to access the wrong directory
when building sdk version after target one was built
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Tom Rini <trini@embeddedalley.com>
| -rw-r--r-- | recipes/curl/curl-common.inc (renamed from recipes/curl/curl.inc) | 23 | ||||
| -rw-r--r-- | recipes/curl/curl-native_7.18.2.bb | 4 | ||||
| -rw-r--r-- | recipes/curl/curl-sdk_7.18.2.bb | 4 | ||||
| -rw-r--r-- | recipes/curl/curl-target.inc | 22 | ||||
| -rw-r--r-- | recipes/curl/curl_7.18.2.bb | 4 | ||||
| -rw-r--r-- | recipes/curl/curl_7.19.0.bb | 6 |
6 files changed, 32 insertions, 31 deletions
diff --git a/recipes/curl/curl.inc b/recipes/curl/curl-common.inc index d3edaef20a..ce4f5f2a8e 100644 --- a/recipes/curl/curl.inc +++ b/recipes/curl/curl-common.inc @@ -55,26 +55,3 @@ do_stage () { install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} } - -PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" - -FILES_${PN} = "${bindir}/curl" - -FILES_${PN}-certs = "${datadir}/curl/curl-*" -PACKAGE_ARCH_${PN}-certs = "all" - -FILES_${PN}-doc = "${mandir}/man1/curl.1" - -FILES_lib${PN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${PN} += "${PN}-certs" -FILES_lib${PN}-dev = "${includedir} \ - ${libdir}/lib*.so \ - ${libdir}/lib*.a \ - ${libdir}/lib*.la \ - ${libdir}/pkgconfig \ - ${datadir}/aclocal \ - ${bindir}/*-config" - -FILES_lib${PN}-doc = "${mandir}/man3 \ - ${mandir}/man1/curl-config.1" - diff --git a/recipes/curl/curl-native_7.18.2.bb b/recipes/curl/curl-native_7.18.2.bb index f0e2b8940e..c95591b70b 100644 --- a/recipes/curl/curl-native_7.18.2.bb +++ b/recipes/curl/curl-native_7.18.2.bb @@ -1,6 +1,7 @@ -require curl_${PV}.bb +require curl-common.inc inherit native DEPENDS = "zlib-native" +PR = "r1" do_stage () { autotools_stage_all @@ -9,4 +10,3 @@ do_stage () { do_install() { : } - diff --git a/recipes/curl/curl-sdk_7.18.2.bb b/recipes/curl/curl-sdk_7.18.2.bb index 816fe645bc..35b0d8883f 100644 --- a/recipes/curl/curl-sdk_7.18.2.bb +++ b/recipes/curl/curl-sdk_7.18.2.bb @@ -1,6 +1,7 @@ -require curl_${PV}.bb +require curl-common.inc inherit sdk DEPENDS = "zlib-sdk" +PR = "r1" do_stage () { install -d ${STAGING_INCDIR}/curl @@ -11,4 +12,3 @@ do_stage () { do_install() { : } - diff --git a/recipes/curl/curl-target.inc b/recipes/curl/curl-target.inc new file mode 100644 index 0000000000..88877e51a0 --- /dev/null +++ b/recipes/curl/curl-target.inc @@ -0,0 +1,22 @@ +PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" + +FILES_${PN} = "${bindir}/curl" + +FILES_${PN}-certs = "${datadir}/curl/curl-*" +PACKAGE_ARCH_${PN}-certs = "all" + +FILES_${PN}-doc = "${mandir}/man1/curl.1" + +FILES_lib${PN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${PN} += "${PN}-certs" +FILES_lib${PN}-dev = "${includedir} \ + ${libdir}/lib*.so \ + ${libdir}/lib*.a \ + ${libdir}/lib*.la \ + ${libdir}/pkgconfig \ + ${datadir}/aclocal \ + ${bindir}/*-config" + +FILES_lib${PN}-doc = "${mandir}/man3 \ + ${mandir}/man1/curl-config.1" + diff --git a/recipes/curl/curl_7.18.2.bb b/recipes/curl/curl_7.18.2.bb index 2c3ec415f5..3de6da4fec 100644 --- a/recipes/curl/curl_7.18.2.bb +++ b/recipes/curl/curl_7.18.2.bb @@ -1,2 +1,4 @@ -require curl.inc +require curl-common.inc +require curl-target.inc +PR = "r1" diff --git a/recipes/curl/curl_7.19.0.bb b/recipes/curl/curl_7.19.0.bb index a99a68bcb1..1944efe240 100644 --- a/recipes/curl/curl_7.19.0.bb +++ b/recipes/curl/curl_7.19.0.bb @@ -1,5 +1,5 @@ -require curl.inc +require curl-common.inc +require curl-target.inc SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0" -PR = "r1" - +PR = "r2" |