* [PATCH] external-toolchain-csl: allow gdbserver
[not found] <AANLkTinJtQfjxd5PTN8oFWiMudqvPsyQgwDu3tt=C+++@mail.gmail.com>
@ 2011-03-03 16:34 ` Ben Gardiner
2011-03-03 17:32 ` Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Ben Gardiner @ 2011-03-03 16:34 UTC (permalink / raw)
To: openembedded-devel, Tom Rini; +Cc: arago-devel
If PREFERRED_PROVIDER_gdbserver is defined as anything other than
external-toolchain-csl then don't PROVIDE or install the gdbserver
packaged with the CSL toolchain.
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
This fixes the arago build
rm -rf arago-tmp ; MACHINE=da850-omapl138-evm bitbake
arago-console-image
on the following checkouts:
arago: d6634b5366be96e1d4c7ce12411e2058183d26cb
arago-oe-dev: (merge of 414823a3c0a88a3c6ff0f3b0187626b1905bfca4 from
git://git.openembedded.org/openembedded into
0d7feb26d6d16da8327c258deb3260ac423813cd)
arago-bitbake: 789382350344a40a3d7c094b5a96bee2a69d01fa
The arago distro uses a specific
version of gdbserver and hence has PREFERRED_PROVIDER_gdbserver =
"gdbserver". Changing the PREFERRED_PROVIDER_gdbserver to external-
toolchain-csl does not fix the problem:
| Collected errors:
| * resolve_conffiles: Existing conffile
/media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/device_table
is different from the conffile in the new package. The new conffile
will be placed at
/media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/device_table-opkg.
| * file_md5sum_alloc: Failed to open file
/media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/opkg/*:
No such file or directory.
| * file_md5sum_alloc: Failed to open file
/media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/opkg/angstrom/*:
No such file or directory.
| * satisfy_dependencies_for: Cannot satisfy the following
dependencies for task-arago-console:
| * gdbserver *
| * opkg_install_cmd: Cannot install package task-arago-console.
| ERROR: Function do_rootfs failed
---
recipes/meta/external-toolchain-csl.bb | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb
index e56b74f..d492d3c 100644
--- a/recipes/meta/external-toolchain-csl.bb
+++ b/recipes/meta/external-toolchain-csl.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
INHIBIT_DEFAULT_DEPS = "1"
@@ -23,10 +23,13 @@ PROVIDES = "\
virtual/libiconv \
glibc-thread-db \
${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \
- gdbserver \
+ ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-csl', 'gdbserver', '', d)} \
"
-DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)}"
+DEPENDS = "\
+ ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)} \
+ ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-csl', '', 'gdbserver', d)} \
+"
RPROVIDES_glibc-dev += "libc-dev libc6-dev virtual-libc-dev"
PACKAGES_DYNAMIC += "glibc-gconv-*"
PACKAGES_DYNAMIC += "glibc-locale-*"
@@ -46,7 +49,7 @@ PACKAGES = "\
nscd \
ldd \
localedef \
- gdbserver \
+ ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-csl', 'gdbserver', '', d)} \
glibc-utils \
glibc-dev \
glibc-locale \
@@ -230,6 +233,7 @@ do_install() {
|| true
cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/* ${D}/usr
${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)}
+ ${@base_conditional('PREFERRED_PROVIDER_gsbserver', 'external-toolchain-csl', '', 'rm -rf ${D}${FILES_gdbserver}', d)}
cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}/usr/include
rm -rf ${D}${sysconfdir}/rpc
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] external-toolchain-csl: allow gdbserver
2011-03-03 16:34 ` [PATCH] external-toolchain-csl: allow gdbserver Ben Gardiner
@ 2011-03-03 17:32 ` Denys Dmytriyenko
2011-03-03 18:18 ` [PATCH v2] " Ben Gardiner
0 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2011-03-03 17:32 UTC (permalink / raw)
To: Ben Gardiner; +Cc: arago-devel, openembedded-devel
On Thu, Mar 03, 2011 at 11:34:31AM -0500, Ben Gardiner wrote:
> If PREFERRED_PROVIDER_gdbserver is defined as anything other than
> external-toolchain-csl then don't PROVIDE or install the gdbserver
> packaged with the CSL toolchain.
Ben,
I am now testing the same exact change in my local tree, as the result of last
night testing. I should be pushing it to OE very soon. Thanks.
Denys
> Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
>
> ---
>
> This fixes the arago build
> rm -rf arago-tmp ; MACHINE=da850-omapl138-evm bitbake
> arago-console-image
>
> on the following checkouts:
> arago: d6634b5366be96e1d4c7ce12411e2058183d26cb
> arago-oe-dev: (merge of 414823a3c0a88a3c6ff0f3b0187626b1905bfca4 from
> git://git.openembedded.org/openembedded into
> 0d7feb26d6d16da8327c258deb3260ac423813cd)
> arago-bitbake: 789382350344a40a3d7c094b5a96bee2a69d01fa
>
> The arago distro uses a specific
> version of gdbserver and hence has PREFERRED_PROVIDER_gdbserver =
> "gdbserver". Changing the PREFERRED_PROVIDER_gdbserver to external-
> toolchain-csl does not fix the problem:
>
> | Collected errors:
> | * resolve_conffiles: Existing conffile
> /media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/device_table
> is different from the conffile in the new package. The new conffile
> will be placed at
> /media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/device_table-opkg.
> | * file_md5sum_alloc: Failed to open file
> /media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/opkg/*:
> No such file or directory.
> | * file_md5sum_alloc: Failed to open file
> /media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/opkg/angstrom/*:
> No such file or directory.
> | * satisfy_dependencies_for: Cannot satisfy the following
> dependencies for task-arago-console:
> | * gdbserver *
> | * opkg_install_cmd: Cannot install package task-arago-console.
> | ERROR: Function do_rootfs failed
>
> ---
> recipes/meta/external-toolchain-csl.bb | 12 ++++++++----
> 1 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb
> index e56b74f..d492d3c 100644
> --- a/recipes/meta/external-toolchain-csl.bb
> +++ b/recipes/meta/external-toolchain-csl.bb
> @@ -1,4 +1,4 @@
> -PR = "r9"
> +PR = "r10"
>
> INHIBIT_DEFAULT_DEPS = "1"
>
> @@ -23,10 +23,13 @@ PROVIDES = "\
> virtual/libiconv \
> glibc-thread-db \
> ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \
> - gdbserver \
> + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-csl', 'gdbserver', '', d)} \
> "
>
> -DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)}"
> +DEPENDS = "\
> + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)} \
> + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-csl', '', 'gdbserver', d)} \
> +"
> RPROVIDES_glibc-dev += "libc-dev libc6-dev virtual-libc-dev"
> PACKAGES_DYNAMIC += "glibc-gconv-*"
> PACKAGES_DYNAMIC += "glibc-locale-*"
> @@ -46,7 +49,7 @@ PACKAGES = "\
> nscd \
> ldd \
> localedef \
> - gdbserver \
> + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'external-toolchain-csl', 'gdbserver', '', d)} \
> glibc-utils \
> glibc-dev \
> glibc-locale \
> @@ -230,6 +233,7 @@ do_install() {
> || true
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/* ${D}/usr
> ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)}
> + ${@base_conditional('PREFERRED_PROVIDER_gsbserver', 'external-toolchain-csl', '', 'rm -rf ${D}${FILES_gdbserver}', d)}
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}/usr/include
>
> rm -rf ${D}${sysconfdir}/rpc
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] external-toolchain-csl: allow gdbserver
2011-03-03 17:32 ` Denys Dmytriyenko
@ 2011-03-03 18:18 ` Ben Gardiner
2011-03-03 18:25 ` Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Ben Gardiner @ 2011-03-03 18:18 UTC (permalink / raw)
To: openembedded-devel, Tom Rini; +Cc: arago-devel
If PREFERRED_PROVIDER_gdbserver is not empty then don't PROVIDE or
install the gdbserver packaged with the CSL toolchain.
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
---
Changes since v1:
* test whether PREFERRED_PROVIDER_gdbserver is blank, not
whether it is set to external-toolchain-csl. The latter results
in a circular dependency when nothing is set, as it is in oe
master w/o arago
This fixes the arago build
rm -rf arago-tmp ; MACHINE=da850-omapl138-evm bitbake
arago-console-image
on the following checkouts:
arago: d6634b5366be96e1d4c7ce12411e2058183d26cb
arago-oe-dev: (merge of 414823a3c0a88a3c6ff0f3b0187626b1905bfca4 from
git://git.openembedded.org/openembedded into
0d7feb26d6d16da8327c258deb3260ac423813cd)
arago-bitbake: 789382350344a40a3d7c094b5a96bee2a69d01fa
The arago distro uses a specific
version of gdbserver and hence has PREFERRED_PROVIDER_gdbserver =
"gdbserver". Changing the PREFERRED_PROVIDER_gdbserver to external-
toolchain-csl does not fix the problem:
| Collected errors:
| * resolve_conffiles: Existing conffile
/media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/device_table
is different from the conffile in the new package. The new conffile
will be placed at
/media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/device_table-opkg.
| * file_md5sum_alloc: Failed to open file
/media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/opkg/*:
No such file or directory.
| * file_md5sum_alloc: Failed to open file
/media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/opkg/angstrom/*:
No such file or directory.
| * satisfy_dependencies_for: Cannot satisfy the following
dependencies for task-arago-console:
| * gdbserver *
| * opkg_install_cmd: Cannot install package task-arago-console.
| ERROR: Function do_rootfs failed
---
recipes/meta/external-toolchain-csl.bb | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb
index e56b74f..b0f482b 100644
--- a/recipes/meta/external-toolchain-csl.bb
+++ b/recipes/meta/external-toolchain-csl.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
INHIBIT_DEFAULT_DEPS = "1"
@@ -23,10 +23,13 @@ PROVIDES = "\
virtual/libiconv \
glibc-thread-db \
${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \
- gdbserver \
+ ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'gdbserver', '', 'gdbserver', d)} \
"
-DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)}"
+DEPENDS = "\
+ ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)} \
+ ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'gdbserver', 'gdbserver', '', d)} \
+"
RPROVIDES_glibc-dev += "libc-dev libc6-dev virtual-libc-dev"
PACKAGES_DYNAMIC += "glibc-gconv-*"
PACKAGES_DYNAMIC += "glibc-locale-*"
@@ -46,7 +49,7 @@ PACKAGES = "\
nscd \
ldd \
localedef \
- gdbserver \
+ ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'gdbserver', '', 'gdbserver', d)} \
glibc-utils \
glibc-dev \
glibc-locale \
@@ -230,6 +233,7 @@ do_install() {
|| true
cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/* ${D}/usr
${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)}
+ ${@base_conditional('PREFERRED_PROVIDER_gsbserver', 'gdbserver', 'rm -rf ${D}${FILES_gdbserver}', '', d)}
cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}/usr/include
rm -rf ${D}${sysconfdir}/rpc
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] external-toolchain-csl: allow gdbserver
2011-03-03 18:18 ` [PATCH v2] " Ben Gardiner
@ 2011-03-03 18:25 ` Denys Dmytriyenko
2011-03-03 19:25 ` Ben Gardiner
0 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2011-03-03 18:25 UTC (permalink / raw)
To: Ben Gardiner; +Cc: arago-devel, openembedded-devel
On Thu, Mar 03, 2011 at 01:18:53PM -0500, Ben Gardiner wrote:
> If PREFERRED_PROVIDER_gdbserver is not empty then don't PROVIDE or
> install the gdbserver packaged with the CSL toolchain.
>
> Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
>
> ---
>
> Changes since v1:
> * test whether PREFERRED_PROVIDER_gdbserver is blank, not
> whether it is set to external-toolchain-csl. The latter results
> in a circular dependency when nothing is set, as it is in oe
> master w/o arago
NAK. external-toolchain-csl should not depend on external gdbserver, if it
doesn't package it's own. That's how I have it in my patch, which I'm pushing
now, after testing it with different setups.
--
Denys
>
> This fixes the arago build
> rm -rf arago-tmp ; MACHINE=da850-omapl138-evm bitbake
> arago-console-image
>
> on the following checkouts:
> arago: d6634b5366be96e1d4c7ce12411e2058183d26cb
> arago-oe-dev: (merge of 414823a3c0a88a3c6ff0f3b0187626b1905bfca4 from
> git://git.openembedded.org/openembedded into
> 0d7feb26d6d16da8327c258deb3260ac423813cd)
> arago-bitbake: 789382350344a40a3d7c094b5a96bee2a69d01fa
>
> The arago distro uses a specific
> version of gdbserver and hence has PREFERRED_PROVIDER_gdbserver =
> "gdbserver". Changing the PREFERRED_PROVIDER_gdbserver to external-
> toolchain-csl does not fix the problem:
>
> | Collected errors:
> | * resolve_conffiles: Existing conffile
> /media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/device_table
> is different from the conffile in the new package. The new conffile
> will be placed at
> /media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/device_table-opkg.
> | * file_md5sum_alloc: Failed to open file
> /media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/opkg/*:
> No such file or directory.
> | * file_md5sum_alloc: Failed to open file
> /media/unixdata/src/oe-helios-next/arago-tmp/rootfs/arago-console-image/etc/opkg/angstrom/*:
> No such file or directory.
> | * satisfy_dependencies_for: Cannot satisfy the following
> dependencies for task-arago-console:
> | * gdbserver *
> | * opkg_install_cmd: Cannot install package task-arago-console.
> | ERROR: Function do_rootfs failed
> ---
> recipes/meta/external-toolchain-csl.bb | 12 ++++++++----
> 1 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb
> index e56b74f..b0f482b 100644
> --- a/recipes/meta/external-toolchain-csl.bb
> +++ b/recipes/meta/external-toolchain-csl.bb
> @@ -1,4 +1,4 @@
> -PR = "r9"
> +PR = "r10"
>
> INHIBIT_DEFAULT_DEPS = "1"
>
> @@ -23,10 +23,13 @@ PROVIDES = "\
> virtual/libiconv \
> glibc-thread-db \
> ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', 'linux-libc-headers', '', d)} \
> - gdbserver \
> + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'gdbserver', '', 'gdbserver', d)} \
> "
>
> -DEPENDS = "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)}"
> +DEPENDS = "\
> + ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'linux-libc-headers', d)} \
> + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'gdbserver', 'gdbserver', '', d)} \
> +"
> RPROVIDES_glibc-dev += "libc-dev libc6-dev virtual-libc-dev"
> PACKAGES_DYNAMIC += "glibc-gconv-*"
> PACKAGES_DYNAMIC += "glibc-locale-*"
> @@ -46,7 +49,7 @@ PACKAGES = "\
> nscd \
> ldd \
> localedef \
> - gdbserver \
> + ${@base_conditional('PREFERRED_PROVIDER_gdbserver', 'gdbserver', '', 'gdbserver', d)} \
> glibc-utils \
> glibc-dev \
> glibc-locale \
> @@ -230,6 +233,7 @@ do_install() {
> || true
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/libc/usr/* ${D}/usr
> ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-toolchain-csl', '', 'rm -rf ${D}/usr/include/linux', d)}
> + ${@base_conditional('PREFERRED_PROVIDER_gsbserver', 'gdbserver', 'rm -rf ${D}${FILES_gdbserver}', '', d)}
> cp -a ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${D}/usr/include
>
> rm -rf ${D}${sysconfdir}/rpc
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] external-toolchain-csl: allow gdbserver
2011-03-03 18:25 ` Denys Dmytriyenko
@ 2011-03-03 19:25 ` Ben Gardiner
0 siblings, 0 replies; 5+ messages in thread
From: Ben Gardiner @ 2011-03-03 19:25 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: arago-devel, openembedded-devel
Hi Denys,
On Thu, Mar 3, 2011 at 1:25 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> On Thu, Mar 03, 2011 at 01:18:53PM -0500, Ben Gardiner wrote:
>> If PREFERRED_PROVIDER_gdbserver is not empty then don't PROVIDE or
>> install the gdbserver packaged with the CSL toolchain.
>>
>> Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
>>
>> ---
>>
>> Changes since v1:
>> * test whether PREFERRED_PROVIDER_gdbserver is blank, not
>> whether it is set to external-toolchain-csl. The latter results
>> in a circular dependency when nothing is set, as it is in oe
>> master w/o arago
>
> NAK. external-toolchain-csl should not depend on external gdbserver, if it
> doesn't package it's own. That's how I have it in my patch, which I'm pushing
> now, after testing it with different setups.
Good idea.
I tested your commit df59f77a2eb37d9807c6d9167488110e92601d7b in arago
and openembedded master -- builds are successful in both.
Thanks for the mention in your commit message and especially for your
continued maintenance and direction of the arago project.
Best Regards,
Ben Gardiner
---
Nanometrics Inc.
http://www.nanometrics.ca
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-03 19:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <AANLkTinJtQfjxd5PTN8oFWiMudqvPsyQgwDu3tt=C+++@mail.gmail.com>
2011-03-03 16:34 ` [PATCH] external-toolchain-csl: allow gdbserver Ben Gardiner
2011-03-03 17:32 ` Denys Dmytriyenko
2011-03-03 18:18 ` [PATCH v2] " Ben Gardiner
2011-03-03 18:25 ` Denys Dmytriyenko
2011-03-03 19:25 ` Ben Gardiner
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.