diff options
Diffstat (limited to 'conf')
33 files changed, 460 insertions, 316 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index d446d40b8f..0a141f883e 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -51,7 +51,7 @@ HOST_CC_ARCH = "${TARGET_CC_ARCH}" TARGET_ARCH = "INVALID" TARGET_OS = "INVALID" TARGET_VENDOR = "${BUILD_VENDOR}" -TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" @@ -104,9 +104,9 @@ RPROVIDES = "" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ +FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \ + /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" @@ -118,8 +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" +FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ + /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug" # File manifest @@ -341,7 +341,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" # Program to be used to patch sources, use 'inherit patcher' to overwrite this: PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi' -PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push" +PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -P $name $patch; chmod u+w patches/$name; quilt push" PATCH_DEPENDS = "quilt-native" # GNU patch tries to be intellgent about checking out read-only files from diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 4827e458d1..66dc4fb0a6 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -53,7 +53,7 @@ require conf/distro/include/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index fbb2814453..ca7ddc873d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -22,13 +22,15 @@ FEED_URIS += " \ 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}" + ${MACHINE}##${ANGSTROM_URI}/unstable/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" #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" +SRCDATE_gconf-dbus = "20060719" +SRCDATE_gnome-vfs-dbus = "20060803" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ @@ -44,12 +46,23 @@ require conf/distro/include/preferred-opie-versions.inc # GPE require conf/distro/include/preferred-gpe-versions-2.8.inc +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" + PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" +#Small machines prefer kdrive, but we might ship full Xorg in other images +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" + +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc + +PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}" + #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" + # E require conf/distro/include/preferred-e-versions.inc @@ -74,10 +87,14 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive # Others: -PREFERRED_PROVIDER_x11 ?= "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= gconf-dbus -PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus +PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs PREFERRED_PROVIDER_tslib ?= tslib +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_ntp = "ntp" +PREFERRED_PROVIDER_hotplug = "udev" +PREFERRED_PROVIDER_libxss = "libxss" #EABI stuff PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" @@ -103,11 +120,11 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4" # Busybox <1.1.0 doesn't have EABI support -PREFERRED_VERSION_busybox = "1.2.0" +PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -PREFERRED_VERSION_dbus ?= "0.61" +PREFERRED_VERSION_dbus ?= "0.92" PREFERRED_VERSION_gstreamer ?= "0.10.6" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" @@ -123,18 +140,27 @@ PREFERRED_VERSION_hostap-modules ?= "0.4.7" PCMCIA_MANAGER_c7x0 = "pcmciautils" PCMCIA_MANAGER_akita = "pcmciautils" PCMCIA_MANAGER_spitz = "pcmciautils" +PCMCIA_MANAGER_tosa = "pcmciautils" +PCMCIA_MANAGER_poodle = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_h2200 = "pcmciautils" +PCMCIA_MANAGER_h4000 = "pcmciautils" PCMCIA_MANAGER_h6300 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" +# add altboot to compatible models, will be replaced with angstrom-bootmanager +#EXTRA_STUFF_append_c7x0 = "altboot" +#EXTRA_STUFF_append_akita = "altboot" +#EXTRA_STUFF_append_spitz = "altboot" +#EXTRA_STUFF_append_poodle = "altboot" +#EXTRA_STUFF_append_tosa = "altboot" - -#### GPE section ### +### GPE section ### #Install libgtkinput in devices without a keyboard GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf index 1e156dd363..5b12b6f93b 100644 --- a/conf/distro/ezx.conf +++ b/conf/distro/ezx.conf @@ -72,7 +72,7 @@ require conf/distro/include/preferred-opie-versions.inc # GPE # PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index a04b526f5f..6ae4e9ddc3 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -71,7 +71,7 @@ require conf/distro/include/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf index 52659b75e2..80fd25ae19 100644 --- a/conf/distro/generic-unstable.conf +++ b/conf/distro/generic-unstable.conf @@ -49,6 +49,12 @@ PREFERRED_VERSION_glibc-intermediate = "2.4" PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" # +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_tslib ?= tslib + +# # GPE # require conf/distro/include/preferred-gpe-versions.inc diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index fb38785add..d416842d9d 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -35,8 +35,6 @@ 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" @@ -60,9 +58,16 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" require conf/distro/include/sane-srcdates.inc # +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_tslib ?= tslib +require conf/distro/include/preferred-x-versions-pre-X11R7.inc + +# # GPE # -require conf/distro/include/preferred-gpe-versions.inc +require conf/distro/include/preferred-gpe-versions-2.7.inc # # Opie diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 8203c000f7..9c2679aff1 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -9,7 +9,7 @@ DISTRO_NAME = "Angstrom" ANGSTROM_URI = "http://www.angstrom-distribution.org" #Set the default maintainer to angstrom-dev -MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>" +MAINTAINER = "Angstrom Developers <angstrom-dev@linuxtogo.org>" #use ipkg package format with debian style naming #use multimachine buildrules diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc index b7f456320f..264cceecfd 100644 --- a/conf/distro/include/openzaurus.inc +++ b/conf/distro/include/openzaurus.inc @@ -16,3 +16,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" PARALLEL_INSTALL_MODULES = "1" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" + +# Set minimal version of BitBake needed +BB_MIN_VERSION = "1.4.4" +INHERIT += "sanity" diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc index 1d09ae6051..3bbc6be01a 100644 --- a/conf/distro/include/preferred-gpe-versions-2.6.inc +++ b/conf/distro/include/preferred-gpe-versions-2.6.inc @@ -20,6 +20,7 @@ PREFERRED_VERSION_matchbox-wm ?= "0.9.3" PREFERRED_VERSION_matchbox-panel ?= "0.9.1" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_gtk+ ?= "2.6.3" +PREFERRED_VERSION_gtk-engines ?= "2.6.5" PREFERRED_VERSION_libgpewidget ?= "0.97" PREFERRED_VERSION_libgpepimc ?= "0.4" PREFERRED_VERSION_libgpevtype ?= "0.11" @@ -32,6 +33,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.14" +PREFERRED_PROVIDER_xextensions = "xextensions" #PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 933195977d..36702025c1 100644 --- a/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -21,6 +21,7 @@ PREFERRED_VERSION_atk ?= "1.9.0" PREFERRED_VERSION_cairo ?= "0.5.2" PREFERRED_VERSION_glib-2.0 ?= "2.6.4" PREFERRED_VERSION_gtk+ ?= "2.6.10" +PREFERRED_VERSION_gtk-engines ?= "2.6.5" PREFERRED_VERSION_pango ?= "1.8.1" PREFERRED_VERSION_librsvg ?= "2.6.5" PREFERRED_VERSION_libgpewidget ?= "0.109" @@ -37,6 +38,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.6" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.15" +PREFERRED_PROVIDER_xextensions = "xextensions" PREFERRED_VERSION_xextensions ?= "1.0.1" PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc index 676e0ee9f9..180ca47b17 100644 --- a/conf/distro/include/preferred-gpe-versions.inc +++ b/conf/distro/include/preferred-gpe-versions.inc @@ -18,6 +18,7 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus #PREFERRED_VERSION_matchbox-panel ?= "0.9.1" #PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" #PREFERRED_VERSION_gtk+ ?= "2.6.3" +#PREFERRED_VERSION_gtk-engines ?= "2.6.5" #PREFERRED_VERSION_libgpewidget ?= "0.97" #PREFERRED_VERSION_libgpepimc ?= "0.4" #PREFERRED_VERSION_libgpevtype ?= "0.11" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc index 8c6b122585..6db9d92f71 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_libxext = "libxext" PREFERRED_PROVIDER_xext = "libxext" PREFERRED_PROVIDER_libxi = "libxi" PREFERRED_PROVIDER_libxft = "libxft" -PREFERRED_PROVIDER_libx11 = "libx11" +PREFERRED_PROVIDER_virtual/libx11 = "libx11" PREFERRED_PROVIDER_libxpm = "libxpm" PREFERRED_PROVIDER_xpm = "libxpm" PREFERRED_PROVIDER_libxt = "libxt" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 4371fae61d..27a6164e54 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -1,185 +1,185 @@ -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +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_PROVIDER_libxext ?= "libxext" +PREFERRED_PROVIDER_xext ?= "libxext" +PREFERRED_PROVIDER_libxi ?= "libxi" +PREFERRED_PROVIDER_libxft ?= "libxft" +PREFERRED_PROVIDER_virtual/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_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" +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.2.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/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 9a88449e07..b9cc82e1d3 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -1,17 +1,29 @@ # Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version -SRCDATE_gconf-dbus ?= "20060119" -SRCDATE_gnome-vfs-dbus ?= "20060119" +# Kernel modules +SRCDATE_at76c503a-modules ?= "20060814" +SRCDATE_prism54-module ?= "20060814" + +# X11 libs, extentions and protos +SRCDATE_xcalibrate ?= "20060804" +SRCDATE_compositeext ?= "20060814" +SRCDATE_drm ?= "20060814" +SRCDATE_drm-kernel ?= "20060814" +SRCDATE_fixesext ?= "20060814" +SRCDATE_libxext-native ?= "20060814" +SRCDATE_libxss ?= "20060814" +SRCDATE_recordext ?= "20060814" +SRCDATE_renderext ?= "20060814" +SRCDATE_xcalibrate ?= "20060814" +SRCDATE_xcalibrateext ?= "20060814" +SRCDATE_xxf86dgaext ?= "20060814" +SRCDATE_xxf86vmext ?= "20060814" + +# Matchbox / O-hand SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" -SRCDATE_gtkhtml2 ?= "20060323" SRCDATE_web ?= "20060613" SRCDATE_eds-dbus ?= "20060707" -SRCDATE_minimo ?= "20050401" -SRCDATE_ipkg-utils-native ?= "20050930" -SRCDATE_ipkg-link-1 ?= "20050930" -SRCDATE_ipkg-utils ?= "20050930" -SRCDATE_ipkg-link ?= "20050930" SRCDATE_matchbox-common ?= "20060612" SRCDATE_matchbox-config-gtk ?= "20060612" SRCDATE_matchbox-desktop ?= "20060612" @@ -22,8 +34,52 @@ SRCDATE_matchbox-stroke ?= "20060612" SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" SRCDATE_libmatchbox ?= "20060612" -SRCDATE_tslib ?= "20051101" SRCDATE_libfakekey ?= "20051101" -SRCDATE_qemu-native ?= "20060526" -SRCDATE_oprofile ?= "20060214" SRCDATE_zaurusd ?= "20060628" + +# GPE +SRCDATE_dasher-gpe ?= "20060814" +SRCDATE_rosetta ?= "20060804" + +# GNOME +SRCDATE_gconf-dbus ?= "20060719" +SRCDATE_gnome-vfs-dbus ?= "20060119" +SRCDATE_gtkhtml2 ?= "20060323" + +#Misc apps, sorted by alphabet +SRCDATE_avetanabt ?= "20060814" +SRCDATE_bl ?= "20060814" +SRCDATE_dvbstream ?= "20060814" +SRCDATE_dvbtraffic ?= "20060814" +SRCDATE_dvbtune ?= "20060814" +SRCDATE_fdclock ?= "20060814" +SRCDATE_fltk ?= "20060814" +SRCDATE_ipkg-link ?= "20050930" +SRCDATE_ipkg-link-1 ?= "20050930" +SRCDATE_ipkg-utils ?= "20050930" +SRCDATE_ipkg-utils-native ?= "20050930" +SRCDATE_kaffe-qt ?= "20060814" +SRCDATE_kbdd ?= "20060814" +SRCDATE_led ?= "20060814" +SRCDATE_linux-input ?= "20060814" +SRCDATE_madwifi-modules ?= "20060814" +SRCDATE_mileage ?= "20060814" +SRCDATE_minimo ?= "20050401" +SRCDATE_mystun-server ?= "20060814" +SRCDATE_olsrd ?= "20060814" +SRCDATE_opencvs ?= "20060814" +SRCDATE_oprofile ?= "20060214" +SRCDATE_portaudio ?= "20060814" +SRCDATE_putty ?= "20060814" +SRCDATE_python-cairo ?= "20060814" +SRCDATE_qemu-native ?= "20060526" +SRCDATE_roadster ?= "20060814" +SRCDATE_sctzap ?= "20060814" +SRCDATE_tslib ?= "20051101" +SRCDATE_waimea ?= "20060814" +SRCDATE_xcompmgr ?= "20060814" +SRCDATE_xirssi ?= "20060814" +SRCDATE_xsvg ?= "20060814" +SRCDATE_yamonenv ?= "20060814" +SRCDATE_zroadmap ?= "20060814" + diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c2b169106f..5e7947f866 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -179,7 +179,7 @@ PREFERRED_VERSION_ixp-osal ?= "2.1" PREFERRED_VERSION_ixp400-eth ?= "1.5" # Select the smallest provider of x11 libraries -PREFERRED_PROVIDER_libx11 ?= "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" SRCDATE_diet-x11 ?= "20060106" # Latest wpa-supplicant which supports madwifi-ng diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 3c2d8e560b..e668c3ce38 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -6,111 +6,147 @@ DISTRO_NAME = "jlime" DISTRO_VERSION = "donkey" -export FEED_URLS_jlime = "donkey##http://www.jlime.com/downloads/releases/donkey/${TARGET_ARCH}/feed/" +export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com" -# No uniroot +#<>-----------------------------------------------------------------> +#<> No uniroot +#<>-----------------------------------------------------------------< PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -#<> + +#<>-----------------------------------------------------------------> #<> We will set CVS DATE when things are known to work. -#<> -PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +#<>-----------------------------------------------------------------< +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_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" + +#<>-----------------------------------------------------------------> #<> We want this so we can crosscompile the kernel using gcc 3.4.3 #<> Also, select version of modules (and kernel) -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel" PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}" -#<> + +#<>-----------------------------------------------------------------> #<>We want kdrive as our default X-Server. -#<> +#<>-----------------------------------------------------------------< PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDERS_virtual/xserver += "xserver-kdrive" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/libx11 = "libx11" +PREFERRED_VERSION_liblbxutil = "X11R7.0-1.0.0" +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -#<> + +#<>-----------------------------------------------------------------> #<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers -#<> -PREFERRED_VERSION_binutils = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1" +#<>-----------------------------------------------------------------< +PREFERRED_VERSION_binutils = "2.17" +PREFERRED_VERSION_binutils-cross = "2.17" +PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7" PREFERRED_VERSION_gcc = "4.1.1" PREFERRED_VERSION_gcc-cross = "4.1.1" PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" -PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" -PREFERRED_VERSION_glibc-initial = "2.3.2" +PREFERRED_VERSION_glibc = "2.4" +PREFERRED_VERSION_glibc-intermediate = "2.4" -#<> -#<>Setting Preferred glib-2.0,glib-1.2 -#<> + +#<>------------------------------------------------------------------> +#<>Setting Preferred glib, dbus, db-native +#<>------------------------------------------------------------------< PREFERRED_VERSION_glib-2.0-native = "2.6.5" PREFERRED_VERSION_glib-1.2-native = "1.2.10" -PREFERRED_VERSION_glib-2.0 = "2.10.0" +PREFERRED_VERSION_glib-2.0 = "2.12.0" PREFERRED_VERSION_glib-1.2 = "1.2.10" +PREFERRED_VERSION_pango = "1.12.0" +PREFERRED_VERSION_dbus = "0.61" +PREFERRED_VERSION_dbus-native = "0.61" +PREFERRED_PROVIDER_dbus-glib = "dbus" +PREFERRED_PROVIDER_virtual/db-native = "db-native" + +#<>------------------------------------------------------------------> #<> #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11. -#<> +#<>------------------------------------------------------------------< PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312" -PREFERRED_PROVIDER_libx11 = "x11" PREFERRED_PROVIDER_tslib = "tslib" -PREFRRED_VERSION_cairo = "1.0.4" -#<> + + +#<>------------------------------------------------------------------> #<>Other Specific stuff. #<> #<> #<>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) +#<>------------------------------------------------------------------< SRC_DIST_LOCAL = "copy" INHERIT += "package_ipk package_tar multimachine src_distribute_local" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" + +#<>------------------------------------------------------------------> #<>What we want on the bootstrap image (extra) #<> -#<> -BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools udev \ - e2tools e2fsprogs kernel-modules spectrum-fw keymaps" +#<>------------------------------------------------------------------< +BOOTSTRAP_EXTRA_RDEPENDS += "ncurses nano wireless-tools console-tools \ + udev e2tools e2fsprogs kernel-modules keymaps \ + wget" -#<> + +#<>------------------------------------------------------------------> #<>What Qte, libqte.. versions should we use. -#<> +#<>------------------------------------------------------------------< QTE_VERSION = "2.3.10" PALMTOP_USE_MULTITHREADED_QT = "yes" OPIE_VERSION = "1.2.2" require conf/distro/include/preferred-opie-versions.inc -#<> + +#<>------------------------------------------------------------------> #<> Lets decide on a GPE versipns -#<> +#<> And lets override GTK to something that builds +#<>------------------------------------------------------------------< require conf/distro/include/preferred-gpe-versions-2.7.inc +PREFERRED_VERSION_gtk+ = "2.8.16" +PREFERRED_VERSION_pango = "1.12.0" +PREFERRED_VERSION_cairo = "1.2.2" +PREFERRED_VERSION_gtk-engines = "2.7.4" -#<> + +#<>------------------------------------------------------------------> #<> We want pcmciautils, not pcmcia-cs -#<> +#<>------------------------------------------------------------------< PCMCIA_MANAGER = "pcmciautils" -#<> + +#<>------------------------------------------------------------------> #<> We are using gcc 4.1.1 so lets keep optimizations low -#<> +#<>------------------------------------------------------------------< FULL_OPTIMIZATION = "-O1" -#<> + +#<>------------------------------------------------------------------> #<>Our Image files should look abit better. #<> -#<> +#<>------------------------------------------------------------------< IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}" + +#<>------------------------------------------------------------------> #<> #<> +#<> General non-essential programs with known working versions #<> -#<> General non-essential programs -#<> -#<> -PREFERRED_VERSION_irssi = "0.8.10"
\ No newline at end of file +#<>------------------------------------------------------------------< +PREFERRED_VERSION_irssi = "0.8.10" +PREFERRED_VERSION_mc = "4.6.1" +PREFERRED_VERSION_nano = "1.3.9" +PREFERRED_VERSION_ncurses = "5.4" +PREFERRED_VERSION_ncftp = "3.1.9"
\ No newline at end of file diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf index 900f24dd03..b8592fdf68 100644 --- a/conf/distro/maemo-1.0.conf +++ b/conf/distro/maemo-1.0.conf @@ -8,9 +8,7 @@ DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" - + " #SRCDATE = 20050331 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" @@ -29,7 +27,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions.inc diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 14372b5b9e..43492944ff 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -10,6 +10,8 @@ CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ http://www.oesources.org/source/current/" + +require conf/distro/include/sane-srcdates.inc require conf/distro/include/openzaurus.inc DISTRO_TYPE = "debug" @@ -50,8 +52,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_VERSION_binutils-cross = "2.16" -PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" +PREFERRED_VERSION_binutils = "2.15.94.0.1" # # Opie @@ -65,7 +67,7 @@ require conf/distro/include/preferred-opie-versions.inc # GPE # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" require conf/distro/include/preferred-gpe-versions-2.8.inc # diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 873e047009..81d5ea7397 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -10,6 +10,10 @@ DISTRO_TYPE = "beta" SLUGOS_IMAGENAME = "ucslugc" SLUGOS_IMAGESEX = "big-endian" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc = "3.4.4" + # NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this # directory diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 89c0d031ee..005a70e664 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -4,5 +4,6 @@ include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-2.6.conf +IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt" ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 103bd13e4b..2faf6ebed9 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -2,7 +2,6 @@ #@Name: Genisi EFIKA Development Platform #@DESCRIPTION: Machine configuration for teh EFIKA development platform: http://www.pegasosppc.com/efika.php -INHERIT += "linux_modules" TARGET_ARCH = "powerpc" IPKG_EXTRA_ARCHS = "ppc" diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 4b044e838d..955344344a 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -2,7 +2,6 @@ #@Name: Cirrus Logic EP-93xx Development Platform #@DESCRIPTION: Machine configuration for Cirrus Logic EP-93xx Development Platform -INHERIT += "linux_modules" TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4t" @@ -15,10 +14,11 @@ USE_VT = "0" #ship in rootfs: -EP93XX_MODULES = "apm \ - pcmcia-core \ - ipv6 " -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${EP93XX_MODULES}', d)}" +EP93XX_MODULES = "kernel-module-apm \ + kernel-module-pcmcia-core \ + kernel-module-ipv6 " + +BOOTSTRAP_EXTRA_RRECOMMENDS += "${EP93XX_MODULES}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 1611ed431a..65cce6ce81 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -1,10 +1,12 @@ #@TYPE: Machine -#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx -#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices +#@NAME: Compaq iPAQ 39xx +#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx KERNEL ?= "kernel24" #KERNEL ?= "kernel26" +INHERIT += "linux_modules" + OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" @@ -17,11 +19,10 @@ EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" -H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380" -H3900_MODULES_kernel26 = " h3900_lcd h5400_lcd asic2_adcts g_ether apm h5400_battery h3900_battery pcmcia-core" +H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic nmc_asic3 mtdchar h3900-uda1380" +H3900_MODULES_kernel26 = " h3900_lcd asic2_adcts g_ether apm h3900_battery pcmcia-core" # pxa2xx_udc is built in to the kernel SERIAL_CONSOLE = "115200 tts/0 vt100" diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index bf653d9e97..410de9a100 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -2,13 +2,16 @@ #@NAME: HP iPAQ h4xxx #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx +INHERIT += "linux_modules" + TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h4000" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" ROOT_FLASH_SIZE = "32" +PCMCIA_MANAGER = "pcmciautils" BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}" @@ -21,16 +24,15 @@ H4000_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" -SERIAL_CONSOLE = "115200 tts/0 vt100" +SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf # LAB can only resolve relative symlinks ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 758793f7a7..32e9304cdb 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -7,6 +7,8 @@ KERNEL ?= "kernel24" OVERRIDES =. "${KERNEL}:" +INHERIT += "linux_modules" + TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" @@ -32,4 +34,4 @@ USE_VT = "0" GUI_MACHINE_CLASS = "smallscreen" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 8ce77e7449..dac9a84aff 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -1,22 +1,27 @@ #@TYPE: Machine #@NAME: HTC Universal -#@DESCRIPTION: Machine configuration for the HTC Universal with a pxa27x CPU devices +#@DESCRIPTION: Machine configuration for the HTC Universal TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa htcuniversal" +IPKG_EXTRA_ARCHS = "ipaqpxa armv4t armv5te iwmmxt" + #use this for a HTC Universal PREFERRED_PROVIDER_xserver = "xserver-kdrive" -#PREFERRED_PROVIDER_virtual/kernel = "xanadux-un-2.6" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-un-2.6" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +XSERVER = "xserver-kdrive-fbdev" MODUTILS = "26" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" -#BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" +BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${UN_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" +BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "g_ether hidp i2c-core i2c-pxa i2c-sensor" +PXA270_MODULES = "acx g_ether g_file_storage pxa27x_udc bsd_comp \ + snd_pcm_oss snd_mixer_oss \ + hidp bluetooth bfusb hci_usb \ + irtty-sir pxaficp_ir sir-dev \ + " include conf/machine/include/smartphone-common.conf @@ -28,23 +33,10 @@ include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first #include conf/machine/include/tune-iwmmxt.conf -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}" -UN_MODULES = " htcuniversal_acx acx" - +UN_MODULES = "i2c-pxa htcuniversal_acx htcuniversal_power snd-htcuniversal_audio" -#module_autoload_htcuniversal_power = "htcuniversal_power" -#module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal" -#module_autoload_snd-pcm-oss = "snd-pcm-oss" -#module_autoload_snd-mixer-oss = "snd-mixer-oss" -#module_autoload_firmware-class = "firmware-class" module_autoload_acx = "acx" -module_autoload_htcuniversal-acx = "htcuniversal_acx" -#module_autoload_htcuniversal-bt = "htcuniversal_bt" -#module_autoload_htcuniversal-power = "htcuniversal_power" - -#module_autoload_pxa27x_udc = "pxa27x_udc" +module_autoload_htcuniversal_acx = "htcuniversal_acx" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" - -#GPE_EXTRA_INSTALL += " gomunicator" diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index da6c28c6e2..f85c2a1221 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -12,9 +12,12 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" # add a summary to the jffs2 file to make it mount a lot faster -#EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \ -# -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.img \ -# --eraseblock=0x4000" +EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ + --eraseblock=0x4000 -l -p" +IMAGE_CMD_jffs2 += "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img" + GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_INSTALL += "gaim sylpheed" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 359f8296d8..fa3675fb59 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" #use this for a hx47xx ipaq PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" @@ -37,10 +37,10 @@ include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf +#include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-iwmmxt.conf # These modules are now compiled into the kernel: diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index b5f8606cf5..c1f918f662 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -10,8 +10,6 @@ BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools" EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" -USE_DEVFS = "1" - SERIAL_CONSOLE = "115200 ttySA0" include conf/machine/include/handheld-common.conf diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index e4c108c071..fb8b521a3c 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -12,7 +12,8 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" #don't try to access tty1 USE_VT = "0" - +#use the epson xserver +XSERVER = "xserver-kdrive-epson" #ship in rootfs: NBP_MODULES = " apm \ @@ -21,7 +22,7 @@ NBP_MODULES = " apm \ BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${NBP_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" -GPE_EXTRA_INSTALL += "gpe-mini-browser tinymail" +GPE_EXTRA_INSTALL += "gpe-mini-browser" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0 vt100" @@ -34,6 +35,7 @@ udevdir = "/dev" GUI_MACHINE_CLASS = "bigscreen" - +#The initrd needs /initrd present to be able to do pivot_root +ROOTFS_POSTPROCESS_COMMAND += " mkdir -p ${IMAGE_ROOTFS}/initrd; " include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index f78dd7a3b9..3d80a41486 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -5,6 +5,8 @@ include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-2.6.conf +IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt" + PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PIVOTBOOT_EXTRA_RRECOMMENDS += "" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 2652004f82..a6b4caf6fd 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv5te" -MACHINE_KERNEL_VERSION ?= "2.4" +MACHINE_KERNEL_VERSION ?= "2.6" include conf/machine/include/tosa-${MACHINE_KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" |