diff options
22 files changed, 89 insertions, 92 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index e8fca61fb2..67a3a4fa10 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -35,9 +35,9 @@ python () { } # -# Get a list of files containing device tables to create. +# Get a list of files containing tables of devices to be created. # * IMAGE_DEVICE_TABLE is the old name to an absolute path to a device table file -# * IMAGE_DEVICE_TABLES is a new name for a file, or list of files, seached +# * IMAGE_DEVICE_TABLES is a new name for a file, or list of files, searched # for in the BBPATH # If neither are specified then the default name of files/device_table-minimal.txt # is searched for in the BBPATH (same as the old version.) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 28e04ea204..6c12004dad 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -65,21 +65,21 @@ kernel_do_compile() { fi } +INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" +INITRAMFS_IMAGE_TARGET ?= "initramfs-image" + do_builtin_initramfs() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - cp "${INITRAMFS_LOC}" usr/initramfs_data.cpio.gz + cp "${DEPLOY_DIR_IMAME}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" install -d ${DEPLOY_DIR_IMAGE} - mv ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.no-initramfs.bin - install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin + install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-initramfs.bin # Make sure to kill injected initramfs, in case someone will do "-c compile -f" rm usr/initramfs_data.cpio.gz - - [ -n "${DEPLOY_TO}" ] && install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_TO} } addtask builtin_initramfs after do_compile -# As it accepts external parameter(s), better make it unstamped do_builtin_initramfs[nostamp] = "1" +do_builtin_initramfs[depends] = "${INITRAMFS_IMAGE_TARGET}:do_rootfs" kernel_do_stage() { ASMDIR=`readlink include/asm` diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index e795395534..a55b75cd89 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -24,12 +24,15 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" +# Ship complete set of modules ('kernel-modules') for easier debug purposes MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules \ + kernel-module-h5400-lcd \ kernel-module-h5400-battery \ kernel-module-h5400-bt \ kernel-module-snd-soc-h5000 \ - kernel-module-i2c-pxa" + kernel-module-i2c-pxa \ + at76c503a-modules" # # Modules autoload and other boot properties diff --git a/packages/anki/anki_0.4.3.bb b/packages/anki/anki_0.4.3.bb index e4878645d8..f3a62f3323 100644 --- a/packages/anki/anki_0.4.3.bb +++ b/packages/anki/anki_0.4.3.bb @@ -1,9 +1,9 @@ require anki.inc RDEPENDS += "libanki" -PR = "r0" +PR = "r1" -#export PV="${PV}" +export PV := "${PV}" SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch;patch=1" S = "${WORKDIR}/anki-${PV}" diff --git a/packages/at76c503a/at76c503a-modules_0.17.bb b/packages/at76c503a/at76c503a-modules_0.17.bb new file mode 100644 index 0000000000..affffa39ef --- /dev/null +++ b/packages/at76c503a/at76c503a-modules_0.17.bb @@ -0,0 +1,19 @@ +SECTION = "base" +LICENSE = "GPL" + +SRCDATE = "20080116" + +SRC_URI = "http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz" +S = "${WORKDIR}/at76_usb-${PV}/" + +inherit module + +MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \ + at76c505-rfmd at76c503-i3863 at76c505-rfmd2958" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ + for i in *${KERNEL_OBJECT_SUFFIX}; do + install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ + done +} diff --git a/packages/busybox/busybox-1.9.1/adduser-longops.patch b/packages/busybox/busybox-1.9.1/adduser-longops.patch index cb615c381e..f221d30895 100644 --- a/packages/busybox/busybox-1.9.1/adduser-longops.patch +++ b/packages/busybox/busybox-1.9.1/adduser-longops.patch @@ -1,3 +1,7 @@ +upstream: http://bugs.busybox.net/view.php?id=2134 +status: accepted in rev. 21031 on Feb 15 2008 +comment: fixes OE bug 3781, applied by mickeyl + diff -Nuar busybox-1.9.1.old/loginutils/Config.in busybox-1.9.1/loginutils/Config.in --- busybox-1.9.1.old/loginutils/Config.in Tue Feb 12 10:03:11 2008 +++ busybox-1.9.1/loginutils/Config.in Thu Feb 14 11:48:31 2008 diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb index 15a25c9c6a..dea9f14d9a 100644 --- a/packages/gcc/gcc_4.2.2.bb +++ b/packages/gcc/gcc_4.2.2.bb @@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://602-sdk-libstdc++-includes.patch;patch=1 \ file://740-sh-pr24836.patch;patch=1 \ file://800-arm-bigendian.patch;patch=1 \ + file://801-arm-bigendian-eabi.patch;patch=1 \ file://904-flatten-switch-stmt-00.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ diff --git a/packages/initrdscripts/devimage_0.1.bb b/packages/initrdscripts/devimage_0.1.bb index c671f38025..0622dd0330 100644 --- a/packages/initrdscripts/devimage_0.1.bb +++ b/packages/initrdscripts/devimage_0.1.bb @@ -1,12 +1,14 @@ DESCRIPTION = "Set of files to initialize bare system suitable for kernel, etc. testing." SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key" -PR = "r3" +PR = "r4" do_install() { - install -m 0755 ${WORKDIR}/devimage.sh ${D}/init install -d ${D}/etc/dropbear + install -d ${D}/sbin + install -m 0755 ${WORKDIR}/devimage.sh ${D}/init install -m 0600 ${WORKDIR}/dropbear_rsa_host_key ${D}/etc/dropbear/ install -m 0644 ${WORKDIR}/passwd ${D}/etc/ + ln -s /init ${D}/sbin/init } -FILES_${PN} += " /init /etc/*" +FILES_${PN} += " /init /etc/* /sbin/*" diff --git a/packages/initrdscripts/files/10-initfs.sh b/packages/initrdscripts/files/10-initfs.sh index bad649e5c2..c2a843eb12 100644 --- a/packages/initrdscripts/files/10-initfs.sh +++ b/packages/initrdscripts/files/10-initfs.sh @@ -3,3 +3,4 @@ modprobe -q vfat >/dev/null 2>&1 modprobe -q ext2 >/dev/null 2>&1 modprobe -q ext3 >/dev/null 2>&1 +modprobe -q jffs2 >/dev/null 2>&1 diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index d54a643807..3f3b8c7079 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -95,6 +95,7 @@ while read maj min nblk dev; do done < /proc/partitions add_menu_item "NFS (nfsroot=192.168.2.200:/srv/nfs/oe/image)" +add_menu_item "Shell" total=`echo -e $list | wc -l` num=0 @@ -142,8 +143,11 @@ echo Selected: $sel dev=`expr "$sel" : '\([^ /]*\)'` path=`expr "$sel" : '[^/]*\([^ ]*\).*'` +fstype=`expr "$sel" : '[^ ]* *\(.*\)'` -if [ "$dev" == "NFS" ]; then +if [ "$dev" == "Shell" ]; then + exec /bin/sh +elif [ "$dev" == "NFS" ]; then ROOT_DEVICE="/dev/nfs" CMDLINE="$CMDLINE root=/dev/nfs nfsroot=192.168.2.200:/srv/nfs/oe/image" elif [ -n "$path" ]; then @@ -151,6 +155,10 @@ elif [ -n "$path" ]; then CMDLINE="$CMDLINE root=/dev/loop looproot=/dev/$dev:$path" else ROOT_DEVICE="/dev/$dev" + # jffs2 is not recognized by mount automagically + if [ "$fstype" == "(jffs2)" ]; then + ROOT_FSTYPE="jffs2" + fi CMDLINE="$CMDLINE root=$ROOT_DEVICE" fi diff --git a/packages/initrdscripts/files/85-blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh index 567f7e29b3..e1c3ed893e 100644 --- a/packages/initrdscripts/files/85-blockboot.sh +++ b/packages/initrdscripts/files/85-blockboot.sh @@ -3,6 +3,10 @@ if [ -e "$ROOT_DEVICE" ]; then echo "booting from: $ROOT_DEVICE" - mount "$ROOT_DEVICE" /mnt + type="" + if [ -n "$ROOT_FSTYPE" ]; then + type="-t $ROOT_FSTYPE" + fi + mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device" BOOT_ROOT=/mnt fi diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index f8d5de9173..8b9fe12429 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -8,6 +8,7 @@ early_setup() { mkdir /proc mount -t proc proc /proc mkdir /mnt + modprobe -q mtdblock } dev_setup() @@ -30,6 +31,8 @@ read_args() { case $arg in root=*) ROOT_DEVICE=$optarg ;; + rootfstype=*) + ROOT_FSTYPE=$optarg ;; rootdelay=*) rootdelay=$optarg ;; esac @@ -48,13 +51,13 @@ boot_root() { exec switch_root -c /dev/console $BOOT_ROOT /sbin/init } -boot_failed() { - echo "No valid root device was specified. Please add root=/dev/something to" - echo "the kernel command-line and try again." +fatal() { + echo $1 echo exec sh } + echo "Starting initramfs boot..." early_setup read_args @@ -68,4 +71,5 @@ dev_setup load_modules [ -n "$BOOT_ROOT" ] && boot_root -boot_failed + +fatal "No valid root device was specified. Please add root=/dev/something to the kernel command-line and try again." diff --git a/packages/initrdscripts/initramfs-image-ipk_1.0.bb b/packages/initrdscripts/initramfs-image-ipk_1.0.bb deleted file mode 100644 index 8c79c24478..0000000000 --- a/packages/initrdscripts/initramfs-image-ipk_1.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Boot initramfs as a package" -PR = "r1" - -do_compile() { - cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${D}/boot/initramfs.bin bitbake initramfs-image -} - -do_install() { - install -d ${D}/boot/ - cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${D}/boot/initramfs.bin bitbake initramfs-image -c deploy_to -} - -FILES_${PN} += "/boot/*" - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb index 72812a2490..b4b2d43150 100644 --- a/packages/initrdscripts/initramfs-module-block_1.0.bb +++ b/packages/initrdscripts/initramfs-module-block_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh" -PR = "r1" +PR = "r3" RDEPENDS = "initramfs-uniboot" DESCRIPTION = "An initramfs module for booting off normal block devices." diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index 8b9a49f40b..8c66521f30 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r9" +PR = "r11" DESCRIPTION = "An initramfs module with UI for selection of boot device." RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs" # For VFAT mounting. diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb index 64bba4a304..2c2ec07bf5 100644 --- a/packages/initrdscripts/initramfs-module-initfs_1.0.bb +++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://10-initfs.sh" -PR = "r2" +PR = "r4" DESCRIPTION = "An initramfs module for initializing filesystems." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-vfat kernel-module-ext2" diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb index 167ce71ffe..e0f726582e 100644 --- a/packages/initrdscripts/initramfs-uniboot_1.0.bb +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,6 +1,7 @@ SRC_URI = "file://init.sh" -PR = "r2" +PR = "r4" DESCRIPTON = "A modular initramfs init script system." +RRECOMMENDS = "kernel-module-mtdblock" do_install() { install -m 0755 ${WORKDIR}/init.sh ${D}/init diff --git a/packages/initrdscripts/kernel-initramfs_1.0.bb b/packages/initrdscripts/kernel-initramfs_1.0.bb deleted file mode 100644 index be1c067ba2..0000000000 --- a/packages/initrdscripts/kernel-initramfs_1.0.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "A kernel with internal initramfs" -PR = "r1" - -#inherit kernel -KERNEL_IMAGETYPE ?= "zImage" - -# Name of initramfs recipe to build and put result into kernel -KERNEL_INITRAMFS ?= "initramfs-image" - -do_compile() { - cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${WORKDIR}/initramfs.bin bitbake ${KERNEL_INITRAMFS} -c deploy_to - cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} INITRAMFS_LOC=${WORKDIR}/initramfs.bin DEPLOY_TO=${WORKDIR}/\${KERNEL_IMAGE_BASE_NAME} bitbake virtual/kernel -c builtin_initramfs -} - -do_install() { - install -d ${D}/boot/ - install -m 644 ${WORKDIR}/${KERNEL_IMAGETYPE}* ${D}/boot/${KERNEL_IMAGETYPE}-${@get_pv(d)} -} - -def get_version(d): - import bb - import os - dest = bb.data.getVar("WORKDIR", d, 1) - try: - files = os.listdir(dest) - files = filter(lambda f:f.startswith("zImage-"), files) - ver = files[0][len("zImage-"):] - return ver - except: - return "dum-m-y" - -def get_pv(d): - ver = get_version(d) - verc = ver.split("-") - return verc[0] + "-" + verc[1] - -def get_pr(d): - ver = get_version(d) - verc = ver.split("-") - return verc[2] - -PACKAGES = "kernel-image" -FILES_kernel-image = "/boot/*" -PKG_kernel-image = "kernel-image-${@get_pv(d)}" -PKGPV_kernel-image = "${@get_pv(d)}" -PKGPR_kernel-image = "${@get_pr(d)}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/lighttpd/lighttpd/src-server.c.patch b/packages/lighttpd/lighttpd/src-server.c.patch index 6ca0c9ea40..dbf614b2bd 100644 --- a/packages/lighttpd/lighttpd/src-server.c.patch +++ b/packages/lighttpd/lighttpd/src-server.c.patch @@ -1,3 +1,6 @@ +upstream: http://trac.lighttpd.net/trac/ticket/1402 +status: pending + --- lighttpd/src/server.c.orig 2006-03-04 09:12:17.000000000 -0800 +++ lighttpd/src/server.c 2006-07-11 09:16:28.000000000 -0700 @@ -1174,8 +1174,8 @@ diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 81af72e413..a0aec9cb36 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -88,20 +88,27 @@ set cmdline "root=/dev/mmcblk0p2 rootdelay=10 console=ttyS0,115200n8 console=tty ## Choice 2 - Boot from CF card, setup like above #set cmdline "root=/dev/hda2 rootdelay=10 console=ttyS0,115200n8 console=tty0" -## Choice 3 - Boot rootfs image as initramfs (works only for smaller images) +## Choice 3 - Boot kernel with builtin interactive bootloader (initramfs-bootmenu-image) +# rootdelay is a wait before scanning for the available partitions +# if root= is also specified, interactive selection will be skipped and +# direct boot will happen. +#set cmdline "rootdelay=3 console=ttyS0,115200n8 console=tty0" + +## Choice 4 - Boot rootfs image as initramfs (works only for smaller images) # have a cpio.gz file below together with zImage, no EXT2 partition required #set initrd "<image>.rootfs.cpio.gz" #set cmdline "rdinit=/sbin/init console=ttyS0,115200n8 console=tty0" -## Choice 4 - Boot via NFS over USB networking (must be kernel-builtin) +## Choice 5 - Boot via NFS over USB networking (must be kernel-builtin +# or initramfs-*-image works too) # 192.168.x.x - Server address (the other side) # 192.168.y.y - Handheld's address #set cmdline "root=/dev/nfs nfsroot=192.168.x.x:<nfs_path> ip=192.168.y.y:192.168.x.x:192.168.x.x:255.255.255.0:pda:usb0 console=ttyS0,115200n8 console=tty0" -## Choice 5 - Boot from MTD partition, for devices with lots of flash +## Choice 6 - Boot from MTD partition, for devices with lots of flash # to have both WinCE and Linux there. Note the value of root param, # that's how it should be, not "/dev/mtdblockN". -# set cmdline "root=mtdN console=ttyS0,115200n8 console=tty0" +#set cmdline "root=mtdN console=ttyS0,115200n8 console=tty0" bootlinux EOF diff --git a/packages/zten/files/zten.patch b/packages/zten/files/zten.patch index 22ba56951a..3fff27a23d 100644 --- a/packages/zten/files/zten.patch +++ b/packages/zten/files/zten.patch @@ -1,3 +1,5 @@ +upstream: no upstream bug tracker. Laibsch contacted author by mail on 2008-02-17. + --- zten/zten.pro.orig 2003-02-16 16:45:44.000000000 +0100 +++ zten/zten.pro 2006-04-23 18:50:19.000000000 +0200 @@ -1,11 +1,9 @@ diff --git a/packages/zten/zten_1.6.2.bb b/packages/zten/zten_1.6.2.bb index b5a4c6eac1..33feae0911 100644 --- a/packages/zten/zten_1.6.2.bb +++ b/packages/zten/zten_1.6.2.bb @@ -1,4 +1,5 @@ DESCRIPTION = "EB*/EPWING dictionary browser for Linux Zaurus" +AUTHOR = "Yuuichi Teranishi <teranisi@gohome.org>" HOMEPAGE = "http://www.gohome.org/zten" SECTION = "opie/applications" PRIORITY = "optional" |