diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-18 20:07:28 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-18 20:07:28 +0000 |
| commit | 0d892325e298089764eeb56f6202f545a1187a45 (patch) | |
| tree | 95a03c0a02dee0676dce6d03895ca7e6acfaced5 /conf/distro | |
| parent | 0d3f844b104f15d15a7a328800d49e4fabcd0317 (diff) | |
| parent | 9b80ead019e6694a3eddf818975dd769fd139668 (diff) | |
merge of '5b06f0eb5e960e760e2621fc769e25d326372fb6'
and '8b854b2b358a134500f7b4e1826c4fab2dc417ed'
Diffstat (limited to 'conf/distro')
7 files changed, 33 insertions, 1 deletions
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc index 6db9d92f71..5a391aa45a 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc @@ -339,3 +339,9 @@ PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1" PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1" PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1" PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1" + +# Unreleased Packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 782549589d..c387161577 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -183,3 +183,9 @@ PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0" PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0" + +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc index 59a481a104..dc34a99340 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -269,3 +269,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" PREFERRED_VERSION_xserver-xorg ?= "1.2.0" +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc index d7e19284bc..648472e9b6 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc @@ -280,3 +280,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "1.4" PREFERRED_VERSION_xserver-xorg ?= "1.4" +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc index b04f72180d..4af2405aa7 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -284,3 +284,9 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" # xserver PREFERRED_VERSION_xserver-kdrive ?= "1.4" PREFERRED_VERSION_xserver-xorg ?= "1.4" + +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc index f34b29f147..05136138fc 100644 --- a/conf/distro/include/preferred-xorg-versions.inc +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -109,3 +109,7 @@ PREFERRED_VERSION_xtrans ?= "1.0.3" PREFERRED_VERSION_xtrans-native ?= "1.0.3" PREFERRED_VERSION_xinit ?= "1.0.4" PREFERRED_VERSION_xev ?= "1.0.2" +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 755b874083..e0df400ab1 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -47,7 +47,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1039" -SRCREV_pn-linux-openmoko ?= "4014" +SRCREV_pn-linux-openmoko ?= "4082" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" |