Patchwork image.bbclass: use soft assignment for LDCONFIGDEPEND

login
register
mail settings
Submitter Phil Blundell
Date May 17, 2011, 12:31 p.m.
Message ID <1305635487.2429.196.camel@phil-desktop>
Download mbox | patch
Permalink /patch/4243/
State New, archived
Headers show

Comments

Phil Blundell - May 17, 2011, 12:31 p.m.
This allows distros that don't want ldconfig to turn it off.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/classes/image.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

--
1.7.1
Koen Kooi - May 17, 2011, 12:57 p.m.
Op 17 mei 2011, om 14:31 heeft Phil Blundell het volgende geschreven:

> This allows distros that don't want ldconfig to turn it off.
> 
> Signed-off-by: Phil Blundell <philb@gnu.org>
> ---
> meta/classes/image.bbclass |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index b2325b3..346dd5e 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -23,7 +23,7 @@ PID = "${@os.getpid()}"
> 
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> 
> -LDCONFIGDEPEND = "ldconfig-native:do_populate_sysroot"
> +LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot"
> LDCONFIGDEPEND_linux-uclibc = ""
> LDCONFIGDEPEND_linux-uclibceabi = ""

The 2 last lines need to switch to _libc-uclibc overrides as well
Richard Purdie - May 17, 2011, 1:46 p.m.
On Tue, 2011-05-17 at 13:31 +0100, Phil Blundell wrote:
> This allows distros that don't want ldconfig to turn it off.
> 
> Signed-off-by: Phil Blundell <philb@gnu.org>
> ---
>  meta/classes/image.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index b2325b3..346dd5e 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -23,7 +23,7 @@ PID = "${@os.getpid()}"
> 
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
> 
> -LDCONFIGDEPEND = "ldconfig-native:do_populate_sysroot"
> +LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot"
>  LDCONFIGDEPEND_linux-uclibc = ""
>  LDCONFIGDEPEND_linux-uclibceabi = ""
> 

Applied, thanks (when I can push to the repo).

Cheers,

Richard
Richard Purdie - May 17, 2011, 1:53 p.m.
On Tue, 2011-05-17 at 14:57 +0200, Koen Kooi wrote:
> Op 17 mei 2011, om 14:31 heeft Phil Blundell het volgende geschreven:
> 
> > This allows distros that don't want ldconfig to turn it off.
> > 
> > Signed-off-by: Phil Blundell <philb@gnu.org>
> > ---
> > meta/classes/image.bbclass |    2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> > index b2325b3..346dd5e 100644
> > --- a/meta/classes/image.bbclass
> > +++ b/meta/classes/image.bbclass
> > @@ -23,7 +23,7 @@ PID = "${@os.getpid()}"
> > 
> > PACKAGE_ARCH = "${MACHINE_ARCH}"
> > 
> > -LDCONFIGDEPEND = "ldconfig-native:do_populate_sysroot"
> > +LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot"
> > LDCONFIGDEPEND_linux-uclibc = ""
> > LDCONFIGDEPEND_linux-uclibceabi = ""
> 
> The 2 last lines need to switch to _libc-uclibc overrides as well

I've queued this (and the other libc override issue) up as a patch. You
can send patches for these though ;-)

Cheers,

Richard

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index b2325b3..346dd5e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -23,7 +23,7 @@  PID = "${@os.getpid()}"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

-LDCONFIGDEPEND = "ldconfig-native:do_populate_sysroot"
+LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot"
 LDCONFIGDEPEND_linux-uclibc = ""
 LDCONFIGDEPEND_linux-uclibceabi = ""