diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko.inc | 235 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions-live.inc | 44 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain-eglibc.inc | 2 | ||||
| -rw-r--r-- | conf/distro/mokoslug.conf | 27 |
7 files changed, 29 insertions, 286 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index abe500a099..677c76a2f7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -364,8 +364,10 @@ IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz" +IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2" IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz" +IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." @@ -395,8 +397,10 @@ IMAGE_DEPENDS_yaffs2 = "yaffs2-utils-native" IMAGE_DEPENDS_cramfs = "cramfs-native" IMAGE_DEPENDS_ext2 = "genext2fs-native" IMAGE_DEPENDS_ext2.gz = "genext2fs-native" +IMAGE_DEPENDS_ext2.bz2 = "genext2fs-native" IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native" +IMAGE_DEPENDS_ext3.bz2 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native" IMAGE_DEPENDS_cpio.lzma = "lzma-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc deleted file mode 100644 index 73ab17e6b0..0000000000 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ /dev/null @@ -1,235 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Angstrom <http://www.angstrom-distribution.org> -#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi <koen@openembedded.org> -#@-------------------------------------------------------------------- - -DISTRO_VERSION = "2007.11RC3" -DISTRO_REVISION = "51" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc - -#Images built can have to modes: -# 'debug': empty rootpassword, strace included -# 'release' no root password, no strace and gdb by default -DISTRO_TYPE ?= "debug" -#DISTRO_TYPE = "release" - -# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so -# shipping some adhoc subset will be still useless and size burden for -# users of all other languages/countries. Instead, worth to make it easy -# to install additional languages: installer/wizard + metapackages which -# will RRECOMMEND as much as possible content for a given language -# (locales, UI transalations, help, etc. - useless for pros, but really -# helpful for common users). -# Also, it appears that no locales fit in 16Mb for now. "C" locale rules! -IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' - -# set feed path variables -FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${LIBC}/" - - -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback -CVS_TARBALL_STASH ?= "http://www.angstrom-distribution.org/unstable/sources/" - -#Make sure we use 2.6 on machines with a 2.4/2.6 selector -KERNEL = "kernel26" -MACHINE_KERNEL_VERSION = "2.6" -PCMCIA_MANAGER = "pcmciautils" - -#Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" -RDEPENDS_kernel-base_hx4700 = "" -RDEPENDS_kernel-base_htcuniversal = "" - -PREFERRED_PROVIDER_libgsmd = "libgsmd" - -# older gtk-webcore releases don't work on ARM/EABI -# We need to switch to a fixed SRCDATE or release as soon as possible -PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}" -PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}" -PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}" -PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" - -PREFERRED_PROVIDER_avahi = "avahi" - -#Small machines prefer kdrive, but we might ship full Xorg in other images -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" - -#use EABI ready toolchain -PREFERRED_VERSION_gcc ?= "4.1.2" -PREFERRED_VERSION_gcc-cross ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2" - -PREFERRED_VERSION_gcc_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-intermediate_dht-walnut ?= "4.1.1" - -PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-intermediate_xilinx-ml403 ?= "4.1.1" - -PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-intermediate_mpc8323e-rdb ?= "4.1.1" - -PREFERRED_VERSION_binutils ?= "2.18" -PREFERRED_VERSION_binutils-cross ?= "2.18" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" - -#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross" -PREFERRED_VERSION_avr32-gcc = "4.1.2" -PREFERRED_VERSION_avr32-gcc-cross = "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2" -PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2" -PREFERRED_VERSION_gcc-cross-intermediate_avr32 = "4.0.2" - -PREFERRED_VERSION_binutils_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" - -#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" -PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21" - -#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. -PREFERRED_VERSION_glibc ?= "2.5" -PREFERRED_VERSION_uclibc ?= "0.9.29" -PREFERRED_VERSION_uclibc-initial ?= "0.9.29" - -#there's is no avr32 patch for 0.9.29 -PREFERRED_VERSION_uclibc_avr32 = "0.9.28" -PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" - -PREFERRED_VERSION_glibc-initial ?= "2.5" - -# To use an EABI compatible version 3 series gcc, either uncomment -# the lines below or set them in local.conf: -# -# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" -# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" -# PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4+csl-arm-2005q3" - -#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom -require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/preferred-gpe-versions-2.8.inc -require conf/distro/include/preferred-e-versions.inc - - -# Virtuals: -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" - -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc" - -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" - -# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" -PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" - -PREFERRED_PROVIDER_virtual/db ?= "db" -PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libx11-native ?= "libx11-native" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" - -# Others: -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_esound ?= "pulseaudio" -PREFERRED_PROVIDER_gconf ?= "gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" -PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_tslib-conf ?= "tslib" -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_ntp ?= "ntp" -PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_libxss = "libxss" - -# we don't ship gtk-directfb by default -PREFERRED_PROVIDER_gtk+ ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - - -#Silence a warning during parsing -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} -ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" -require conf/distro/include/angstrom${ARM_ABI}.inc - -# do some task-base stuff here - -# We want to ship extra debug utils in the rootfs when doing a debug build -DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' - -#this should go away soon -EXTRA_STUFF ?= "" - - -# Angstrom want to ship some extra stuff. This should be moved into task-base eventually -# contains ipkg specific stuff as well :( - -#work around a bitbake bug where mtd-utils-native isn't created so do_rootfs fails -DISTRO_EXTRA_DEPENDS += " \ - mtd-utils-native \ - " - -DISTRO_EXTRA_RDEPENDS += "\ - update-modules \ -# ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ - angstrom-version \ - opkg opkg-collateral distro-feed-configs \ - util-linux-mount util-linux-umount \ - ${EXTRA_STUFF} \ - ${DEBUG_APPS} \ - " - -DISTRO_EXTRA_RRECOMMENDS += " \ - kernel-module-vfat \ - kernel-module-ext2 \ - kernel-module-af-packet \ - openssh-sftp-server \ - " - -SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" - diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index b97049a7e6..93678f3811 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -20,7 +20,6 @@ PREFERRED_VERSION_gtk+ = "2.20.1" PREFERRED_VERSION_gtk+-native = "2.20.1" PREFERRED_VERSION_gtkmm = "2.20.0" PREFERRED_VERSION_hal = "0.5.14" -PREFERRED_VERSION_jpeg = "6b" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.14" diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 9b9dd097ac..23d320ce03 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -44,7 +44,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.24.1" UDEV_GE_141 = "1" PREFERRED_VERSION_postgresql = "8.4.4" -ANGSTROM_QT_VERSION ?= "4.6.2+4.7.0-beta1" +ANGSTROM_QT_VERSION ?= "4.6.3+4.7.0-beta2" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 53d202a383..f50106851c 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Wed Aug 4 08:58:39 CEST 2010 +#Thu Aug 12 11:37:37 CEST 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -46,7 +46,7 @@ PREFERRED_VERSION_xconsole ?= "1.0.3" PREFERRED_VERSION_xcursorgen ?= "1.0.3" PREFERRED_VERSION_xcursorgen-native ?= "1.0.3" PREFERRED_VERSION_xdbedizzy ?= "1.0.2" -PREFERRED_VERSION_xditview ?= "1.0.1" +PREFERRED_VERSION_xditview ?= "1.0.2" PREFERRED_VERSION_xdm ?= "1.1.10" PREFERRED_VERSION_xdpyinfo ?= "1.1.0" PREFERRED_VERSION_xdriinfo ?= "1.0.3" @@ -91,7 +91,7 @@ PREFERRED_VERSION_xrandr ?= "1.3.3" PREFERRED_VERSION_xrdb ?= "1.0.6" PREFERRED_VERSION_xrefresh ?= "1.0.3" PREFERRED_VERSION_xrx ?= "1.0.3" -PREFERRED_VERSION_xset ?= "1.1.0" +PREFERRED_VERSION_xset ?= "1.2.0" PREFERRED_VERSION_xsetmode ?= "1.0.0" PREFERRED_VERSION_xsetpointer ?= "1.0.1" PREFERRED_VERSION_xsetroot ?= "1.0.3" @@ -112,7 +112,7 @@ PREFERRED_VERSION_xorg-docs ?= "1.5" PREFERRED_VERSION_xorg-sgml-doctools ?= "1.5" #driver PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0" -PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.1" PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2" PREFERRED_VERSION_xf86-input-citron ?= "2.2.2" PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1" @@ -138,11 +138,11 @@ PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.99.1" PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" -PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.9" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.10" PREFERRED_VERSION_xf86-input-void ?= "1.3.0" PREFERRED_VERSION_xf86-video-apm ?= "1.2.3" PREFERRED_VERSION_xf86-video-ark ?= "0.7.3" -PREFERRED_VERSION_xf86-video-ast ?= "0.89.9" +PREFERRED_VERSION_xf86-video-ast ?= "0.91.10" PREFERRED_VERSION_xf86-video-ati ?= "6.13.1" PREFERRED_VERSION_xf86-video-chips ?= "1.2.3" PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" @@ -151,7 +151,7 @@ PREFERRED_VERSION_xf86-video-dummy ?= "0.3.4" PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.2" PREFERRED_VERSION_xf86-video-geode ?= "2.11.8" PREFERRED_VERSION_xf86-video-glint ?= "1.2.4" -PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3" +PREFERRED_VERSION_xf86-video-i128 ?= "1.3.4" PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4" PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" @@ -189,11 +189,11 @@ PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0" PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" PREFERRED_VERSION_xf86-video-via ?= "0.2.2" -PREFERRED_VERSION_xf86-video-vmware ?= "11.0.1" +PREFERRED_VERSION_xf86-video-vmware ?= "11.0.2" PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.4" PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" -PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" -PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4" +PREFERRED_VERSION_xf86-video-xgi ?= "1.6.0" +PREFERRED_VERSION_xf86-video-xgixp ?= "1.8.0" #font PREFERRED_VERSION_encodings ?= "1.0.3" PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1" @@ -242,8 +242,8 @@ PREFERRED_VERSION_libice-native ?= "1.0.6" PREFERRED_VERSION_libsm ?= "1.1.1" PREFERRED_VERSION_libsm-native ?= "1.1.1" PREFERRED_VERSION_libwindowswm ?= "1.0.1" -PREFERRED_VERSION_libx11 ?= "1.3.4" -PREFERRED_VERSION_libx11-native ?= "1.3.4" +PREFERRED_VERSION_libx11 ?= "1.3.5" +PREFERRED_VERSION_libx11-native ?= "1.3.5" PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" PREFERRED_VERSION_libxtrap ?= "1.0.0" PREFERRED_VERSION_libxau ?= "1.0.6" @@ -312,26 +312,26 @@ PREFERRED_VERSION_fontcacheproto ?= "0.1.3" PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" PREFERRED_VERSION_fontsproto ?= "2.1.0" PREFERRED_VERSION_fontsproto-native ?= "2.1.0" -PREFERRED_VERSION_glproto ?= "1.4.11" +PREFERRED_VERSION_glproto ?= "1.4.12" PREFERRED_VERSION_inputproto ?= "2.0" PREFERRED_VERSION_inputproto-native ?= "2.0" -PREFERRED_VERSION_kbproto ?= "1.0.4" -PREFERRED_VERSION_kbproto-native ?= "1.0.4" +PREFERRED_VERSION_kbproto ?= "1.0.5" +PREFERRED_VERSION_kbproto-native ?= "1.0.5" PREFERRED_VERSION_printproto ?= "1.0.4" PREFERRED_VERSION_randrproto ?= "1.3.1" PREFERRED_VERSION_randrproto-native ?= "1.3.1" PREFERRED_VERSION_recordproto ?= "1.14" -PREFERRED_VERSION_renderproto ?= "0.11" -PREFERRED_VERSION_renderproto-native ?= "0.11" +PREFERRED_VERSION_renderproto ?= "0.11.1" +PREFERRED_VERSION_renderproto-native ?= "0.11.1" PREFERRED_VERSION_resourceproto ?= "1.1.0" PREFERRED_VERSION_scrnsaverproto ?= "1.2.0" PREFERRED_VERSION_trapproto ?= "3.4.3" -PREFERRED_VERSION_videoproto ?= "2.3.0" +PREFERRED_VERSION_videoproto ?= "2.3.1" PREFERRED_VERSION_windowswmproto ?= "1.0.4" PREFERRED_VERSION_xcmiscproto ?= "1.2.0" PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0" -PREFERRED_VERSION_xextproto ?= "7.1.1" -PREFERRED_VERSION_xextproto-native ?= "7.1.1" +PREFERRED_VERSION_xextproto ?= "7.1.2" +PREFERRED_VERSION_xextproto-native ?= "7.1.2" PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0" PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0" PREFERRED_VERSION_xf86dgaproto ?= "2.1" @@ -340,8 +340,8 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" PREFERRED_VERSION_xineramaproto ?= "1.2" -PREFERRED_VERSION_xproto ?= "7.0.17" -PREFERRED_VERSION_xproto-native ?= "7.0.17" +PREFERRED_VERSION_xproto ?= "7.0.18" +PREFERRED_VERSION_xproto-native ?= "7.0.18" PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" #util PREFERRED_VERSION_gccmakedep ?= "1.0.2" diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc index 1e370d0b8c..149f61ed3e 100644 --- a/conf/distro/include/sane-toolchain-eglibc.inc +++ b/conf/distro/include/sane-toolchain-eglibc.inc @@ -4,6 +4,8 @@ # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +# Work-around for alignment traps when eglibc-2.12 is built with gcc-4.5* +FULL_OPTIMIZATION_pn-eglibc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf deleted file mode 100644 index 1fba9e6a74..0000000000 --- a/conf/distro/mokoslug.conf +++ /dev/null @@ -1,27 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: MokoSlug <http://www.nslu2-linux.org> -#@DESCRIPTION: The Linux Server companion for Openmoko phones -#@MAINTAINER: Rod Whitby <rod@whitby.id.au> -#@-------------------------------------------------------------------- - -# MokoSlug is based on Angstrom, and would hopefully just be done by features one day ... -require conf/distro/angstrom-2008.1.conf - -DISTRO_NAME = "MokoSlug" -DISTRO_VERSION = "1.0-alpha" -DISTRO_REVISION = "1" -DISTRO_TYPE = "debug" - -MACHINE_TASK_PROVIDER = "task-boot dropbear" -MACHINE_TASK_PROVIDER_append_nslu2 = " sysconf" - -# Even though the NSLU2 does not have built-in bluetooth, -# we assume that a MokoSlug gateway has a bluetooth dongle. -MACHINE_FEATURES_append_nslu2 = " bluetooth" - -# No room for debug apps on an NSLU2. -DEBUG_APPS_nslu2 = "" - -# No room for a kernel image on an NSLU2. -IMAGE_PREPROCESS_COMMAND_append_nslu2 = "rm ${IMAGE_ROOTFS}/boot/zImage*;" |