[oe] [PATCH] external-toolchain-csl: allow gdbserver

[Denys Dmytriyenko]

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 at 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
>