On Fri, Oct 15, 2010 at 03:32:27PM -0500, Chase Maupin wrote: > * Use the new MACHINE_OVERRIDES variable in angstrom.inc to > set the FEED_ARCH and SOC_FAMILY OVERRIDES > * NOTE: These were left in their orignal order which will > result in the SOC_FAMILY being more specific than > the FEED_ARCH. This was done on purpose as the > SOC_FAMILY should be more specific. i.e. for omap3 > the omap3 override is more specific than the armv7a > override. > * Modified the glibc include files to prepend libc-glibc, etc > to the OVERRIDES list. > > Signed-off-by: Chase Maupin <[email protected]>
Acked-by: Denys Dmytriyenko <[email protected]> > --- > conf/distro/include/angstrom.inc | 2 +- > conf/distro/include/eglibc.inc | 2 +- > conf/distro/include/glibc-external.inc | 2 +- > conf/distro/include/glibc-internal.inc | 2 +- > conf/distro/include/glibc.inc | 2 +- > conf/distro/include/uclibc.inc | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/conf/distro/include/angstrom.inc > b/conf/distro/include/angstrom.inc > index 8983c86..4b38cff 100644 > --- a/conf/distro/include/angstrom.inc > +++ b/conf/distro/include/angstrom.inc > @@ -14,7 +14,7 @@ TARGET_VENDOR = "-angstrom" > SOC_FAMILY ?= "Unknown" > > # Add FEED_ARCH and SOC_FAMILY to overrides > -OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}" > +MACHINE_OVERRIDES += "${FEED_ARCH} ${SOC_FAMILY}" > > # Put links to sources in deploy/sources to make it easier for people to be > GPL compliant > INHERIT += "src_distribute_local" > diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc > index 0443140..5115e7f 100644 > --- a/conf/distro/include/eglibc.inc > +++ b/conf/distro/include/eglibc.inc > @@ -1,5 +1,5 @@ > # Add glibc overrides to the overrides for eglibc. > -OVERRIDES .= ":libc-glibc" > +OVERRIDES =. "libc-glibc:" > > # The things eglibc can provide. We default to wanting eglibc to provide > them. > PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" > diff --git a/conf/distro/include/glibc-external.inc > b/conf/distro/include/glibc-external.inc > index b84d237..fd72ee8 100644 > --- a/conf/distro/include/glibc-external.inc > +++ b/conf/distro/include/glibc-external.inc > @@ -1,5 +1,5 @@ > # Add glibc to the overrides. > -OVERRIDES .= ":libc-glibc" > +OVERRIDES =. "libc-glibc:" > > # The things glibc can provide. We default to wanting glibc to provide them. > PREFERRED_PROVIDER_virtual/libiconv ?= > "external-toolchain-${TOOLCHAIN_BRAND}" > diff --git a/conf/distro/include/glibc-internal.inc > b/conf/distro/include/glibc-internal.inc > index e06b9b0..6f84f5e 100644 > --- a/conf/distro/include/glibc-internal.inc > +++ b/conf/distro/include/glibc-internal.inc > @@ -1,5 +1,5 @@ > # Add glibc to the overrides. > -OVERRIDES .= ":libc-glibc" > +OVERRIDES =. "libc-glibc:" > > # The things glibc can provide. We default to wanting glibc to provide them. > PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" > diff --git a/conf/distro/include/glibc.inc b/conf/distro/include/glibc.inc > index f1c80dc..5a6e3eb 100644 > --- a/conf/distro/include/glibc.inc > +++ b/conf/distro/include/glibc.inc > @@ -1,5 +1,5 @@ > # Add glibc to the overrides. > -OVERRIDES .= ":libc-glibc" > +OVERRIDES =. "libc-glibc:" > > # The things glibc can provide. We default to wanting glibc to provide them. > PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" > diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc > index b40fbf5..dd00647 100644 > --- a/conf/distro/include/uclibc.inc > +++ b/conf/distro/include/uclibc.inc > @@ -1,5 +1,5 @@ > # Add uclibc overrides to the overrides. > -OVERRIDES .= ":libc-uclibc" > +OVERRIDES =. "libc-uclibc:" > > # The things uclibc can provide. We default to wanting uclibc to provide > them. > PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" > -- > 1.7.0.4 > > > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
