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>

diff --git a/recipes/curl/curl.inc b/recipes/curl/curl-common.inc
similarity index 73%
rename from recipes/curl/curl.inc
rename to recipes/curl/curl-common.inc
index d3edaef..ce4f5f2 100644 (file)
--- 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 f0e2b89..c95591b 100644 (file)
--- 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 816fe64..35b0d88 100644 (file)
--- 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 (file)
index 0000000..88877e5
--- /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 2c3ec41..3de6da4 100644 (file)
--- 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 a99a68b..1944efe 100644 (file)
--- 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"