diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-06-17 14:11:06 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-06-17 14:11:06 +0200 |
| commit | b945c7446b2134bf69f42909b1e8b23e3fd8bbfe (patch) | |
| tree | 31eac510b5ffe777e88c981204a83bcf5128ed22 /conf | |
| parent | 19f35a34bc1c98e684b96306b377d230e367c49f (diff) | |
| parent | 35e7b34d3b5b96ed11bc7ed6b2a5d08e6183d8a3 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions-X11R7.4.inc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 077e8e1e9a..4f00be73e6 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -164,7 +164,7 @@ P = "${PN}-${PV}" # Define a PR for kernels that machines can override so things like # modules get rebuilt -MACHINE_KERNEL_PR ?= "r0" +MACHINE_KERNEL_PR = "" # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc index 46fa8d496a..21f9758f0e 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -195,6 +195,7 @@ PREFERRED_VERSION_xtrans ?= "1.2.1" # This should be here but is needed until bitbake can do # versioned depends PREFERRED_VERSION_mesa ?= "7.2" +PREFERRED_VERSION_xtrans-native ?= "1.2.1" # proto PREFERRED_VERSION_applewmproto ?= "1.0.3" @@ -218,6 +219,7 @@ PREFERRED_VERSION_videoproto ?= "2.2.2" PREFERRED_VERSION_windowswmproto ?= "1.0.3" PREFERRED_VERSION_xmiscproto ?= "1.1.2" PREFERRED_VERSION_xextproto ?= "7.0.3" +PREFERRED_VERSION_xextproto-native ?= "7.0.3" PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" PREFERRED_VERSION_xf86driproto ?= "2.0.4" PREFERRED_VERSION_xf86miscproto ?= "0.9.2" |