* [STABLE][PATCH] curl: move PACKAGES and FILES_* from the .inc file
@ 2009-05-11 16:21 Denys Dmytriyenko
2009-05-11 17:02 ` Tom Rini
2009-05-11 18:18 ` Koen Kooi
0 siblings, 2 replies; 3+ messages in thread
From: Denys Dmytriyenko @ 2009-05-11 16:21 UTC (permalink / raw)
To: openembedded-devel
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>
---
recipes/curl/{curl.inc => curl-common.inc} | 23 -----------------------
recipes/curl/curl-native_7.18.2.bb | 4 ++--
recipes/curl/curl-sdk_7.18.2.bb | 4 ++--
recipes/curl/curl-target.inc | 22 ++++++++++++++++++++++
recipes/curl/curl_7.18.2.bb | 4 +++-
recipes/curl/curl_7.19.0.bb | 6 +++---
6 files changed, 32 insertions(+), 31 deletions(-)
rename recipes/curl/{curl.inc => curl-common.inc} (73%)
create mode 100644 recipes/curl/curl-target.inc
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
--- 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
--- 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
--- 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 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
--- 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
--- 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"
--
1.6.0.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [STABLE][PATCH] curl: move PACKAGES and FILES_* from the .inc file
2009-05-11 16:21 [STABLE][PATCH] curl: move PACKAGES and FILES_* from the .inc file Denys Dmytriyenko
@ 2009-05-11 17:02 ` Tom Rini
2009-05-11 18:18 ` Koen Kooi
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2009-05-11 17:02 UTC (permalink / raw)
To: openembedded-devel
On Mon, May 11, 2009 at 12:21:43PM -0400, Denys Dmytriyenko wrote:
> 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>
I'll ack this for stable/2009 as well.
--
Tom Rini
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [STABLE][PATCH] curl: move PACKAGES and FILES_* from the .inc file
2009-05-11 16:21 [STABLE][PATCH] curl: move PACKAGES and FILES_* from the .inc file Denys Dmytriyenko
2009-05-11 17:02 ` Tom Rini
@ 2009-05-11 18:18 ` Koen Kooi
1 sibling, 0 replies; 3+ messages in thread
From: Koen Kooi @ 2009-05-11 18:18 UTC (permalink / raw)
To: openembedded-devel
On 11-05-09 18:21, Denys Dmytriyenko wrote:
> 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>
Acked-by: Koen Kooi <koen@openembedded.org>
> ---
> recipes/curl/{curl.inc => curl-common.inc} | 23 -----------------------
> recipes/curl/curl-native_7.18.2.bb | 4 ++--
> recipes/curl/curl-sdk_7.18.2.bb | 4 ++--
> recipes/curl/curl-target.inc | 22 ++++++++++++++++++++++
> recipes/curl/curl_7.18.2.bb | 4 +++-
> recipes/curl/curl_7.19.0.bb | 6 +++---
> 6 files changed, 32 insertions(+), 31 deletions(-)
> rename recipes/curl/{curl.inc => curl-common.inc} (73%)
> create mode 100644 recipes/curl/curl-target.inc
>
> 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
> --- 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
> --- 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
> --- 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 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
> --- 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
> --- 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"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-11 18:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-11 16:21 [STABLE][PATCH] curl: move PACKAGES and FILES_* from the .inc file Denys Dmytriyenko
2009-05-11 17:02 ` Tom Rini
2009-05-11 18:18 ` Koen Kooi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.