diff options
| author | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-04 11:26:31 +0000 |
|---|---|---|
| committer | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-04 11:26:31 +0000 |
| commit | 1b4b3060fb466e34ca2f6b11be8b24c5d4fc718c (patch) | |
| tree | d175e77dc0feb59b8a35175dd33ab04253f7c554 | |
| parent | 403d83e9cd508a0f290f0647163e3745fa91fd27 (diff) | |
| parent | d9bec7fce7e68c7d277276185cea9bfb50e7af1c (diff) | |
merge of '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
and '8c692ec4078a7d2e345213289da925bfca3cac63'
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 67be27eae3..0e4285f633 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -148,6 +148,7 @@ require conf/distro/include/preferred-e-versions.inc # Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" @@ -177,6 +178,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 0159c7dd0b..bc03465bd5 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -103,6 +103,7 @@ require conf/distro/include/preferred-xorg-versions-X11R7.3.inc # Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" @@ -132,6 +133,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" |