diff options
96 files changed, 30007 insertions, 63 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index d70cfa5daf..e8fca61fb2 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -110,6 +110,14 @@ fakeroot do_rootfs () { ${MACHINE_POSTPROCESS_COMMAND} } +do_deploy_to[nostamp] = "1" +do_deploy_to () { + # A standalone task to deploy built image to the location specified + # by DEPLOY_TO variable (likely passed via environment). + # Assumes ${IMAGE_FSTYPES} is a single value! + cp "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${IMAGE_FSTYPES}" ${DEPLOY_TO} +} + insert_feed_uris () { echo "Building feeds for [${DISTRO}].." @@ -202,3 +210,4 @@ rootfs_update_timestamp () { EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp addtask rootfs before do_build after do_install +addtask deploy_to after do_rootfs diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 5204039478..213ed12fae 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -84,7 +84,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # openzaurus-unstable is a so called "versioned" distro, i.e. they # explicitely select specific versions of various packages. # Stay away from unversioned distros unless you really know what you are doing -# DISTRO = "angstrom-2007.1" +# DISTRO = "angstrom-2008.1" # So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION # to generate binary locale packages at build time using qemu-native and diff --git a/packages/anki/anki_0.4.3.bb b/packages/anki/anki_0.4.3.bb index 5d0c8fabe7..e4878645d8 100644 --- a/packages/anki/anki_0.4.3.bb +++ b/packages/anki/anki_0.4.3.bb @@ -3,7 +3,7 @@ require anki.inc RDEPENDS += "libanki" PR = "r0" -export PV +#export PV="${PV}" SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch;patch=1" S = "${WORKDIR}/anki-${PV}" diff --git a/packages/images/x11-gpe-java-image.bb b/packages/images/x11-gpe-java-image.bb index 9547cab6f6..5a7ec5ec16 100644 --- a/packages/images/x11-gpe-java-image.bb +++ b/packages/images/x11-gpe-java-image.bb @@ -12,6 +12,7 @@ IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ task-java \ + task-java-gtk \ angstrom-x11-base-depends \ angstrom-gpe-task-base \ angstrom-gpe-task-settings \ diff --git a/packages/initrdscripts/initramfs-image-ipk_1.0.bb b/packages/initrdscripts/initramfs-image-ipk_1.0.bb new file mode 100644 index 0000000000..8c79c24478 --- /dev/null +++ b/packages/initrdscripts/initramfs-image-ipk_1.0.bb @@ -0,0 +1,15 @@ +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/ipaq-boot-params/files/h5000/params b/packages/ipaq-boot-params/files/h5000/params index 2d1a571173..a1a1f4e6e9 100644 --- a/packages/ipaq-boot-params/files/h5000/params +++ b/packages/ipaq-boot-params/files/h5000/params @@ -1 +1 @@ -set linuxargs "root=/dev/mtdblock1 noinitrd console=ttyS0,115200" +set linuxargs "root=/dev/mtdblock1 noinitrd console=tty0 console=ttyS0,115200" diff --git a/packages/ipaq-boot-params/files/params b/packages/ipaq-boot-params/files/params index 42344d6fb7..a1a1f4e6e9 100644 --- a/packages/ipaq-boot-params/files/params +++ b/packages/ipaq-boot-params/files/params @@ -1 +1 @@ -set linuxargs "root=/dev/mtdblock1 init=/linuxrc noinitrd console=none" +set linuxargs "root=/dev/mtdblock1 noinitrd console=tty0 console=ttyS0,115200" diff --git a/packages/ipaq-boot-params/ipaq-boot-params.bb b/packages/ipaq-boot-params/ipaq-boot-params.bb index 15e3c9cd51..7b73df1d34 100644 --- a/packages/ipaq-boot-params/ipaq-boot-params.bb +++ b/packages/ipaq-boot-params/ipaq-boot-params.bb @@ -1,5 +1,6 @@ +DESCRIPTION = "Kernel boot parameters for HH.org bootldr" LICENSE = "MIT" -PR = "r2" +PR = "r4" COMPATIBLE_MACHINE = "(h3600|h3800|h3900|h5000|simpad)" diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index 28d3be1b3d..db0d725aac 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound virtual/libx11 libxext libpng" PROVIDES = "virtual/libxine" -PR = "r0" +PR = "r1" inherit autotools pkgconfig gettext binconfig @@ -17,7 +17,7 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar. file://libxine-ffmpeg-enable-arm.patch;patch=1 \ file://no-caca-no-aalib.patch;patch=1 \ file://dont-have-xv.patch;patch=1 \ - file://restore-esd.patch;patch=1 \ +# file://restore-esd.patch;patch=1 \ file://fix-syntax-xine-vorbis-decoder.patch;patch=1 \ file://libxine-cut-memusage.patch;patch=1 \ file://mpegvideo-static-inlinine.patch;patch=1 \ diff --git a/packages/linux/gumstix-kernel-2.6.21/.mtn2git_empty b/packages/linux/gumstix-kernel-2.6.21/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/gumstix-kernel-2.6.21/.mtn2git_empty diff --git a/packages/linux/gumstix-kernel-2.6.21/270-usb-gadget-udc.patch b/packages/linux/gumstix-kernel-2.6.21/270-usb-gadget-udc.patch new file mode 100644 index 0000000000..630d188ea0 --- /dev/null +++ b/packages/linux/gumstix-kernel-2.6.21/270-usb-gadget-udc.patch @@ -0,0 +1,2739 @@ +Index: linux-2.6.21gum/drivers/usb/gadget/Kconfig +=================================================================== +--- linux-2.6.21gum.orig/drivers/usb/gadget/Kconfig ++++ linux-2.6.21gum/drivers/usb/gadget/Kconfig +@@ -129,6 +129,28 |