diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-20 12:47:59 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-20 12:47:59 +0400 |
| commit | 1f145b6b4187fbb451dde8c1a1e8c81bb691a672 (patch) | |
| tree | 08a7f737f4a360448c693908d89bf750e3a7d5e2 | |
| parent | bfec41f79e1177aa047eb46e376752cee969287a (diff) | |
| parent | cb70efeb71b3a1e5e8786d3488e4ec3a1580d45a (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
76 files changed, 2543 insertions, 764 deletions
diff --git a/classes/nylon-image.bbclass b/classes/nylon-image.bbclass index 6d867eab48..e973bf7cf5 100644 --- a/classes/nylon-image.bbclass +++ b/classes/nylon-image.bbclass @@ -9,11 +9,10 @@ nylon_create_imgz() { # copy the kernel (for mips on flash) into tmp FLASH_BIN=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin - test -f ${FLASH_BIN} && \ cp ${FLASH_BIN} ${DEPLOY_DIR_IMAGE}/tmp/zImage.flash # copy rootfs.jffs (or so) into tmp - cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/tmp/rootfs.${type} + cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/tmp/rootfs.jffs2 # make an imgz out of tmp ( cd ${DEPLOY_DIR_IMAGE}/tmp; tar cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.imgz * ) diff --git a/classes/nylon-mirrors.bbclass b/classes/nylon-mirrors.bbclass index 02fddc01ba..11cc45ca0c 100644 --- a/classes/nylon-mirrors.bbclass +++ b/classes/nylon-mirrors.bbclass @@ -1,6 +1,6 @@ MIRRORS_append () { -ftp://.*/.* http://meshcube.org/nylon/stable/sources/ -https?://.*/.* http://meshcube.org/nylon/stable/sources/ -ftp://.*/.* http://meshcube.org/nylon/unstable/sources/ -https?://.*/.* http://meshcube.org/nylon/unstable/sources/ +ftp://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/ +http://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/ +ftp://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/ +http://.*/.*/ http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/ }
\ No newline at end of file diff --git a/conf/checksums.ini b/conf/checksums.ini index 03624c2661..7d2ac2cb28 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3434,6 +3434,10 @@ sha256=73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21 md5=09b2019e926d5ef42d52edb2dd33ceae sha256=3fb7c11ec5d802338a0bf522b11702c37820597c9a2c36f89b52872c6571e602 +[http://pub.risujin.org/cellwriter/cellwriter-1.3.4.tar.gz] +md5=72b4e552a32d6acd888da0b88aeebbdd +sha256=6ab6fa697938af0fc8b587ccd7c5889087800569e558b97797963c6ee2fada0c + [http://centericq.de/archive/source/releases/centericq-4.11.0.tar.bz2] md5=bed5e7eeb60b5ac0045f201f13130964 sha256=4f0f769a6e1cc7d76b527829deef34861ed8f79ae07e29d49566df3594308380 @@ -8190,6 +8194,10 @@ sha256=e8ee6534bd142ee0ed55134a5eb95f6e7f4b8640df2d3669ebd202f6d82f9a0d md5=d4c9de56f77f5cd86ac67ab53e027181 sha256=8823fe08890b287684c3c16fe06d1be4a3c299bd8bcd9a5ca49063ce8a88a9ef +[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.9.5.tar.gz] +md5=02d01f1cca7ff3af511c59198f3c35a7 +sha256=4cefb2afa08d8e75c1273980e2cad0e13f4b872e2f90019f1ac0d75ec9fa41b7 + [http://www.packagekit.org/releases/gnome-packagekit-0.2.3.tar.gz] md5=eb12e6eea8413d35c033aedee61b89ee sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0 @@ -9402,6 +9410,10 @@ sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c md5=7f4e11d04e369391de27fca82ee60f11 sha256=300a3151efbd984fe51e7c230ae419efd197fa2aaa6b8791188aeab3917a505c +[http://downloads.sourceforge.net/granule/granule-1.4.0-7.tar.gz] +md5=4e327db531133ffeb650392042341443 +sha256=356463f586b8b6147a05ab00ca8b5e7f8f85d2ec3981fbb9c0c0c2e2da6f58c9 + [http://grass.osgeo.org/grass62/source/grass-6.2.3.tar.gz] md5=75c8832f90e445ff361d767c8a2c3ece sha256=a172d233fcbfc7f2c2de01af1f6fc7828e46867785dcaf861cf87238775e4a61 @@ -11410,6 +11422,14 @@ sha256=c272560f5c11fe45b011c4e26ada66218fb0109d5582c5876aa49c5e24718534 md5=cd1eb1ce62a52cf69f4df9041a886794 sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576 +[http://clayo.org/kanatest/kanatest-0.4.8.tar.gz] +md5=b97b0521314f634e454354cb7ba2013d +sha256=a31682604bc6db9c0cb2e15429b8a5b64c04f1ed96df912cab71d4337567c513 + +[ftp://ftp.debian.org/debian/pool/main/k/kanatest/kanatest_0.3.6.orig.tar.gz] +md5=cd1eb1ce62a52cf69f4df9041a886794 +sha256=559c3d5e9336a56c9f83fcece75ab5211e62a1a868b3a6f539e9b7bd15f46576 + [http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz] md5=bdfe75534322840b3ff566e0a91c472d sha256=28272f61ec09c607a3578e3626e9e4fd43d1d9d1e21cb64328745766d00ee9e1 @@ -22642,6 +22662,10 @@ sha256=efcda677be7ef093757d965736dff3b5af8c9fd36b3e7d3db09289a4a1d5d013 md5=17f91175a32827e9c9f45dc7a20a0c2b sha256=6ae8157bbec2b36957bbee6895b4cd3f82406fa90fa7d597235c58ea19307be7 +[http://kernel.org/pub/software/network/tftp/tftp-hpa-5.0.tar.bz2] +md5=28beef704a4ef62bc2dead005198ef4c +sha256=96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734 + [http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz] md5=190f08ce6839aecb0fa0ce8d5ddd09ee sha256=b32f3d71ac540248b7643baa39d8ecfb75af493228caaeb64608e49f2f092473 diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a11c1d5691..3b7905c284 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -11,6 +11,7 @@ PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.16.0" PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_hal = "0.5.12" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.11" @@ -24,6 +25,6 @@ PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" -PREFERRED_VERSION_udev = "124" +PREFERRED_VERSION_udev = "141" PREFERRED_VERSION_wpa-supplicant = "0.6.7" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 1be3dabc2b..15a8c00127 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,8 +46,8 @@ SRCDATE_waimea ?= "20060814" SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" -SRCDATE_yamonenv ?= "20060814" -SRCDATE_zaurusd ?= "20060628" +SRCDATE_yamonenv ?= "20051022" +SRCDATE_zaurusd ?= "20090501" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index f1f04e5e6a..c05676cb50 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -13,7 +13,7 @@ DISTRO_NAME ?= "minimal" DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" #DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" +DISTRO_TYPE ?= "debug" # Ensure some form of release config, so error out if someone thinks he knows better DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 3670f725de..99cab2bcbb 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -1,40 +1,73 @@ +############################################################################# #@TYPE: Distribution #@NAME: Nylon Linux #@DESCRIPTION: Distribution configuration for Nylon Mesh Linux distribution +############################################################################# -# this distribution is mainly for wireless networking devices and includes -# packages necessary for wireless LAN access point, routing, encryption and -# especially mesh routing applications -# -# it is primarily aimed at the 4G Systems MeshCube (mtx-1) and other -# mipsel based platforms -# -# Bruno Randolf <bruno.randolf@4g-systems.biz> +require conf/distro/angstrom-2008.1.conf -TARGET_OS = "linux" +############################################################################# +# NAME and VERSION +############################################################################# +DISTRO_NAME = "nylon" +DISTRO = ${DISTRO_NAME} +DISTRO_VERSION = "${NYLON_VERSION}" +BUILDNAME := "${NYLON_VERSION}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" +TARGET_FPU = "soft" +SRCDATE := "20050527" +TARGET_VENDOR = "-nylon" + +# Ensure some form of release config, so error out if someone thinks he knows better +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") + +############################################################################# +# PACKAGING +############################################################################# +# Chose the packaging system +INHERIT += "nylon-mirrors" +IMAGE_FSTYPES ?= "tar.gz jffs2" + +############################################################################# +# IMAGES +############################################################################# +# Name the generated images in a sane way +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" +KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" -INHERIT += "package_ipk debian nylon-mirrors" -INHERIT += "linux-kernel-base" +############################################################################# +# KERNEL +############################################################################# +KERNEL = "kernel24" +MACHINE_KERNEL_VERSION = "2.4" -LIBC = "glibc" -require conf/distro/include/${LIBC}.inc -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/libx11:diet-x11" -PREFERRED_PROVIDERS += " python:python-curses" -PREFERRED_PROVIDER_classpath = "classpath-minimal" +############################################################################# +# TOOLCHAIN +############################################################################# +fixedCxxflags = "${@bb.data.getVar('CXXFLAGS', d, 1).replace('-fvisibility-inlines-hidden','')}" +CXXFLAGS := ${fixedCxxflags} -TARGET_FPU = "soft" +# we're not supporting pcmcia right now +DISTRO_FEATURES = "nfs smbfs wifi pcmcia ppp ext2 vfat usbhost pci" -SRCDATE := "20050527" +# FIXME: cannot build linux-libc-headers unless this is set. +IPKGBUILDCMD = "stage-manager-ipkg-build -o 0 -g 0" +############################################################################# +# PREFERRED VERSIONS +############################################################################# +PREFERRED_VERSION_busybox = "1.7.2" PREFERRED_VERSION_glibc = "2.3.3" +PREFERRED_VERSION_glibc-initial = "2.3.2" PREFERRED_VERSION_shorewall = "2.0.9-monolithic" PREFERRED_VERSION_ppp-dsl = "0.1-monolithic" -PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20060223" +PREFERRED_VERSION_mtd-utils = "1.0.0+git" PREFERRED_VERSION_kismet = "2005-01-R1" +PREFERRED_VERSION_automake-native = "1.10" +PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_netperf = "2.3" +PREFERRED_PROVIDER_hotplug = "linux-hotplug" PREFERRED_VERSION_gcc-cross-initial = "3.3.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4" @@ -45,67 +78,8 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7" PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_linux-libc-headers = "2.6.18" - PREFERRED_VERSION_prism54-firmware = "1.0.3.0" - -KERNEL_VERSION_mtx-1 = "2.4.27" -KERNEL_VERSION_mtx-2 = "2.4.27" - -#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc_mtx-3 = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3 = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.16.91.0.7" -### falling back to: -PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1" -PREFERRED_VERSION_binutils_mtx-3 = "2.16" +#PREFERRED_VERSION_udev = "089" +PREFERRED_VERSION_udev = "100" PREFERRED_VERSION_madwifi-modules = "0.9.3" PREFERRED_VERSION_madwifi-tools = "0.9.3" - -PREFERRED_VERSION_udev = "089" - -KERNEL_VERSION_mtx-3 = "2.6.15.4" -PREFERRED_PROVIDER_virtual/kernel_mtx-3a = "linux-mtx-3a" - - -#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc_mtx-3a = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3a = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.16.91.0.7" -### falling back to: -PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1" -PREFERRED_VERSION_binutils_mtx-3a = "2.16" - -PREFERRED_VERSION_udev = "100" - -KERNEL_VERSION_mtx-3a = "2.6.16.6" - - -# usually overrrided from local.conf -NYLON_RELEASE = "unstable" - -# use meshcub.org mirrors for CVS sources -CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/" - -export FEED_URIS = " \ - nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed \ - nylon-bin##http://meshcube.org/nylon/${NYLON_RELEASE}/binary-feed" - -# image names -DISTRO_VERSION = "${NYLON_VERSION}" -BUILDNAME := "${NYLON_VERSION}" -#this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')} -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" -KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" - diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf index 5131488577..b83cca5487 100644 --- a/conf/machine/dm355-leopard.conf +++ b/conf/machine/dm355-leopard.conf @@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_u-boot = "1.2.0" -UBOOT_MACHINE = "dm355_leopard_config" +UBOOT_MACHINE = "davinci_leopard_config" UBOOT_ENTRYPOINT = "0x80008000" SERIAL_CONSOLE ?= "115200 ttyS0" diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf index 33a69f45b3..7db19696fa 100644 --- a/conf/machine/mtx-1.conf +++ b/conf/machine/mtx-1.conf @@ -6,6 +6,8 @@ TARGET_ARCH = "mipsel" PACKAGE_ARCHS = "all mipsel ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1" +KERNEL_VERSION_mtx-1 = "2.4.27" +MACHINE_FEATURES = "kernel24 usbhost vfat" # md: is the --pad=.. necessary? I believe not. # EXTRA_IMAGECMD_jffs2 = "--pad=0x1c00000 --little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/mtx-2.conf b/conf/machine/mtx-2.conf index 438c1fed79..67cc5bf185 100644 --- a/conf/machine/mtx-2.conf +++ b/conf/machine/mtx-2.conf @@ -6,6 +6,8 @@ TARGET_ARCH = "mipsel" PACKAGE_ARCHS = "all mipsel ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-2" +KERNEL_VERSION_mtx-2 = "2.4.27" +MACHINE_FEATURES = "kernel24 usbhost vfat" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf index d6d14d86df..f6e9e8aad5 100644 --- a/conf/machine/mtx-3.conf +++ b/< |