diff options
Diffstat (limited to 'conf')
52 files changed, 496 insertions, 468 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 02a072ca66..e63bdfc54e 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -188,12 +188,14 @@ IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.r IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_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; 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.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 ." EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" EXTRA_IMAGECMD_squashfs = "-le -b 16384" +EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384" IMAGE_ROOTFS_SIZE_ext2 = "65536" IMAGE_ROOTFS_SIZE_ext2.gz = "65536" @@ -203,6 +205,7 @@ IMAGE_DEPENDS_cramfs = "cramfs-native" IMAGE_DEPENDS_ext2 = "genext2fs-native" IMAGE_DEPENDS_ext2.gz = "genext2fs-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" +IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" EXTRA_IMAGEDEPENDS = "" ################################################################## @@ -313,7 +316,8 @@ export palmqtdir = "/opt/QtPalmtop" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" -GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source" +GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" +GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 6722addad7..4c3ff695f6 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -6,8 +6,9 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2006.9" +#DISTRO_VERSION = "2007.1" DISTRO_VERSION = "test-${DATE}" +DISTRO_REVISION = "3" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -16,6 +17,7 @@ DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" FEED_URIS += " \ + no-arch##${ANGSTROM_URI}/unstable/feed/all \ base##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/base \ perl##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/perl \ python##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/python \ @@ -26,9 +28,9 @@ FEED_URIS += " \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/updates" #SRCDATE = "20060630" -#SRCDATE_handhelds-pxa-2.6 = "20060622" -PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh5" -PREFERRED_VERSION_handhelds-pxa-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}" +#SRCDATE_linux-handhelds-2.6 = "20060622" +PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7" +PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}" PREFERRED_PROVIDER_hostap-modules_ipaq-pxa270 = "hostap-modules" @@ -36,11 +38,9 @@ PREFERRED_PROVIDER_hostap-modules_ipaq-pxa270 = "hostap-modules" SRCDATE_gconf-dbus = "20060719" SRCDATE_gnome-vfs-dbus = "20060803" -PREFERRED_VERSION_qemu-native = "0.8.2" - CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ -http://www.oesources.org/source/current/" +" # Opie #use 1337 mt version of opie to have a webbrowser @@ -112,9 +112,9 @@ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "ucli PREFERRED_VERSION_gcc ?= "4.1.1" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17" -PREFERRED_VERSION_binutils-cross ?= "2.17" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +PREFERRED_VERSION_binutils ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" @@ -139,20 +139,8 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" PREFERRED_VERSION_hostap-modules ?= "0.4.7" #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff -# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad - -#### Bootstrap options #### +# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad -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" @@ -161,20 +149,27 @@ PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" #EXTRA_STUFF_append_poodle = "altboot" #EXTRA_STUFF_append_tosa = "altboot" -### 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" +# 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", "", "tslib-tests tslib-calibrate gdb strace procps",d)}' + +#this should go away soon +EXTRA_STUFF ?= "" -#As soon as a kill switch is in place we can add it to devices with a keyboard -#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput" -#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" -#GPE_EXTRA_INSTALL_append_akita = " libgtkinput" -#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" +# Angstrom want to ship some extra stuff. This should be moved into task-base eventually +DISTRO_EXTRA_RDEPENDS = "\ + update-modules module-init-tools modutils-initscripts \ + sysvinit initscripts sysvinit-pidof \ + psplash \ + netbase dropbear \ + angstrom-version \ + ipkg ipkg-collateral \ + util-linux-mount util-linux-umount \ + ${EXTRA_STUFF} \ + ${DEBUG_APPS} \ + " diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf new file mode 100644 index 0000000000..03dcd22d79 --- /dev/null +++ b/conf/distro/celinux-test.conf @@ -0,0 +1,88 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: CELF Linux test +#@DESCRIPTION: A Linux Distribution for the CELF test project +#@-------------------------------------------------------------------- + +# +# core distro settings +# + +# we want IPKG packages and Debian style naming +INHERIT += " package_ipk debian" + +# enable if build for many machines +#INHERIT += " multimachine" + +# we want images supporting the following features (for task-base) +DISTRO_FEATURES = "nfs pcmcia usbhost" + +# enable if you want ltp in bootstrap images +#DISTRO_EXTRA_RDEPENDS = "ltp" + +DISTRO_VERSION = "${DATE}" + +# DISTRO_TYPE control behaviour of some recipes +# dropbear allow password-less root logins for "debug" +# kernel can be set to export logs to screen/serial +DISTRO_TYPE = "debug" +# DISTRO_TYPE = "release" + +# fixed SRCDATE for many packages +require conf/distro/include/sane-srcdates.inc + +# fix it to one date but allow to override in local.conf if needed +SRCDATE ?= "20060927" + +# +# toolchain +# +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}binutils:binutils-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" + +PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_binutils-cross = "2.16" + +PREFERRED_VERSION_gcc = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" + +PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" + +# glibc provides iconv and intl +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +# +# omap5912osk settings +# + +# use latest booting kernel but allow to override it in local.conf +PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18-omap1" + +# gcc 3.x use other -mtune name then gcc 4.x +TARGET_CC_ARCH_omap5912osk = "-march=armv5te -mtune=arm926ejs" + +# 2.6.18 kernel does not support pcmcia-cs ioctl() calls +PCMCIA_MANAGER = "pcmciautils" + +# +# target system settings +# +TARGET_OS = "linux" + +# use softfloat binaries to gain speed on ARM machines +TARGET_FPU_arm = "soft" + +# +# extra checking for needed tools +# + +# set minimal version of BitBake needed +BB_MIN_VERSION = "1.6.0" + +# check for required tools and minimal BitBake version +INHERIT += "sanity" diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf deleted file mode 100644 index 80fd25ae19..0000000000 --- a/conf/distro/generic-unstable.conf +++ /dev/null @@ -1,72 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Bleeding Edge -#@DESCRIPTION: An experimental distribution configuration -#@-------------------------------------------------------------------- - -# -# Header -# -DISTRO_NAME = "generic-unstable-glibc" -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" -#DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" - -# -# Naming schemes -# -PARALLEL_INSTALL_MODULES = "1" -INHERIT += "debian multimachine" - -# -# Packaging and output format -# -INHERIT += "package_ipk" -IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" - -# -# Binutils & Compiler -# -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" - -# -# Target OS & FPU system -# -TARGET_OS = "linux" -TARGET_FPU_arm = "soft" -TARGET_FPU_armeb = "soft" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_VERSION_glibc = "2.4" -PREFERRED_VERSION_glibc-intermediate = "2.4" - -# -# Bootstrap & Init -# -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 - -# -# Opie -# -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QTE = "yes" -require conf/distro/include/preferred-opie-versions.inc - -# -# Enlightenment -# -require conf/distro/include/preferred-e-versions.inc diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 08520f0dfe..3bb5df5496 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -29,17 +29,23 @@ INHERIT += "package_ipk" IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" # +# Kernel +# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +# # Binutils & Compiler # 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_gcc = "3.4.4" -PREFERRED_VERSION_gcc-cross = "3.4.4" -PREFERRED_VERSION_gcc-cross-initial = "3.4.4" -PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" -PREFERRED_VERSION_binutils = "2.15.94.0.1" +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +PREFERRED_VERSION_binutils ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" # # Target OS & FPU system @@ -49,7 +55,11 @@ TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" # # Bootstrap & Init diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 61d14407c8..6ee509759e 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -1,7 +1,7 @@ # glibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc ?= "glibc" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 0c5186c3a8..48915e6554 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -22,7 +22,7 @@ MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>" #use ipkg package format with debian style naming #use multimachine buildrules -INHERIT += "package_ipk debian multimachine" +INHERIT += "package_ipk debian multimachine sanity" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-native" diff --git a/conf/distro/include/preferred-x-versions-pre-X11R7.inc b/conf/distro/include/preferred-x-versions-pre-X11R7.inc deleted file mode 100644 index 240f2cddcd..0000000000 --- a/conf/distro/include/preferred-x-versions-pre-X11R7.inc +++ /dev/null @@ -1,44 +0,0 @@ -# -# Specify to build old/old CVS versions of X libraries and apps -# - -PREFERRED_VERSION_xproto = "0.0+cvs${SRCDATE}" - -PREFERRED_VERSION_diet-x11 = "6.2.1+cvs${SRCDATE}" -PREFERRED_VERSION_libice = "6.3.3" -PREFERRED_VERSION_libsm = "6.0.3" -PREFERRED_VERSION_libx11 = "6.2.1+cvs${SRCDATE}" -PREFERRED_VERSION_libxau = "0.1.1" -PREFERRED_VERSION_libxaw = "7.0.2" -PREFERRED_VERSION_libxcomposite = "1.0.1" -PREFERRED_VERSION_libxcursor = "1.1.2" -PREFERRED_VERSION_libxdamage = "1.0.1" -PREFERRED_VERSION_libxdmcp = "0.1.3" -PREFERRED_VERSION_libxext = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxfixes = "2.0.1" -PREFERRED_VERSION_libxfont = "1.4.2" -PREFERRED_VERSION_libxft = "2.1.6" -PREFERRED_VERSION_libxi = "6.0.1" -PREFERRED_VERSION_libxinerama = "1.0.2+cvs20050505" -PREFERRED_VERSION_libxkbfile = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxmu = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxp = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxpm = "3.5.1" -PREFERRED_VERSION_libxrandr = "1.0.2" -PREFERRED_VERSION_libxrender = "0.8.4" -PREFERRED_VERSION_libxres = "1.0.1" -PREFERRED_VERSION_libxss = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxt = "0.1.5" -PREFERRED_VERSION_libxtst = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxv = "2.2.2+cvs20040918" -PREFERRED_VERSION_libxxf86dga = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_libxxf86vm = "0.0+cvs${SRCDATE}" - -PREFERRED_VERSION_xcalibrate = "0.0+cvs20060312" -PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" - -PREFERRED_VERSION_xdpyinfo = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_xev = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_xhost = "0.0+cvs20040413" -PREFERRED_VERSION_xmodmap = "0.0+cvs${SRCDATE}" -PREFERRED_VERSION_xrandr = "0.0+cvs${SRCDATE}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index a1132209ad..d000bf4a92 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -59,7 +59,7 @@ SRCDATE_ipkg-link-1 ?= "20050930" SRCDATE_ipkg-utils ?= "20050930" SRCDATE_ipkg-utils-native ?= "20050930" SRCDATE_kaffe-qt ?= "20060814" -SRCDATE_kbdd ?= "20060814" +SRCDATE_kbdd ?= "20061019" SRCDATE_led ?= "20060814" SRCDATE_linux-input ?= "20060814" SRCDATE_madwifi-modules ?= "20060814" @@ -68,7 +68,7 @@ SRCDATE_minimo ?= "20050401" SRCDATE_mystun-server ?= "20060814" SRCDATE_olsrd ?= "20060814" SRCDATE_opencvs ?= "20060814" -SRCDATE_oprofile ?= "20060214" +SRCDATE_oprofile ?= "20061011" SRCDATE_portaudio ?= "20060814" SRCDATE_putty ?= "20060814" SRCDATE_python-cairo ?= "20060814" diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index b4dde3d0e2..1c76ef870b 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -12,7 +12,7 @@ # Bruno Randolf <bruno.randolf@4g-systems.biz> INHERIT += "package_ipk debian nylon-mirrors" -INHERIT += "linux_modules" +INHERIT += "linux-kernel-base" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index 4502422021..0c864db04f 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -9,8 +9,6 @@ TARGET_FPU ?= "soft" # 2.4 vs 2.6 is a distro decision. MODUTILS = "26" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - PREFERRED_PROVIDER_hotplug = "udev" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" @@ -22,16 +20,32 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +# Use current git until I can find a git tag that builds for omap5912osk +PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18+git" +#PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2" + #use EABI toolchain PREFERRED_VERSION_gcc ?= "4.1.1" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17" -PREFERRED_VERSION_binutils-cross ?= "2.17" +PREFERRED_VERSION_binutils ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" + +#PREFERRED_VERSION_gcc ?= "4.1.1" +#PREFERRED_VERSION_gcc-cross ?= "4.1.1" +#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +#PREFERRED_VERSION_binutils ?= "2.17" +#PREFERRED_VERSION_binutils-cross ?= "2.17" +#PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +#PREFERRED_VERSION_glibc ?= "2.4" +#PREFERRED_VERSION_glibc-intermediate ?= "2.4" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs pcmcia usbhost" +DISTRO_FEATURES = "nfs pcmcia usbhost alsa" + +PCMCIA_MANAGER = "pcmciautils" + diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 51922b8ad4..b1080d1fea 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -8,8 +8,7 @@ DISTRO_VERSION = ".dev-snapshot-${DATE}" 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 @@ -55,6 +54,11 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_VERSION_binutils-cross = "2.16" PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" +PREFERRED_VERSION_gcc = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" + # # Opie # diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 1395f09a7e..9d4fd4c338 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -1,11 +1,11 @@ #@TYPE: Distribution #@NAME: SharpROM #@DESCRIPTION: Distribution configuration for SharpROM (Zaurus) compatible packages -#@MENTOR: Michael 'Mickey' Lauer <mickey@Vanille.de> -#@REQUIREMENTS: A prebuilt SharpROM Embedix Toolchain in your PATH. +#@MENTOR: None +#@REQUIREMENTS: A prebuilt SharpROM Embedix Toolchain in /usr/local/arm/2.95.3 #@REQUIREMENTS: Rename arm-linux-gcc|g++ to arm-linux-gcc-2.95 and rename arm-linux-ld to arm-linux-ld-2.11.2. -INHERIT += " package_ipk debian sharprom" +INHERIT += " package_ipk debian" # # Zaurus @@ -17,23 +17,26 @@ TARGET_CC_ARCH = "-march=armv4" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O2" OEINCLUDELOGS = "yes" KERNEL_CONSOLE = "tty1" +# prebuilt toolchain doesn't now about -isystem +export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" +export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" #DEBUG_OPTIMIZATION = "-O -g3" #DEBUG_BUILD = "1" # # Base # -DISTRO = "sharprom" DISTRO_NAME = "SharpROM" DISTRO_VERSION = "3.1 compatible" DISTRO_TYPE = "debug" -ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95 binutils-cross gcc-cross-initial gcc-cross" -ASSUME_PROVIDED += "virtual/arm-linux-libc-for-gcc virtual/arm-linux-binutils virtual/arm-linux-gcc" -ASSUME_PROVIDED += "virtual/arm-linux-gcc-initial virtual/arm-linux-gcc-initial -ASSUME_PROVIDED += "virtual/libc linux-libc-headers" - -DEPENDS =+ "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/arm-linux-gcc-2.95 = "sharprom-toolchain-native" |