diff options
88 files changed, 2929 insertions, 535 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 8a189c7fb4..97fed90f21 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -709,11 +709,6 @@ PREFERRED_VERSION_imlib ?= "1.9.15" PREFERRED_VERSION_imlib2 ?= "1.4.0.002" PREFERRED_VERSION_imposter ?= "0.3" PREFERRED_VERSION_inetutils ?= "1.4.2" -PREFERRED_VERSION_initramfs-jffs2 ?= "0.1" -PREFERRED_VERSION_initramfs-module-block ?= "0.1" -PREFERRED_VERSION_initramfs-module-loop ?= "0.1" -PREFERRED_VERSION_initramfs-module-nfs ?= "0.1" -PREFERRED_VERSION_initramfs-uniboot ?= "0.2" PREFERRED_VERSION_initscripts ?= "1.0" PREFERRED_VERSION_initscripts-openprotium ?= "1.0" PREFERRED_VERSION_initscripts-slugos ?= "1.0" @@ -1659,6 +1654,7 @@ PREFERRED_VERSION_rfakeap ?= "0.2" PREFERRED_VERSION_rglueap ?= "0.1" PREFERRED_VERSION_rhythmbox ?= "0.8.7" PREFERRED_VERSION_rlpr ?= "2.05" +PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0" PREFERRED_VERSION_rott ?= "1.0" PREFERRED_VERSION_rox-filer ?= "2.5" PREFERRED_VERSION_rp-pppoe ?= "3.8" @@ -2126,7 +2122,7 @@ PREFERRED_VERSION_zmerlin ?= "0.9.1" PREFERRED_VERSION_zope ?= "3.3.1" PREFERRED_VERSION_zrally ?= "0.90" PREFERRED_VERSION_zrev7 ?= "1.0.1" -PREFERRED_VERSION_zroadmap ?= "1.0.12" +PREFERRED_VERSION_zroadmap ?= "1.1.0" PREFERRED_VERSION_zsafe ?= "2.1.3" PREFERRED_VERSION_zsh ?= "4.1.1" PREFERRED_VERSION_zshopi ?= "0.2" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index b3b47093b7..8f82eb4611 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -148,7 +148,6 @@ SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" SRCDATE_yamonenv ?= "20060814" -SRCDATE_zroadmap ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ab80719646..177a0edfe8 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.7" +SLUGOS_VERSION = "4.8" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index fb117d6c11..c7e70fa169 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -36,8 +36,8 @@ for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle i do BUILD_MACHINE=$machine BUILD_CLEAN="libtool-cross qmake-native qmake2-native" - BUILD_TARGETS="texinfo flex bison gcc binutils automake autoconf m4 pkgconfig \ - task-proper-tools mc screen emacs \ + BUILD_TARGETS="texinfo flex bison gperf gcc binutils automake autoconf m4 pkgconfig \ + task-proper-tools mc screen \ mono perl python ruby \ gtk+ qt-x11-free qt4-x11-free \ gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \ @@ -52,7 +52,7 @@ do abiword gnumeric evince epdfview gimp \ flite \ ctorrent \ - gnuplot octave fftw fftwf fftwl \ + gnuplot mpfr gmp fftw fftwf fftwl \ gphoto2 gqview imagemagick ufraw \ tzdata \ " diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index e1e803fcdc..3c0bda25fe 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -55,7 +55,7 @@ for machine in ixp4xxle ixp4xxbe do BUILD_CLEAN="base-files" BUILD_MACHINE=$machine - BUILD_TARGETS="base-image nslu2-base-image" + BUILD_TARGETS="base-image nslu2-base-image nas-server-image" do_build done diff --git a/contrib/deploy/.mtn2git_empty b/contrib/deploy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/contrib/deploy/.mtn2git_empty diff --git a/contrib/deploy/README b/contrib/deploy/README new file mode 100644 index 0000000000..a285a7f75a --- /dev/null +++ b/contrib/deploy/README @@ -0,0 +1,2 @@ +This directory contains script for deploying OE-generated images for various +devices and boot methods. diff --git a/contrib/deploy/nfs/.mtn2git_empty b/contrib/deploy/nfs/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/contrib/deploy/nfs/.mtn2git_empty diff --git a/contrib/deploy/nfs/exports.sample b/contrib/deploy/nfs/exports.sample new file mode 100644 index 0000000000..6d82f49202 --- /dev/null +++ b/contrib/deploy/nfs/exports.sample @@ -0,0 +1,2 @@ +# /etc/exports: NFS file systems being exported. See exports(5). +/srv/nfs/oe 192.168.0.0/16(rw,insecure,no_root_squash) diff --git a/contrib/deploy/nfs/oe-nfs-deploy-image b/contrib/deploy/nfs/oe-nfs-deploy-image new file mode 100755 index 0000000000..ee540696d7 --- /dev/null +++ b/contrib/deploy/nfs/oe-nfs-deploy-image @@ -0,0 +1,51 @@ +#!/bin/sh + +# Wonder what the heck is /srv ? Read Filesystem Hierarchy Standard, +# http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM +# So, /srv/nfs is root of all NFS exports your system offers, and /srv/nfs/oe is +# OpenEmbedded's subset (think security). +NFS_ROOT=/srv/nfs/oe + +if [ -z "$1" ]; then + echo "$0 - Deploy OpenEmbedded-generated image for device NFS boot" + echo "Usage: $0 <image> | -l" + exit +fi + +if [ "$1" == "-l" ]; then + if [ -n "$2" ]; then + extra="-name *$2*" + fi + find tmp/deploy/ -regextype posix-extended -wholename '*/images/*' -regex '.+\.(tar\.bz2|tar\.gz|cpio\.gz)$' $extra | xargs ls -l + exit +fi + +if [ ! -f $1 ]; then + echo "Cannot find image $1" + exit +fi + +ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'` +basename=`basename $1 .$ext` + +if [ -z "$basename" ]; then + echo "Assertion failed" + exit 100 +fi + +echo "Deploying to: $NFS_ROOT/$basename" + +rm -rf $NFS_ROOT/$basename + +mkdir -p $NFS_ROOT/$basename + +if [ "$ext" == "tar.bz2" ]; then + tar -xj -f $1 -C $NFS_ROOT/$basename +elif [ "$ext" == "tar.gz" ]; then + tar -xz -f $1 -C $NFS_ROOT/$basename +else + FPATH=`pwd` + cd $NFS_ROOT/$basename + bash -c "gzip -d -c $FPATH/$1 | cpio -i --no-absolute-filenames" + cd $FPATH +fi diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb index cc3d08972f..036f1af75a 100644 --- a/packages/angstrom/angstrom-gpe-task-base.bb +++ b/packages/angstrom/angstrom-gpe-task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r33" +PR = "r34" inherit task @@ -8,6 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" RDEPENDS_${PN} = "\ matchbox \ matchbox-panel-hacks \ + matchbox-applet-startup-monitor \ xcursor-transparent-theme \ rxvt-unicode \ gpe-terminal \ diff --git a/packages/apex/apex-env_1.5.13.bb b/packages/apex/apex-env_1.5.13.bb new file mode 100644 index 0000000000..aad0b12af9 --- /dev/null +++ b/packages/apex/apex-env_1.5.13.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "APEX Boot Loader Environment User Modification Tool" +SECTION = "util" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://find-apex-partition.patch;patch=1 \ + " +S = ${WORKDIR}/apex-${PV}/usr + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" + make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" +} + +do_install() { + ${STRIP} ${S}/apex-env + install -d ${D}/${sbindir} + install -m 755 ${S}/apex-env ${D}/${sbindir} +} diff --git a/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty b/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty diff --git a/packages/apex/apex-nslu2-1.5.13/defconfig b/packages/apex/apex-nslu2-1.5.13/defconfig new file mode 100644 index 0000000000..91517025bf --- /dev/null +++ b/packages/apex/apex-nslu2-1.5.13/defconfig @@ -0,0 +1,164 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: +# Mon Dec 24 14:54:47 2007 +# +CONFIG_ARM=y +CONFIG_CPU_ARMV5=y +CONFIG_CPU_XSCALE=y +# CONFIG_ARCH_LH7952X is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_IXP42X=y +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_MX3 is not set +CONFIG_EXPERIMENTAL=y +# CONFIG_SMALL is not set + +# +# General Setup +# +CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2 (bigendian)" +CONFIG_CROSS_COMPILE="" +CONFIG_AEABI=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set +# CONFIG_CC_NO_OPTIMIZATION is not set +CONFIG_STARTUP_UART=y +# CONFIG_DEBUG_LL is not set +CONFIG_SPINNER=y +CONFIG_ATAG=y +CONFIG_MMU=y +# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set +CONFIG_DISABLE_MMU_AT_BOOT=y +# CONFIG_INTERRUPTS is not set +CONFIG_SDRAMBOOT_REPORT=y +CONFIG_STACK_SIZE=0x1000 +CONFIG_STACKLIMIT=y +# CONFIG_BOOTSTRAP_MEMTEST is not set +CONFIG_ATAG_PHYS=0x00000100 +CONFIG_ARCH_NUMBER=597 +CONFIG_APEX_VMA=0x00200000 +CONFIG_KERNEL_LMA=0x00008000 +# CONFIG_USE_RAMDISK is not set +CONFIG_SDRAM_BANK0=y +# CONFIG_SDRAM_BANK1 is not set +CONFIG_NOR_BUSWIDTH=16 +CONFIG_NOR_BANK0=y +CONFIG_NOR_BANK0_START=0x50000000 +CONFIG_NOR_BANK0_LENGTH=0x00800000 +CONFIG_MACH="ixp42x" +CONFIG_MACH_NSLU2=y +# CONFIG_MACH_NAS100D is not set +# CONFIG_MACH_DSMG600 is not set +# CONFIG_MACH_FSG3 is not set +# CONFIG_MACH_AVILA2347 is not set +# CONFIG_USER_DEFAULTENDIAN is not set +# CONFIG_USER_BIGENDIAN is not set +# CONFIG_USER_LITTLEENDIAN is not set + +# +# Platform Setup +# +CONFIG_SDRAM_BANK_LENGTH=0x02000000 +# CONFIG_DISABLE_SECOND_UART_INIT is not set +CONFIG_ARCH_IXP420=y + +# +# Commands +# +CONFIG_ALLHELP=y +CONFIG_ALPHABETIZE_COMMANDS=y +CONFIG_DEL_IS_BS=y +CONFIG_ANSI_KEYS=y +CONFIG_COMMAND_HISTORY=y +CONFIG_COMMAND_EDITING=y +# CONFIG_TIME_COMMANDS is not set +CONFIG_CMD_ALIAS=y +CONFIG_CMD_CHECKSUM=y +CONFIG_CMD_COPY=y +CONFIG_CMD_COMPARE=y +CONFIG_CMD_DRVINFO=y +CONFIG_CMD_DUMP=y +CONFIG_CMD_ENV=y +CONFIG_CMD_SETENV=y +CONFIG_CMD_ERASE=y +CONFIG_CMD_FILL=y +CONFIG_CMD_GO=y +CONFIG_CMD_INFO=y +# CONFIG_CMD_PAUSE is not set +CONFIG_CMD_WAIT=y +CONFIG_CMD_XRECEIVE=y +CONFIG_CMD_MEMLIMIT=y +CONFIG_CMD_MEMSCAN=y +CONFIG_CMD_MEMTEST=y + +# +# Generic Drivers +# +# CONFIG_DRIVER_FAT is not set +# CONFIG_DRIVER_EXT2 is not set +# CONFIG_DRIVER_JFFS2 is not set +CONFIG_DRIVER_ |