summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf5
-rw-r--r--conf/distro/angstrom-2006.9.conf6
-rw-r--r--conf/distro/ezx.conf2
-rw-r--r--conf/distro/generic.conf2
-rw-r--r--conf/distro/include/angstrom.inc1
-rw-r--r--conf/distro/include/preferred-opie-versions.inc3
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.0.inc341
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.1.inc185
-rw-r--r--conf/distro/jlime-donkey.conf30
-rw-r--r--conf/distro/openzaurus-unstable.conf1
-rw-r--r--conf/machine/h4000.conf2
-rw-r--r--conf/machine/h5xxx.conf35
-rw-r--r--conf/machine/h6300.conf6
-rw-r--r--conf/machine/htcuniversal.conf2
14 files changed, 596 insertions, 25 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7893fd75cf..d446d40b8f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -102,7 +102,7 @@ PROVIDES = ""
PROVIDES_prepend = "${P} ${PF} ${PN} "
RPROVIDES = ""
-PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
FILES = ""
FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
@@ -118,6 +118,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
/lib/*.a /lib/*.o ${datadir}/aclocal"
FILES_${PN}-locale = "${datadir}/locale"
+FILES_${PN}-dbg = "${bindir}/*.dbg ${sbindir}/*.dbg ${libexecdir}/*.dbg ${libdir}/lib*.so.*.dbg \
+ /bin/*.dbg /sbin/*.dbg /lib/*.so*.dbg ${libdir}/${PN}/*.dbg"
# File manifest
@@ -223,6 +225,7 @@ export AR = "${HOST_PREFIX}ar"
export AS = "${HOST_PREFIX}as"
export RANLIB = "${HOST_PREFIX}ranlib"
export STRIP = "${HOST_PREFIX}strip"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index f1a2a74523..1d22b97a9a 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -18,7 +18,11 @@ DISTRO_TYPE = "debug"
FEED_URIS += " \
- base##${ANGSTROM_URI}/unstable/feed/base"
+ base##${ANGSTROM_URI}/unstable/feed/base \
+ perl##${ANGSTROM_URI}/unstable/feed/perl \
+ python##${ANGSTROM_URI}/unstable/feed/python \
+ debug##${ANGSTROM_URI}/unstable/feed/debug \
+ ${MACHINE}##${ANGSTROM_URI}/usntable/feed/machine/${MACHINE}"
# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
index 5a24d22a8c..1e156dd363 100644
--- a/conf/distro/ezx.conf
+++ b/conf/distro/ezx.conf
@@ -57,7 +57,7 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
#
# Utilities
#
-BOOTSTRAP_EXTRA_DEPENDS += "ezx-boot-usb-native"
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace"
#
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index b95cc42020..fb38785add 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -35,6 +35,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDER_tslib ?= tslib
+
PREFERRED_VERSION_gcc = "3.4.4"
PREFERRED_VERSION_gcc-cross = "3.4.4"
PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 13ac2b16bf..8203c000f7 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -37,7 +37,6 @@ BUILD_OPTIMIZATION = "-Os"
TARGET_FPU_arm = "soft"
#Always ship these packages
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit"
BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
#Name the generated images in a sane way
diff --git a/conf/distro/include/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc
index 51c9937628..34c1fd498e 100644
--- a/conf/distro/include/preferred-opie-versions.inc
+++ b/conf/distro/include/preferred-opie-versions.inc
@@ -65,6 +65,7 @@ PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
@@ -203,4 +204,6 @@ PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
PREFERRED_VERSION_konqueror-embedded = "20060404"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
new file mode 100644
index 0000000000..8c6b122585
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
@@ -0,0 +1,341 @@
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext = "libxext"
+PREFERRED_PROVIDER_xext = "libxext"
+PREFERRED_PROVIDER_libxi = "libxi"
+PREFERRED_PROVIDER_libxft = "libxft"
+PREFERRED_PROVIDER_libx11 = "libx11"
+PREFERRED_PROVIDER_libxpm = "libxpm"
+PREFERRED_PROVIDER_xpm = "libxpm"
+PREFERRED_PROVIDER_libxt = "libxt"
+PREFERRED_PROVIDER_libxaw = "libxaw"
+PREFERRED_PROVIDER_libice = "libice"
+PREFERRED_PROVIDER_libxrender = "libxrender"
+PREFERRED_PROVIDER_libxcursor = "libxcursor"
+PREFERRED_PROVIDER_xextensions = "xextensions"
+PREFERRED_PROVIDER_xproto = "xproto"
+PREFERRED_PROVIDER_x11 = "libx11"
+PREFERRED_PROVIDER_libxv = "libxv"
+PREFERRED_PROVIDER_xft = "libxft"
+PREFERRED_PROVIDER_libxrandr = "libxrandr"
+PREFERRED_PROVIDER_libxdamage = "libxdamage"
+PREFERRED_PROVIDER_libxcomposite = "libxcomposite"
+PREFERRED_PROVIDER_libxfixes = "libxfixes"
+PREFERRED_PROVIDER_libxinerama = "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm = "libxxf86vm"
+PREFERRED_PROVIDER_libxmu = "libxmu"
+PREFERRED_PROVIDER_libsm = "libsm"
+PREFERRED_PROVIDER_xrandr = "xrandr"
+PREFERRED_PROVIDER_xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg = "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg = "X11R7.0"
+
+PREFERRED_VERSION_appres = "X11R7.0-1.0.0"
+PREFERRED_VERSION_bdftopcf-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_bdftopcf = "X11R7.0-1.0.0"
+PREFERRED_VERSION_beforelight = "X11R7.0-1.0.1"
+PREFERRED_VERSION_bitmap = "X11R7.0-1.0.1"
+PREFERRED_VERSION_editres = "X11R7.0-1.0.1"
+PREFERRED_VERSION_fonttosfnt = "X11R7.0-1.0.1"
+PREFERRED_VERSION_fslsfonts = "X11R7.0-1.0.1"
+PREFERRED_VERSION_fstobdf = "X11R7.0-1.0.1"
+PREFERRED_VERSION_iceauth = "X11R7.0-1.0.1"
+PREFERRED_VERSION_ico = "X11R7.0-1.0.1"
+PREFERRED_VERSION_lbxproxy = "X11R7.0-1.0.1"
+PREFERRED_VERSION_listres = "X11R7.0-1.0.1"
+PREFERRED_VERSION_luit = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkcfm = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkfontdir-native = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkfontdir = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkfontscale-native = "X11R7.0-1.0.1"
+PREFERRED_VERSION_mkfontscale = "X11R7.0-1.0.1"
+PREFERRED_VERSION_oclock = "X11R7.0-1.0.1"
+PREFERRED_VERSION_proxymngr = "X11R7.0-1.0.1"
+PREFERRED_VERSION_rgb = "X11R7.0-1.0.0"
+PREFERRED_VERSION_rstart = "X11R7.0-1.0.1"
+PREFERRED_VERSION_scripts = "X11R7.0-1.0.1"
+PREFERRED_VERSION_sessreg = "X11R7.0-1.0.0"
+PREFERRED_VERSION_setxkbmap = "X11R7.0-1.0.1"
+PREFERRED_VERSION_showfont = "X11R7.0-1.0.1"
+PREFERRED_VERSION_smproxy = "X11R7.0-1.0.1"
+PREFERRED_VERSION_twm = "X11R7.0-1.0.1"
+PREFERRED_VERSION_viewres = "X11R7.0-1.0.1"
+PREFERRED_VERSION_x11perf = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xauth = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xbiff = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcalc = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xclipboard = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xclock = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcmsdb = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xconsole = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcursorgen = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xdbedizzy = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xditview = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdm = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdpyinfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdriinfo = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xedit = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xev = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xeyes = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xf86dga = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfd = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfindproxy = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfontsel = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfs = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfsinfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfwp = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xgamma = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xgc = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xhost = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xinit = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbcomp = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbevd = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbprint = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbutils = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkill = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xload = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlogo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsatoms = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsclients = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsfonts = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmag = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xman = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmessage = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmh = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xmodmap = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xmore = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xphelloworld = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xplsprinters = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xpr = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xprehashprinterlist = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xprop = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xrandr = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xrdb = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xrefresh = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xrx = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xset = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xsetmode = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xsetpointer = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xsetroot = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xsm = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xstdcmap = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xtrap = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xvidtune = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xvinfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xwd = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xwininfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xwud = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xbitmaps = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcursor-themes = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbdata = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xorg-docs = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xorg-sgml-doctools = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xf86-input-acecad = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-aiptek = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-calcomp = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-citron = "X11R7.0-2.1.1.5"
+PREFERRED_VERSION_xf86-input-digitaledge = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-input-dmc = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-dynapro = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-elo2300 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-elographics = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-evdev = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-fpit = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-hyperpen = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-jamstudio = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-joystick = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-keyboard = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-input-magellan = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-magictouch = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-mouse = "X11R7.0-1.0.3.1"
+PREFERRED_VERSION_xf86-input-mutouch = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-palmax = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-penmount = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-spaceorb = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-summa = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-tek4957 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-ur98 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-input-void = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-apm = "X11R7.0-1.0.1.5"
+PREFERRED_VERSION_xf86-video-ark = "X11R7.0-0.5.0.5"
+PREFERRED_VERSION_xf86-video-ati = "X11R7.0-6.5.7.3"
+PREFERRED_VERSION_xf86-video-chips = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-video-cirrus = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-cyrix = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-dummy = "X11R7.0-0.1.0.5"
+PREFERRED_VERSION_xf86-video-fbdev = "X11R7.0-0.1.0.5"
+PREFERRED_VERSION_xf86-video-glint = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-video-i128 = "X11R7.0-1.1.0.5"
+PREFERRED_VERSION_xf86-video-i740 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-i810 = "X11R7.0-1.4.1.3"
+PREFERRED_VERSION_xf86-video-imstt = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-mga = "X11R7.0-1.2.1.3"
+PREFERRED_VERSION_xf86-video-neomagic = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-newport = "X11R7.0-0.1.4.1"
+PREFERRED_VERSION_xf86-video-nsc = "X11R7.0-2.7.6.5"
+PREFERRED_VERSION_xf86-video-nv = "X11R7.0-1.0.1.5"
+PREFERRED_VERSION_xf86-video-rendition = "X11R7.0-4.0.1.3"
+PREFERRED_VERSION_xf86-video-s3 = "X11R7.0-0.3.5.5"
+PREFERRED_VERSION_xf86-video-s3virge = "X11R7.0-1.8.6.5"
+PREFERRED_VERSION_xf86-video-savage = "X11R7.0-2.0.2.3"
+PREFERRED_VERSION_xf86-video-siliconmotion = "X11R7.0-1.3.1.5"
+PREFERRED_VERSION_xf86-video-sis = "X11R7.0-0.8.1.3"
+PREFERRED_VERSION_xf86-video-sisusb = "X11R7.0-0.7.1.3"
+PREFERRED_VERSION_xf86-video-sunbw2 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-suncg14 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-suncg3 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-suncg6 = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-sunffb = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-video-sunleo = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-suntcx = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-tdfx = "X11R7.0-1.1.1.3"
+PREFERRED_VERSION_xf86-video-tga = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-trident = "X11R7.0-1.0.1.2"
+PREFERRED_VERSION_xf86-video-tseng = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_xf86-video-v4l = "X11R7.0-0.0.1.5"
+PREFERRED_VERSION_xf86-video-vesa = "X11R7.0-1.0.1.3"
+PREFERRED_VERSION_xf86-video-vga = "X11R7.0-4.0.0.5"
+PREFERRED_VERSION_xf86-video-via = "X11R7.0-0.1.33.2"
+PREFERRED_VERSION_xf86-video-vmware = "X11R7.0-10.11.1.3"
+PREFERRED_VERSION_xf86-video-voodoo = "X11R7.0-1.0.0.5"
+PREFERRED_VERSION_encodings = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-adobe-100dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-adobe-75dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-adobe-utopia-100dpi = "X11R7.0-1.0.1"
+PREFERRED_VERSION_font-adobe-utopia-75dpi = "X11R7.0-1.0.1"
+PREFERRED_VERSION_font-adobe-utopia-type1 = "X11R7.0-1.0.1"
+PREFERRED_VERSION_font-alias = "X11R7.0-1.0.1"
+PREFERRED_VERSION_font-arabic-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-100dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-75dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-lucidatypewriter-100dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-lucidatypewriter-75dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-ttf = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bh-type1 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bitstream-100dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bitstream-75dpi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bitstream-speedo = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-bitstream-type1 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-cronyx-cyrillic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-cursor-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-daewoo-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-dec-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-ibm-type1 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-isas-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-jis-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-micro-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-misc-cyrillic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-misc-ethiopic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-misc-meltho = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-misc-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-mutt-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-schumacher-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-screen-cyrillic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-sony-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-sun-misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-util-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-util = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-winitzki-cyrillic = "X11R7.0-1.0.0"
+PREFERRED_VERSION_font-xfree86-type1 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_diet-x11 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libapplewm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libdmx = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libfontenc-native = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libfontenc = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libfs = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libice = "X11R7.0-1.0.0"
+PREFERRED_VERSION_liblbxutil = "X11R7.0-1.0.0"
+PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libsm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libx11-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libx11 = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxau-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxau = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxaw = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxcomposite = "X11R7.0-0.2.2.2"
+PREFERRED_VERSION_libxcursor = "X11R7.0-1.1.5.2"
+PREFERRED_VERSION_libxdamage = "X11R7.0-1.0.2.2"
+PREFERRED_VERSION_libxdmcp-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxdmcp = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxevie = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxext = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxfixes = "X11R7.0-3.0.1.2"
+PREFERRED_VERSION_libxfont-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxfont = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxfontcache = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxft = "X11R7.0-2.1.8.2"
+PREFERRED_VERSION_libxi = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxinerama = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxkbfile = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxkbui = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxmu = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxp = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxpm = "X11R7.0-3.5.4.2"
+PREFERRED_VERSION_libxprintapputil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxprintutil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxrandr = "X11R7.0-1.1.0.2"
+PREFERRED_VERSION_libxrender = "X11R7.0-0.9.0.2"
+PREFERRED_VERSION_libxres = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxscrnsaver = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxt = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxtrap = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxtst = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxv = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxvmc = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxxf86dga = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxxf86misc = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxxf86vm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xtrans-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xtrans = "X11R7.0-1.0.0"
+PREFERRED_VERSION_applewmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_compositeproto = "X11R7.0-0.2.2"
+PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_evieext = "X11R7.0-1.0.2"
+PREFERRED_VERSION_fixesproto = "X11R7.0-3.0.2"
+PREFERRED_VERSION_fontcacheproto-native = "X11R7.0-0.1.2"
+PREFERRED_VERSION_fontcacheproto = "X11R7.0-0.1.2"
+PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2"
+PREFERRED_VERSION_fontsproto = "X11R7.0-2.0.2"
+PREFERRED_VERSION_glproto = "X11R7.0-1.4.3"
+PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2"
+PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2"
+PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_kbproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_printproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_randrproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2"
+PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2"
+PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_scrnsaverproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3"
+PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_xcmiscproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xcmiscproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xextproto-native = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xextproto = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xf86bigfontproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86bigfontproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86dgaproto = "X11R7.0-2.0.2"
+PREFERRED_VERSION_xf86driproto = "X11R7.0-2.0.3"
+PREFERRED_VERSION_xf86miscproto = "X11R7.0-0.9.2"
+PREFERRED_VERSION_xf86rushproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xproto-native = "X11R7.0-7.0.4"
+PREFERRED_VERSION_xproto = "X11R7.0-7.0.4"
+PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2"
+PREFERRED_VERSION_gccmakedep = "X11R7.0-1.0.1"
+PREFERRED_VERSION_imake = "X11R7.0-1.0.1"
+PREFERRED_VERSION_lndir = "X11R7.0-1.0.1"
+PREFERRED_VERSION_makedepend = "X11R7.0-1.0.0"
+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"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
new file mode 100644
index 0000000000..4371fae61d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
@@ -0,0 +1,185 @@
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext = "libxext"
+PREFERRED_PROVIDER_xext = "libxext"
+PREFERRED_PROVIDER_libxi = "libxi"
+PREFERRED_PROVIDER_libxft = "libxft"
+PREFERRED_PROVIDER_libx11 = "libx11"
+PREFERRED_PROVIDER_libxpm = "libxpm"
+PREFERRED_PROVIDER_xpm = "libxpm"
+PREFERRED_PROVIDER_libxt = "libxt"
+PREFERRED_PROVIDER_libxaw = "libxaw"
+PREFERRED_PROVIDER_libice = "libice"
+PREFERRED_PROVIDER_libxrender = "libxrender"
+PREFERRED_PROVIDER_libxcursor = "libxcursor"
+PREFERRED_PROVIDER_xextensions = "xextensions"
+PREFERRED_PROVIDER_xproto = "xproto"
+PREFERRED_PROVIDER_x11 = "libx11"
+PREFERRED_PROVIDER_libxv = "libxv"
+PREFERRED_PROVIDER_xft = "libxft"
+PREFERRED_PROVIDER_libxrandr = "libxrandr"
+PREFERRED_PROVIDER_libxdamage = "libxdamage"
+PREFERRED_PROVIDER_libxcomposite = "libxcomposite"
+PREFERRED_PROVIDER_libxfixes = "libxfixes"
+PREFERRED_PROVIDER_libxinerama = "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm = "libxxf86vm"
+PREFERRED_PROVIDER_libxmu = "libxmu"
+PREFERRED_PROVIDER_libsm = "libsm"
+PREFERRED_PROVIDER_xrandr = "xrandr"
+PREFERRED_PROVIDER_xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg = "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg = "X11R7.1"
+
+PREFERRED_VERSION_bitmap = "X11R7.1-1.0.2"
+PREFERRED_VERSION_fstobdf = "X11R7.1-1.0.2"
+PREFERRED_VERSION_mkfontdir-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_mkfontdir = "X11R7.1-1.0.2"
+PREFERRED_VERSION_rgb = "X11R7.1-1.0.1"
+PREFERRED_VERSION_rstart = "X11R7.1-1.0.2"
+PREFERRED_VERSION_setxkbmap = "X11R7.1-1.0.2"
+PREFERRED_VERSION_smproxy = "X11R7.1-1.0.2"
+PREFERRED_VERSION_x11perf = "X11R7.1-1.4.1"
+PREFERRED_VERSION_xclock = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xconsole = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xcursorgen = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xdm = "X11R7.1-1.0.4"
+PREFERRED_VERSION_xdriinfo = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xedit = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xfs = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xhost = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xinit = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xkbcomp = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xkbevd = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xman = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xrefresh = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xset = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xtrap = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xwininfo = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xorg-docs = "X11R7.1-1.2"
+PREFERRED_VERSION_xorg-sgml-doctools = "X11R7.1-1.1"
+PREFERRED_VERSION_xf86-input-acecad = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-aiptek = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xf86-input-calcomp = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-citron = "X11R7.1-2.2.0"
+PREFERRED_VERSION_xf86-input-digitaledge = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-dmc = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-dynapro = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-elo2300 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-evdev = "X11R7.1-1.1.2"
+PREFERRED_VERSION_xf86-input-fpit = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-hyperpen = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-jamstudio = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-joystick = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-keyboard = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-magellan = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-magictouch = "X11R7.1-1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-mouse = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-mutouch = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-palmax = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-penmount = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-spaceorb = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-summa = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-tek4957 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-ur98 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-input-vmmouse = "X11R7.1-12.4.0"
+PREFERRED_VERSION_xf86-input-void = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-apm = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-ark = "X11R7.1-0.6.0"
+PREFERRED_VERSION_xf86-video-ast = "X11R7.1-0.81.0"
+PREFERRED_VERSION_xf86-video-ati = "X11R7.1-6.6.0"
+PREFERRED_VERSION_xf86-video-chips = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-cirrus = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-cyrix = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-dummy = "X11R7.1-0.2.0"
+PREFERRED_VERSION_xf86-video-fbdev = "X11R7.1-0.3.0"
+PREFERRED_VERSION_xf86-video-glint = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-i128 = "X11R7.1-1.1.0.5"
+PREFERRED_VERSION_xf86-video-i740 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-i810 = "X11R7.1-1.6.0"
+PREFERRED_VERSION_xf86-video-imstt = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-mga = "X11R7.1-1.4.1"
+PREFERRED_VERSION_xf86-video-neomagic = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-newport = "X11R7.1-0.2.0"
+PREFERRED_VERSION_xf86-video-nsc = "X11R7.1-2.8.1"
+PREFERRED_VERSION_xf86-video-nv = "X11R7.1-1.1.1"
+PREFERRED_VERSION_xf86-video-rendition = "X11R7.1-4.1.0"
+PREFERRED_VERSION_xf86-video-s3 = "X11R7.1-0.4.1"
+PREFERRED_VERSION_xf86-video-s3virge = "X11R7.1-1.9.1"
+PREFERRED_VERSION_xf86-video-savage = "X11R7.1-2.1.1"
+PREFERRED_VERSION_xf86-video-siliconmotion = "X11R7.1-1.4.1"
+PREFERRED_VERSION_xf86-video-sis = "X11R7.1-0.9.1"
+PREFERRED_VERSION_xf86-video-sisusb = "X11R7.1-0.8.1"
+PREFERRED_VERSION_xf86-video-sunbw2 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suncg3 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suncg6 = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-sunleo = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-suntcx = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-tdfx = "X11R7.1-1.2.1"
+PREFERRED_VERSION_xf86-video-tga = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-trident = "X11R7.1-1.2.1"
+PREFERRED_VERSION_xf86-video-tseng = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xf86-video-v4l = "X11R7.1-0.1.1"
+PREFERRED_VERSION_xf86-video-vesa = "X11R7.1-1.2.0"
+PREFERRED_VERSION_xf86-video-vga = "X11R7.1-4.1.0"
+PREFERRED_VERSION_xf86-video-via = "X11R7.1-0.2.1"
+PREFERRED_VERSION_xf86-video-vmware = "X11R7.1-10.13.0"
+PREFERRED_VERSION_xf86-video-voodoo = "X11R7.1-1.1.0"
+PREFERRED_VERSION_font-util-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_font-util = "X11R7.1-1.0.1"
+PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libice = "X11R7.1-1.0.1"
+PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libsm = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3"
+PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6"
+PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxext = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1"
+PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxfont = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxi = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5"
+PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1"
+PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1"
+PREFERRED_VERSION_libxres = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxt = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1"
+PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1"
+PREFERRED_VERSION_fixesproto = "X11R7.1-4.0"
+PREFERRED_VERSION_glproto = "X11R7.1-1.4.7"
+PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5"
+PREFERRED_VERSION_xproto = "X11R7.1-7.0.5"
+PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2"
+PREFERRED_VERSION_imake = "X11R7.1-1.0.2"
+PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2"
+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"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index b3be297e53..3c2d8e560b 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -11,9 +11,6 @@ export FEED_URLS_jlime = "donkey##http://www.jlime.com/downloads/releases/donkey
# No uniroot
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-# Lets set a few more terminals
-SYSVINIT_ENABLED_GETTYS = "4"
-
#<>
#<> We will set CVS DATE when things are known to work.
#<>
@@ -52,7 +49,7 @@ PREFERRED_VERSION_glibc-initial = "2.3.2"
#<>
PREFERRED_VERSION_glib-2.0-native = "2.6.5"
PREFERRED_VERSION_glib-1.2-native = "1.2.10"
-PREFERRED_VERSION_glib-2.0 = "2.8.4"
+PREFERRED_VERSION_glib-2.0 = "2.10.0"
PREFERRED_VERSION_glib-1.2 = "1.2.10"
#<>
@@ -69,7 +66,8 @@ PREFRRED_VERSION_cairo = "1.0.4"
#<>We want to be able to build this for all jornadas so
#<>to not mess up the folders we need to make them dynamic.
#<>It will use different folders depending on Arch (set in local.conf)
-INHERIT += "package_ipk multimachine"
+SRC_DIST_LOCAL = "copy"
+INHERIT += "package_ipk package_tar multimachine src_distribute_local"
BBINCLUDELOGS = "yes"
IMAGE_FSTYPES = "tar.bz2"
TARGET_OS = "linux"
@@ -77,9 +75,7 @@ TARGET_OS = "linux"
#<>What we want on the bootstrap image (extra)
#<>
#<>
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
- e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \
+BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools udev \
e2tools e2fsprogs kernel-modules spectrum-fw keymaps"
#<>
@@ -87,10 +83,13 @@ BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-too
#<>
QTE_VERSION = "2.3.10"
PALMTOP_USE_MULTITHREADED_QT = "yes"
-PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
-PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
-OPIE_VERSION = "20060709"
-require conf/distro/include/preferred-opie-cvs-versions.inc
+OPIE_VERSION = "1.2.2"
+require conf/distro/include/preferred-opie-versions.inc
+
+#<>
+#<> Lets decide on a GPE versipns
+#<>
+require conf/distro/include/preferred-gpe-versions-2.7.inc
#<>
#<> We want pcmciautils, not pcmcia-cs
@@ -108,3 +107,10 @@ FULL_OPTIMIZATION = "-O1"
#<>
IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
+#<>
+#<>
+#<>
+#<> General non-essential programs
+#<>
+#<>
+PREFERRED_VERSION_irssi = "0.8.10" \ No newline at end of file
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 69dc40e730..14372b5b9e 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -32,6 +32,7 @@ SRCDATE ?= "20060701"
ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+PREFERRED_PROVIDER_tslib ?= tslib
KERNEL_CONSOLE = "ttyS0"
#DEBUG_OPTIMIZATION = "-O -g3"
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 8fa440e155..bf653d9e97 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -10,8 +10,6 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
ROOT_FLASH_SIZE = "32"
-BOOTSTRAP_EXTRA_DEPENDS_append = " mtd-utils virtual/kernel udev module-init-tools"
-
BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}"
BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}"
BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils kernel udev module-init-tools"
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
new file mode 100644
index 0000000000..758793f7a7
--- /dev/null
+++ b/conf/machine/h5xxx.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
+#@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
+
+KERNEL ?= "kernel24"
+#KERNEL ?= "kernel26"
+
+OVERRIDES =. "${KERNEL}:"
+
+TARGET_ARCH = "arm"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
+PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
+EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
+
+ROOT_FLASH_SIZE = "32"
+
+BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}"
+BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
+BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+
+H5XXX_MODULES_kernel24 = " g_ether pxa2xx_udc h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mtdchar h5400-audio"
+H5XXX_MODULES_kernel26 = " h5400_lcd g_ether apm h5400_battery pcmcia-core"
+# pxa2xx_udc is built in to the kernel
+
+SERIAL_CONSOLE = "115200 tts/0 vt100"
+
+USE_DEVFS_kernel24 = "1"
+USE_VT = "0"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+include conf/machine/tune-xscale.conf
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 33855e3a66..42eabeb588 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -28,11 +28,6 @@ module_autoload_snd-omap-alsa-tsc2101 = "snd-omap-alsa-tsc2101"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
-BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils console-tools module-init-tools"
-BOOTSTRAP_EXTRA_DEPENDS += "apmd alsa-utils"
-BOOTSTRAP_EXTRA_DEPENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
-BOOTSTRAP_EXTRA_DEPENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
-
BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils console-tools module-init-tools"
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${H6300_MODULES}', d)}"
BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd alsa-utils"
@@ -40,7 +35,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "alsa-utils-aconnect alsa-utils-alsactl alsa-utils-a
BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
BOOTSTRAP_EXTRA_RRECOMMENDS += "scap minicom nano gdb strace network-suspend-scripts pciutils usbutils"
-GPE_EXTRA_DEPENDS += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer"
GPE_EXTRA_INSTALL += "gaim gpe-filemanager sylpheed gpe-mini-browser gomunicator gpe-tetris gpe-othello gpe-go gstreamer"
SERIAL_CONSOLE ?= "115200 ttyS0"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 0e377a151f..8ce77e7449 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -47,4 +47,4 @@ module_autoload_htcuniversal-acx = "htcuniversal_acx"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"
-#GPE_EXTRA_DEPENDS += " gomunicator"
+#GPE_EXTRA_INSTALL += " gomunicator"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 02:02:41 +0000