diff options
| author | Shane Volpe <shanevolpe@gmail.com> | 2007-04-07 20:23:43 +0000 |
|---|---|---|
| committer | Shane Volpe <shanevolpe@gmail.com> | 2007-04-07 20:23:43 +0000 |
| commit | 3a5e5c11ca9e5d3686fce546e33eacc62f5e7dcd (patch) | |
| tree | 4f25aacf8558a773fad14e0018d4afb9f560237f /conf | |
| parent | 1ff6665ead8253bb6adde2afeb004f9ef625f4f4 (diff) | |
| parent | 2effa2e0213c0cecaf6d3a0ca7390a288ebc9908 (diff) | |
merge of '59b19c7d48e754418caf1f4214b1ce53d2cca5c4'
and 'f4a044e0ef8b886ef1bdc74ae09f12874ddf7130'
Diffstat (limited to 'conf')
35 files changed, 523 insertions, 184 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9f6814e526..e3608c3ddc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,8 @@ ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-nati PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" -PF = "${PN}-${PV}-${PR}" +PF = "${PN}-${EXTENDPE}${PV}-${PR}" +EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" P = "${PN}-${PV}" # Package info. @@ -198,7 +199,7 @@ IMAGE_CMD_ext3 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_ IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_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; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" -IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." +IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)" @@ -471,5 +472,6 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}" + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" diff --git a/conf/checksums.ini b/conf/checksums.ini new file mode 100644 index 0000000000..b11c0f9825 --- /dev/null +++ b/conf/checksums.ini @@ -0,0 +1,11 @@ +[ftp://ftp.astron.com/pub/file/file-4.20.tar.gz] +md5=402bdb26356791bd5d277099adacc006 +sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 + +[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.1.tar.gz] +md5=bc6f32759db02cf32a83640d74fb9993 +sha256=cfa9b2d0f9b87a7a524abe149e7207adf86c077749c907342df63126a7ec292d + +[http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz] +md5=85b6a42a9e17a23c01b2f2ed0ece0563 +sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78 diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 4f603f4534..86e87f31d6 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -6,9 +6,9 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2007.3" +#DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "36" +DISTRO_REVISION = "41" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -86,8 +86,12 @@ FEED_URIS += " \ #SRCDATE = "20070303" PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" -PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13" +PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.20-hh6" +PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.20-hh6" +PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" +PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6" +PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6" PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" @@ -109,23 +113,39 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_esound ?= "pulseaudio" +# 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+" + PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.1" PREFERRED_VERSION_freetype-native = "2.2.1" -PREFERRED_VERSION_cairo = "1.4.0" - -#work around a segfault in gcc for armv4t -PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3" -PREFERRED_VERSION_glib-2.0_h6300 = "2.12.3" +PREFERRED_VERSION_cairo = "1.4.2" +PREFERRED_VERSION_glib-2.0 = "2.12.11" #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 +require conf/distro/include/preferred-xorg-versions-X11R7.2.inc + +#PREFERRED_VERSION_xserver-kdrive = "1.2.0" +PREFERRED_VERSION_gtk+ = "2.10.10" +PREFERRED_VERSION_libgnomeui = "2.16.1" -PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_VERSION_gtk+ = "2.10.9" +PREFERRED_VERSION_prismstumbler = "0.7.3" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" @@ -177,9 +197,9 @@ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "ucli PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" #use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" +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.1" PREFERRED_VERSION_binutils ?= "2.17.50.0.5" @@ -213,7 +233,7 @@ PREFERRED_VERSION_busybox = "1.2.1" PCMCIA_MANAGER = "pcmciautils" PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.71" +PREFERRED_VERSION_dbus-glib ?= "0.72" PREFERRED_VERSION_gstreamer ?= "0.10.11" @@ -248,6 +268,7 @@ EXTRA_STUFF ?= "" # Angstrom want to ship some extra stuff. This should be moved into task-base eventually +# contains ipkg specific stuff as well :( DISTRO_EXTRA_RDEPENDS += "\ update-modules module-init-tools modutils-initscripts \ sysvinit initscripts sysvinit-pidof \ @@ -256,10 +277,13 @@ DISTRO_EXTRA_RDEPENDS += "\ angstrom-version \ ipkg ipkg-collateral \ util-linux-mount util-linux-umount \ + avahi-daemon \ + avahi-autoipd \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ " DISTRO_EXTRA_RRECOMMENDS += " \ kernel-module-vfat \ + kernel-module-ext2 \ " diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index b43090202d..becad95786 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -1,52 +1,63 @@ -# -# FooNAS distribution - a NAS-centric distribution -# based on openprotium -# +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: foonas <http://www.foonas.org> +#@DESCRIPTION: A nas-centric distribution +#@MAINTAINER: Øyvind Repvik <repvik@foonas.org> +#@-------------------------------------------------------------------- + +FOONAS_MODE ?= "glibc" +ANGSTROM_MODE = ${FOONAS_MODE} +require conf/distro/angstrom-2007.1.conf + +DISTRO = "foonas" DISTRO_NAME = "foonas" +DISTRO_VERSION = "1.0-dev" +DISTRO_REVISION = "1" +DISTRO_TYPE = "debug" -# This is only changed for a release -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" -DISTRO_TYPE = "alpha" -# These should be merged once the bogofeed change has been committed. -FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/packages" -FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/kernel" +DISTRO_FEATURES = "uboot redboot" +DISTRO_FEATURES_n2100 += "raid" +DISTRO_FEATURES_storcenter += "raid" +DISTRO_FEATURES_lsppchd += "raid" +DISTRO_FEATURES_lsppchg += "raid" -TARGET_OS = "linux" +ENABLE_BINARY_LOCALE_GENERATION = "0" HOTPLUG = "udev" -# Various defines for Thecus N2100 -FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage" -FOONAS_SUPPORT_n2100 += "fis" -BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm" +# No room for debug apps on an NSLU2. +DEBUG_APPS = "" -# Various defines for QNAP Turbostation -FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ - kernel-module-usb-storage" -FOONAS_SUPPORT_turbostation += "uboot-utils" -BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" +FEED_URIS = "foonas##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/" -# Various defines for Linkstations -FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ - kernel-module-raid0 kernel-module-raid456 \ - kernel-module-multipath" -FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" -FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" -FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} -IMAGE_FSTYPES_lsppchd = "tar.gz" -IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd} +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*" +IMAGE_POSTPROCESS_COMMAND += "${MACHINE}_pack_image;" +IMAGE_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" + +require conf/distro/include/sane-srcdates.inc +PREFERRED_VERSION_openlink = "svn" +PREFERRED_VERSION_dtc = "20070216" +PREFERRED_VERSION_dtc-native = "20070216" -# -# Naming schemes -# -INHERIT += "debian" +# Various defines for QNAP Turbostation +#FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ +# kernel-module-usb-storage" +#FOONAS_SUPPORT_turbostation += "uboot-utils" +#BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" # -# Packaging and output format +# Various defines for Linkstations +#FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ +# kernel-module-raid0 kernel-module-raid456 \ +# kernel-module-multipath" +#FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" +#FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" +#FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} # +#FOONAS_KERNEL_storcenter = "kernel-module-dummy \ +# kernel-module-af-packet " -INHERIT += "package_ipk" -IMAGE_BASENAME = "foonas" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/foonas.inc diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 17d7d657b1..a9d667372f 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -25,7 +25,7 @@ INHERIT += "debian multimachine" # Packaging and output format # INHERIT += "package_ipk" -IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" +IMAGE_FSTYPES ?= "tar.gz ext2.gz jffs2" # # Kernel diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc deleted file mode 100644 index 189b932716..0000000000 --- a/conf/distro/include/foonas.inc +++ /dev/null @@ -1,60 +0,0 @@ -# -# binutils and compilers -# - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate" - -# not used yet -#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate" - -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616 - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" - -BUILD_OPTIMIZATION = "-Os" -BUILD_OPTIMIZATION_pn-perl = "-O1" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -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" -#conflict between this and the last below. -#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate" - -PREFERRED_PROVIDER_virtual/libx11 = "libx11" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - -PREFERRED_PROVIDER_virtual/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" - -PREFERRED_VERSION_binutils = "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" - -PREFERRED_VERSION_gcc = "4.1.1" -PREFERRED_VERSION_gcc-cross = "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.1" - -PREFERRED_VERSION_glibc = "2.5" -PREFERRED_VERSION_glibc-intermediate = "2.5" -PREFERRED_VERSION_glibc-initial = "2.5" -GLIBC_EXTRA_OECONF = "--with-tls" - -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -GLIBC_ADDONS ?= "ports,nptl,libidn" - diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 168d9bb6a2..c41f993884 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -89,6 +89,21 @@ PREFERRED_VERSION_gtk-engines = "2.6.5" PREFERRED_VERSION_fontconfig = "2.4.1" +# 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+" # # GPE # diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc index 4cdb68b4e3..4cf6fe1ead 100644 --- a/conf/distro/include/openzaurus.inc +++ b/conf/distro/include/openzaurus.inc @@ -21,3 +21,5 @@ INHERIT += "sanity" # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" + +PREFERRED_PROVIDER_qemu-native ?= "qemu-native" diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc index fa1edcc64c..ea5d6b1153 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20070308" +OPIE_SRCDATE ?= "20070328" OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}" OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 27a6164e54..782549589d 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -153,7 +153,7 @@ 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-native ?= "X11R7.1-1.2.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" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc new file mode 100644 index 0000000000..59a481a104 --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -0,0 +1,271 @@ +PREFERRED_PROVIDER_virtual/xserver ?= "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.2" + +# app +PREFERRED_VERSION_appres ?= "1.0.1" +PREFERRED_VERSION_bdftopcf ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_beforelight ?= "1.0.2" +PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_editres ?= "1.0.2" +PREFERRED_VERSION_fontosfnt ?= "1.0.3" +PREFERRED_VERSION_fslsfonts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2" +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 ?= "1.0.2" +PREFERRED_VERSION_mkfontdir-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontscale ?= "1.0.3" +PREFERRED_VERSION_oclock ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_proxymngr ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_scripts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_sessreg ?= "1.0.2" +PREFERRED_VERSION_setxkbmap ?= "1.0.3" +PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_twm ?= "1.0.3" +PREFERRED_VERSION_viewres ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xauth ?= "1.0.2" +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.1-1.0.2" +PREFERRED_VERSION_xcmsdb ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xconsole ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcursorgen ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.3" +PREFERRED_VERSION_xdpyinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xdriinfo ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xev ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xeyes ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xxf86dga ?= "1.0.2" +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 ?= "1.0.4" +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.1-1.0.1" +PREFERRED_VERSION_xinit ?= "1.0.3" +PREFERRED_VERSION_xkbcomp ?= "1.0.3" +PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2" +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.1-1.0.2" +PREFERRED_VERSION_xmessage ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmh ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmodmap ?= "1.0.2" +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 ?= "1.0.2" +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_xrx ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xset ?= "X11R7.1-1.0.2" +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.1-1.0.2" +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.1-1.0.2" +PREFERRED_VERSION_xwud ?= "X11R7.0-1.0.1" + +#data +PREFERRED_VERSION_xbitmaps ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xcursor-themes ?= "X11R7.0-1.0.1" + +# doc +PREFERRED_VERSION_xorg-docs ?= "X11R7.1-1.2" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.1.1" + +# driver +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-elographics ?= "X11R7.0-1.0.0.5" +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 ?= "1.1.1" +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 ?= "1.1.2" +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 ?= "1.2.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 ?= "6.6.3" +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 ?= "0.3.1" +PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6" +PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" +PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.6.1" +PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.2" +PREFERRED_VERSION_xf86-video-nv ?= "1.2.2.1" +PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0" +PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1" +PREFERRED_VERSION_xf86-video-savage ?= "2.1.2" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2" +PREFERRED_VERSION_xf86-video-sis ?= "0.9.3" +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 ?= "1.3.0" +PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-trident ?= "1.2.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1" +PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1" +PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0" +PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1" + +# font +PREFERRED_VERSION_encodings ?= "1.0.2" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1" + +# lib +PREFERRED_VERSION_diet-x11 ?= "1.1.1" +PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc ?= "1.0.4" +PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libsm ?= "1.0.2" +PREFERRED_VERSION_libx11 ?= "1.1.1" +PREFERRED_VERSION_libx11-native ?= "1.1.1" +PREFERRED_VERSION_libxau ?= "1.0.3" +PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxcomposite ?= "0.3.1" +PREFERRED_VERSION_libxcursor ?= "1.1.8" +PREFERRED_VERSION_libxdamage ?= "1.0.4" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.2" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxext ?= "1.0.2" +PREFERRED_VERSION_libxfixes ?= "4.0.3" +PREFERRED_VERSION_libxfont ?= "1.2.7" +PREFERRED_VERSION_libxfontcache ?= "1.0.4" +PREFERRED_VERSION_libxi ?= "1.0.2" +PREFERRED_VERSION_libxinerama ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_libxkbfile ?= "1.0.4" +PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxmu ?= "1.0.3" +PREFERRED_VERSION_libxpm ?= "3.5.6" +PREFERRED_VERSION_libxrandr ?= "1.1.2" +PREFERRED_VERSION_libxrender ?= "0.9.2" +PREFERRED_VERSION_libxres ?= "1.0.3" +PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" +PREFERRED_VERSION_libxt ?= "1.0.4" +PREFERRED_VERSION_libxvmc ?= "1.0.4" +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_xtrans ?= "1.0.3" + +# proto +PREFERRED_VERSION_compositeproto ?= "X11R7.1-0.3.1" +PREFERRED_VERSION_fixesproto ?= "X11R7.1-4.0" +PREFERRED_VERSION_glproto ?= "1.4.8" +PREFERRED_VERSION_kbproto ?= "X11R7.1-1.0.3" +PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xproto-native ?= "7.0.10" +PREFERRED_VERSION_xproto ?= "7.0.10" + +# util +PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros-native ?= "X11R7.1-1.1.5" +PREFERRED_VERSION_util-macros ?= "X11R7.1-1.1.5" +PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" + +# xserver +PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" +PREFERRED_VERSION_xserver-xorg ?= "1.2.0" + diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 7b888b9d5f..fdac29e398 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -36,14 +36,13 @@ SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" SRCDATE_libmatchbox ?= "20060612" SRCDATE_libfakekey ?= "20051101" -SRCDATE_psplash ?= "20061207" +SRCDATE_psplash ?= "20070330" SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" -SRCDATE_libmimedir ?= "20060804" SRCDATE_gpesyncd ?= "20061128" # GNOME diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 8bb143dbba..bc1a6fbfdd 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -43,13 +43,7 @@ INHERIT += "package_ipk debian multimachine" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. -# The other settings are somewhat arbitrary. The optimisations chosen here -# include the ones which 'break' symbolic debugging (because the compiler does -# not include enough information to allow the debugger to know where given -# values are.) The -fno options are an attempt to cancel explicit use of space -# consuming options found in some packages (this isn't a complete list, this is -# just the ones which package writers seem to know about and abuse). -FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers -fno-unroll-loops -fno-inline-functions -fweb -funit-at-a-time" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" #---------------------------------------------------------------------------------- # FEEDS @@ -139,8 +133,8 @@ INHERIT += "nslu2-mirrors" PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" -PREFERRED_VERSION_ipkg ?= "0.99.154" -PREFERRED_VERSION_ipkg-native ?= "0.99.154" +PREFERRED_VERSION_ipkg ?= "0.99.163" +PREFERRED_VERSION_ipkg-native ?= "0.99.163" #FIXME: HACK: REMOVE THIS IGNORE_STRIP_ERRORS = "" @@ -149,3 +143,5 @@ IGNORE_STRIP_ERRORS = "" # needs, nail down a specific, known-working version of madwifi-ng. # Remove this once the madwifi-ng stuff seems to stabilize once again. PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" + +PREFERRED_VERSION_linux-libc-headers = "2.6.18"
\ No newline at end of file diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf index 5598694397..7278b62565 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/mokoslug.conf @@ -14,7 +14,7 @@ DISTRO_VERSION = "1.0-alpha" DISTRO_REVISION = "1" DISTRO_TYPE = "debug" -MACHINE_TASK_PROVIDER = "task-base task-mokogateway-everything" +MACHINE_TASK_PROVIDER = "task-base sysconf" # Even though the NSLU2 does not have built-in bluetooth, # we assume that a MokoSlug gateway has a bluetooth dongle. @@ -25,5 +25,3 @@ DEBUG_APPS_nslu2 = "" # No room for a kernel image on an NSLU2. IMAGE_PREPROCESS_COMMAND_append_nslu2 = "rm ${IMAGE_ROOTFS}/boot/zImage*;" - -INHERIT_append_nslu2 = "nslu2-image"
\ No newline at end of file diff --git a/conf/distro/openzaurus-3.5.5.conf b/conf/distro/openzaurus-3.5.5.conf index b5dba1ffed..42ae98fab1 100644 --- a/conf/distro/openzaurus-3.5.5.conf +++ b/conf/distro/openzaurus-3.5.5.conf @@ -140,6 +140,8 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.7" PREFERRED_VERSION_hostap-utils ?= "0.4.7" PREFERRED_VERSION_hostap-modules ?= "0.4.7" +PREFERRED_VERSION_gtk-engines ?= "2.6.5" + # # We do not use qte-mt to keep compatibility with older OZ # diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 02d54686f8..daffdda6de 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -90,6 +90,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # ENABLE_BINARY_LOCALE_GENERATION = "0" # ASSUME_PROVIDED += "qemu-native" +# If ENABLE_BINARY_LOCALE_GENERATION is set to "1", you can limit locales +# generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge +# time-savior for developmental builds. Format: list of locale.encoding pairs +# with spaces as separators. +# GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8" + # Uncomment this to select a particular major kernel version if the MACHINE setting # supports more than one major kernel version. Currently this is suported by the # following MACHINE types: poodle, tosa and simpad. diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index d8d9264699..4febd8939e 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -19,6 +19,13 @@ ROOT_FLASH_SIZE ?= "32" EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000" +# for NAND flash. +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000;\ + sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 0x20000 -p\ + " + MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 9bb24874a9..dcf3409723 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -32,7 +32,7 @@ MACHINE_TASK_PROVIDER = "task-base" ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad=0x3C00000 -n" +EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n" # build tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native" diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 9428b9ce11..61d473929a 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -22,6 +22,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ kernel-module-i2c-pxa" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 485d90df7f..dbe3a5a010 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,7 +15,8 @@ require conf/machine/include/tune-xscale.conf #require conf/machine/include/tune-iwmmxt.conf GUI_MACHINE_CLASS = "bigscreen" -MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone" +MACHINE_TASK_PROVIDER = "task-base" # # Software/packages selection diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 482c8c0d8a..52eb09b933 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -35,8 +35,10 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ kernel-module-af-key \ kernel-module-i2c-pxa \ - kernel-module-hx4700-voltage \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ kernel-module-hx4700-acx \ + kernel-module-hx4700-bt \ kernel-module-snd-hx4700-audio" #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there diff --git a/conf/machine/include/linkstationppc.conf b/conf/machine/include/lsppc.conf index 620a6931eb..ad94a0f029 100644 --- a/conf/machine/include/linkstationppc.conf +++ b/conf/machine/include/lsppc.conf @@ -5,13 +5,13 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" TARGET_FPU = "hard" +MACHINE_TASK_PROVIDER = "task-base" USE_DEVFS = "0" BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules" -FEED_URIS = "openlink##http://ipkg.linkstationwiki.net/2007.1/powerpc/" PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc" #don't try to access tty1 @@ -20,7 +20,7 @@ USE_VT = "0" HOTPLUG = "udev" udevdir = "/dev" -IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" +IMAGE_FSTYPES = "tar.gz" #tune for the MPC5200B cpu require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index 4e9e6a2ad9..1f3313c9b5 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -11,7 +11,7 @@ ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" +IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" EXTRA_IMAGEDEPENDS += "zaurus-updater" diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index 93325d253b..f66502eff1 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -1,13 +1,13 @@ EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ - --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \ - sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ +IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ + --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ + && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ --eraseblock=${ERASEBLOCKSIZE} -l -p; \ - cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ + cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf index 52d58ded5b..bf59929b02 100644 --- a/conf/machine/lsppchd.conf +++ b/conf/machine/lsppchd.conf @@ -1,7 +1,6 @@ #@TYPE: Machine #@NAME: HD Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD - UBOOT_MACHINE = "linkstation_HDLAN" - -require conf/machine/include/linkstationppc.conf +IMAGE_FSTYPES = "tar.gz" +require conf/machine/include/lsppc.conf
\ No newline at end of file diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf index b7ceb6fc95..6040010176 100644 --- a/conf/machine/lsppchg.conf +++ b/conf/machine/lsppchg.conf @@ -1,7 +1,6 @@ #@TYPE: Machine #@NAME: HG Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG - UBOOT_MACHINE = "linkstation_HGLAN" - -require conf/machine/include/linkstationppc.conf +IMAGE_FSTYPES = "tar.gz" +require conf/machine/include/lsppc.conf
\ No newline at end of file diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 3d1b602def..719c9a5b03 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -17,7 +17,12 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" + +# +# We don't support jffs2 installations (yet). +# +IMAGE_FSTYPES = "tar.bz2" # # Software/packages selection @@ -31,13 +36,11 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-leds-magician \ kernel-module-magician-ts \ - kernel-module-pxaficp-ir \ - kernel-module-uinput \ - kernel-module-hci-usb \ kernel-module-magician-flash \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ kernel-module-magician-phone \ + kernel-module-n-tihtc \ kernel-module-snd-soc-magician" # @@ -51,6 +54,7 @@ module_autoload_pxa27x_udc = "pxa27x_udc" module_autoload_magician_ds1wm = "magician_ds1wm" module_autoload_magician-battery = "magician-battery" module_autoload_magician_phone = "magician_phone" +module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" module_autoload_hci_usb = "hci_usb" diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 6aee9f1b71..2acfe812b0 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -3,15 +3,25 @@ TARGET_OS = "linux" TARGET_FPU = "soft" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +INHERIT += "n2100-image" + SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost" +MACHINE_FEATURES= "kernel26 usbhost pci ext2 redboot" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.20" +MACHINE_TASK_PROVIDER = "task-base" # We want udev support in the image udevdir = "/dev" +ERASEBLOCK_SIZE = "0x20000" +IMAGE_FSTYPES = "jffs2" +EXTRA_IMAGECMD = "--little-endian" +# Creating an image that works with the webinterface required encrypting it +# So we'll need openssl +EXTRA_IMAGEDEPENDS = "openssl-native" + require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index f5787e6448..65a797c680 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -1,23 +1,25 @@ #@TYPE: Machine -#@NAME: IBM Netvista -#@DESCRIPTION: Machine configuration for the IBM Netvista thin client +#@NAME: X86 +#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines -TARGET_ARCH = "i386" -PREFERRED_PROVIDER_xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/kernel = "linux-netvista" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils" -#BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules" -#IMAGE_FSTYPES = "cramfs" -EXTRA_IMAGEDEPENDS = "" -SERIAL_CONSOLE = "ttyS0 115200 vt100" +# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html +TARGET_ARCH = "i486" +# TARGET_VENDOR = "-oe" +PACKAGE_EXTRA_ARCHS = "netvista" +PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +XSERVER = "xserver-kdrive-vesa" -TARGET_VENDOR = "-oe" -PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista" -IMAGE_FSTYPES = "ext2" -GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword" +# todo: convert to task-base +# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -#BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace -#udevdir = "/dev" +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa" +ROOT_FLASH_SIZE = "64" +GUI_MACHINE_CLASS = "bigscreen" +udevdir = "/dev" +OLDEST_KERNEL = "2.6.17" +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 87fab62b65..104bbdb397 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -16,3 +16,4 @@ require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--big-endian" +INHERIT += "nslu2-image" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 16114a80fa..86c4ce7a31 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -15,3 +15,5 @@ ROOT_FLASH_SIZE ?= "6" require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--little-endian" + +INHERIT += "nslu2-image" diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf new file mode 100644 index 0000000000..535846c731 --- /dev/null +++ b/conf/machine/smdk2443.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@Name: Samsung SMDK2440 Dev BOard +#@DESCRIPTION: Machine configuration for Samsung SMDK2440 Dev Board + + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t" + +PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttySAC0" + +IMAGE_FSTYPES = "tar.gz" + +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_FEATURES = "kernel26 apm screen" + +require conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index 7463bc77d0..ea59349c07 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -1,18 +1,24 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" -# TARGET_VENDOR = "oe" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" + +INHERIT += "storcenter-image" + # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_TASK_PROVIDER = "task-base" -MACHINE_FEATURES= "kernel26 usbhost" -# don't go udev until kernel >=2.6.13 -#BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" -BOOTSTRAP_EXTRA_RDEPENDS = "mdadm" +MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" +MACHINE_TASK_PROVIDER = "task-base" + +# We want udev support in the image +udevdir = "/dev" + +EXTRA_IMAGECMD = "--big-endian" +ERASEBLOCK_SIZE = "0x10000" +IMAGE_FSTYPES = "jffs2" require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index a3856dbaf1..2c1a9d70b5 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -2,17 +2,26 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_TASK_PROVIDER = "task-base" + +INHERIT += "turbostation-image" # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost" +MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" +UBOOT_MACHINE = "qnap_config" +PREFERRED_VERSION_u-boot = "1.2.0" + PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" +MACHINE_TASK_PROVIDER = "task-base" # We want udev support in the image udevdir = "/dev" +EXTRA_IMAGECMD = "--big-endian" +ERASEBLOCK_SIZE = "0x20000" +IMAGE_FSTYPES = "jffs2" + require conf/machine/include/tune-ppc603e.conf diff --git a/conf/tinder.conf b/conf/tinder.conf index 99e263c96c..614ed89400 100644 --- a/conf/tinder.conf +++ b/conf/tinder.conf @@ -12,7 +12,7 @@ INHERIT += "tinderclient" # HTTP posting #TINDER_HOST = "ewi546.ewi.utwente.nl" -#TINDER_URL = "/OE_qa/cgi-bin/process_builds.cgi" +#TINDER_URL = "/tinderbox" # Which branch do we build #TINDER_BRANCH = "org.openembedded.dev" |