diff options
24 files changed, 338 insertions, 105 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index df8ebd2a74..8fee94e9d9 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -15,9 +15,9 @@ SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dfu-util ?= "2866" SRCREV_pn-dfu-util-native ?= "2866" SRCREV_pn-eds-dbus ?= "628" -SRCREV_pn-eglibc ?= "3531" -SRCREV_pn-eglibc-initial ?= "3531" -SRCREV_pn-eglibc-intermediate ?= "3531" +SRCREV_pn-eglibc ?= "4355" +SRCREV_pn-eglibc-initial ?= "4355" +SRCREV_pn-eglibc-intermediate ?= "4355" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7650" @@ -123,6 +123,7 @@ SRCREV_pn-tmut ?= "60" SRCREV_pn-webkit-gtk ?= "27222" SRCREV_pn-webkit-qt ?= "27222" SRCREV_pn-webkit-qtopia ?= "27222" +SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" SRCREV_pn-networkmanager ?= "2887" diff --git a/packages/gcc/gcc-4.2.1/pr34130.patch b/packages/gcc/gcc-4.2.1/pr34130.patch new file mode 100644 index 0000000000..415335f4b4 --- /dev/null +++ b/packages/gcc/gcc-4.2.1/pr34130.patch @@ -0,0 +1,16 @@ +Index: gcc-4.1.2/gcc/fold-const.c +=================================================================== +--- gcc-4.1.2.orig/gcc/fold-const.c 2007-11-21 18:53:42.000000000 +0100 ++++ gcc-4.1.2/gcc/fold-const.c 2007-11-21 18:56:26.000000000 +0100 +@@ -5339,7 +5339,10 @@ + } + break; + } +- /* FALLTHROUGH */ ++ /* If the constant is negative, we cannot simplify this. */ ++ if (tree_int_cst_sgn (c) == -1) ++ break; ++ /* FALLTHROUGH */ + case NEGATE_EXPR: + if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0) + return fold_build1 (tcode, ctype, fold_convert (ctype, t1)); diff --git a/packages/gcc/gcc-4.2.2/pr34130.patch b/packages/gcc/gcc-4.2.2/pr34130.patch new file mode 100644 index 0000000000..415335f4b4 --- /dev/null +++ b/packages/gcc/gcc-4.2.2/pr34130.patch @@ -0,0 +1,16 @@ +Index: gcc-4.1.2/gcc/fold-const.c +=================================================================== +--- gcc-4.1.2.orig/gcc/fold-const.c 2007-11-21 18:53:42.000000000 +0100 ++++ gcc-4.1.2/gcc/fold-const.c 2007-11-21 18:56:26.000000000 +0100 +@@ -5339,7 +5339,10 @@ + } + break; + } +- /* FALLTHROUGH */ ++ /* If the constant is negative, we cannot simplify this. */ ++ if (tree_int_cst_sgn (c) == -1) ++ break; ++ /* FALLTHROUGH */ + case NEGATE_EXPR: + if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0) + return fold_build1 (tcode, ctype, fold_convert (ctype, t1)); diff --git a/packages/gtk+/gdk-pixbuf-csource_2.10.14.bb b/packages/gtk+/gdk-pixbuf-csource_2.10.14.bb deleted file mode 100644 index eba670912a..0000000000 --- a/packages/gtk+/gdk-pixbuf-csource_2.10.14.bb +++ /dev/null @@ -1,39 +0,0 @@ -require gtk+_${PV}.bb -DEPENDS = "jpeg libpng gettext glib-2.0" -S = "${WORKDIR}/gtk+-${PV}" -FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" -SRC_URI += "file://reduce-dependencies.patch;patch=1" - -#clear recommends for uclibc builds -RRECOMMENDS = " " -RRECOMMENDS_${PN}_linux = " " -RRECOMMENDS_${PN}_linux-gnueabi = " " - -EXTRA_OECONF = "\ - --without-x \ - --with-gdktarget=linux-fb \ - --without-libtiff \ - --with-libjpeg \ - --with-libpng \ -" - -do_compile() { - cd gdk-pixbuf && oe_runmake -} - -do_stage() { -# oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR} - cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr - autotools_stage_includes -# install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include -# install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h -} - -do_install() { - : -} - -# override the function in gtk-*.inc (included by gtk+*.bb) -populate_packages_prepend () { - -} diff --git a/packages/gtk+/gdk-pixbuf_2.10.14.bb b/packages/gtk+/gdk-pixbuf_2.10.14.bb new file mode 100644 index 0000000000..5b5482d1a8 --- /dev/null +++ b/packages/gtk+/gdk-pixbuf_2.10.14.bb @@ -0,0 +1,103 @@ +DESCRIPTION = "GDK PixBuf is a pixelmap image support library from the GTK+ \ +multi-platform toolkit for creating graphical user interfaces." +HOMEPAGE = "http://www.gtk.org/" +SECTION = "libs" +LICENSE = "LGPL" +PRIORITY = "optional" +DEPENDS = "jpeg libpng gettext glib-2.0" + +S = "${WORKDIR}/gtk+-${PV}" +FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" +PR = "r0" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ + file://automake-lossage.patch;patch=1 \ + file://reduce-dependencies.patch;patch=1" + +# file://no-xwc.patch;patch=1 \ +# file://disable-tooltips.patch;patch=1 \ +# file://gtklabel-resize-patch;patch=1 \ +# file://menu-deactivate.patch;patch=1 \ +# file://xsettings.patch;patch=1 \ +# file://scroll-timings.patch;patch=1 \ +# file://small-gtkfilesel.patch;patch=1 \ +# file://migration.patch;patch=1;pnum=0 \ +# file://run-iconcache.patch;patch=1 \ +# file://hardcoded_libtool.patch;patch=1 \ +# file://no-demos.patch;patch=1 \ +# file://single-click.patch;patch=1 \ +# file://spinbutton.patch;patch=1 \ +# file://gtk+-handhelds.patch;patch=1 \ +# file://filesel-fix-segfault.patch;patch=1 \ +# file://combo-arrow-size.patch;patch=1;pnum=0 \ +# file://range-no-redraw.patch;patch=1;pnum=0 \ +# file://scrolled-placement.patch;patch=1;pnum=0 \ +# file://treeview-checkbox-size.patch;patch=1;pnum=0 \ +# file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \ + +# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require gtk-fpu.inc +EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}" + +inherit autotools pkgconfig + +FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ + ${bindir}/gtk-update-icon-cache \ + ${libdir}/lib*.so.*" + +FILES_${PN}-dev += " \ + ${datadir}/gtk-2.0/include \ + ${libdir}/gtk-2.0/include \ + ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ + ${bindir}/gdk-pixbuf-csource \ + ${bindir}/gtk-builder-convert" + +FILES_${PN}-dbg += " \ + ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/*" + +EXTRA_OECONF = "\ + --without-x \ + --with-gdktarget=linux-fb \ + --without-libtiff \ + --with-libjpeg \ + --with-libpng \ +" + +LIBV = "2.10.0" + +do_compile() { + cd gdk-pixbuf && oe_runmake +} + +do_stage() { + oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR} + cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr + autotools_stage_includes +# install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include +# install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h +} + +do_install() { + oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${D}/${libdir} + cd gdk-pixbuf && oe_runmake install DESTDIR=${D} +} + +postinst_prologue() { +if [ "x$D" != "x" ]; then + exit 1 +fi +} + +PACKAGES_DYNAMIC = "gdk-pixbuf-loader-*" + +python populate_packages_prepend () { + import os.path + + prologue = bb.data.getVar("postinst_prologue", d, 1) + + gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) + loaders_root = os.path.join(gtk_libdir, 'loaders') + do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) +} diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch index 7eadfc61fe..0310746dfe 100644 --- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -1,7 +1,6 @@ -Index: linux-2.6.23/drivers/leds/Kconfig -=================================================================== +diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconfig --- linux-2.6.23.orig/drivers/leds/Kconfig 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/drivers/leds/Kconfig 2007-11-28 23:16:05.000000000 +0100 ++++ linux-2.6.23/drivers/leds/Kconfig 2007-11-29 09:02:42.000000000 +0100 @@ -101,6 +101,12 @@ outputs. To be useful the particular board must have LEDs and they must be connected to the GPIO lines. @@ -15,10 +14,9 @@ Index: linux-2.6.23/drivers/leds/Kconfig comment "LED Triggers" config LEDS_TRIGGERS -Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-11-29 00:45:42.000000000 +0100 +diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c +--- linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-11-29 09:02:42.000000000 +0100 @@ -0,0 +1,128 @@ +/* + * drivers/leds/leds-mpc8313e-rdb.c @@ -147,16 +145,15 @@ Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c + +MODULE_AUTHOR("Leon Woestenberg <leon@sidebranch.com>"); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); -+ -Index: linux-2.6.23/drivers/leds/Makefile -=================================================================== ---- linux-2.6.23.orig/drivers/leds/Makefile 2007-11-28 23:17:29.000000000 +0100 -+++ linux-2.6.23/drivers/leds/Makefile 2007-11-28 23:35:32.000000000 +0100 ++MODULE_LICENSE("GPL"); +diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile +--- linux-2.6.23.orig/drivers/leds/Makefile 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/drivers/leds/Makefile 2007-11-29 09:03:09.000000000 +0100 @@ -17,6 +17,7 @@ obj-$(CONFIG_LEDS_H1940) += leds-h1940.o obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o +obj-$(CONFIG_LEDS_MPC8313E_RDB) += leds-mpc8313e-rdb.o - + # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o + obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch new file mode 100644 index 0000000000..7c6cbcaa0b --- /dev/null +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch @@ -0,0 +1,32 @@ +diff -urN linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts +--- linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts 2007-11-29 19:32:21.000000000 +0100 +@@ -60,6 +60,12 @@ + interrupts = <e 8>; + interrupt-parent = < &ipic >; + dfsrr; ++ ++ rtc@68 { ++ device_type = "rtc"; ++ compatible = "dallas,ds1339"; ++ reg = <68>; ++ }; + }; + + i2c@3100 { +diff -urN linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c +--- linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c 2007-11-29 19:31:58.000000000 +0100 +@@ -319,6 +319,12 @@ + {"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",}, + {"ricoh,rv5c386", "rtc-rs5c372", "rv5c386",}, + {"ricoh,rv5c387a", "rtc-rs5c372", "rv5c387a",}, ++ {"dallas,ds1307", "rtc-ds1307", "ds1307",}, ++ {"dallas,ds1337", "rtc-ds1307", "ds1337",}, ++ {"dallas,ds1338", "rtc-ds1307", "ds1338",}, ++ {"dallas,ds1339", "rtc-ds1307", "ds1339",}, ++ {"dallas,ds1340", "rtc-ds1307", "ds1340",}, ++ {"stm,m41t00", "rtc-ds1307", "m41t00"}, + }; + + static int __init of_find_i2c_driver(struct device_node *node, struct i2c_board_info *info) diff --git a/packages/linux/linux-openmoko/defconfig-2.6.22.5 b/packages/linux/linux-openmoko/defconfig-2.6.22.5 index 62a61935f6..e9e40fed38 100644 --- a/packages/linux/linux-openmoko/defconfig-2.6.22.5 +++ b/packages/linux/linux-openmoko/defconfig-2.6.22.5 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22.5 -# Wed Nov 21 11:45:19 2007 +# Tue Nov 27 09:09:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -705,7 +705,7 @@ CONFIG_MTD_NAND_S3C2410=y CONFIG_MTD_NAND_S3C2410_BBT=y # CONFIG_MTD_NAND_S3C2410_DEBUG is not set CONFIG_MTD_NAND_S3C2410_HWECC=y -CONFIG_MTD_NAND_S3C2410_CLKSTOP=y +# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index 1af9ed58a7..c623504c73 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -9,7 +9,7 @@ KERNEL_RELEASE = "2.6.22.5" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}" -PR = "r9" +PR = "r10" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 09cf05f7d4..6fa4791150 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -74,7 +74,7 @@ do_configure_prepend() { -e '/CONFIG_CMDLINE=/d' \ -i ${S}/.config echo "CONFIG_INET=y" >> ${S}/.config - echo "CONFIG_IP_PNP=y" >> ${S}/.config + echo "CONFIG_IP_PNP=y" >> ${S}/.config echo "CONFIG_USB_GADGET=y" >> ${S}/.config echo "CONFIG_USB_GADGET_SELECTED=y" >> ${S}/.config echo "CONFIG_USB_ETH=y" >> ${S}/.config @@ -97,22 +97,24 @@ do_sizecheck() { fi } -do_install_prepend() { - if test -e arch/${ARCH}/boot/Image ; then - ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage - fi - - if test -e arch/${ARCH}/boot/images/uImage ; then - ln -f arch/${ARCH}/boot/images/uImage arch/${ARCH}/boot/uImage - fi +UBOOT_ENTRYPOINT ?= "20008000" - if test -e arch/${ARCH}/kernel/vmlinux.lds ; then - ln -f arch/${ARCH}/kernel/vmlinux.lds arch/${ARCH}/boot/vmlinux +do_compile_append() { + if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage + rm -f linux.bin + else + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin + rm -f linux.bin.gz + gzip -9 linux.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage + rm -f linux.bin.gz fi + fi } -UBOOT_ENTRYPOINT ?= "20008000" - KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}" KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}" @@ -120,24 +122,10 @@ do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib - - if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin - rm -f linux.bin - else - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin - rm -f linux.bin.gz - gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin - rm -f linux.bin.gz - fi - fi - cd ${DEPLOY_DIR_IMAGE} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin + cd ${DEPLOY_DIR_IMAGE} + rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin } do_deploy[dirs] = "${S}" diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index 6d9a3c718d..0c242e5e2c 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -25,7 +25,8 @@ SRC_URI_append_cm-x270 = "\ SRC_URI_append_mpc8313e-rdb = "\ file://mpc831x-nand.patch;patch=1 \ - file://mpc8313e-rdb-leds.patch;patch=1" + file://mpc8313e-rdb-leds.patch;patch=1 \ + file://mpc8313e-rdb-rtc.patch;patch=1" SRC_URI_append_mpc8323e-rdb = "\ file://mpc832x-leds.patch;patch=1" diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb new file mode 100644 index 0000000000..c05b6d3618 --- /dev/null +++ b/packages/openmoko2/openmoko-sample2_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "The OpenMoko Sample Project" +SECTION = "openmoko/applications" +DEPENDS = "libmokoui2 intltool gconf" +PV = "0.0.1+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 + +PACKAGES += "${PN}-src" +# path should match the toolchain path +FILES_${PN}-src = "/usr/local/openmoko" +PACKAGE_ARCH_${PN}-src = "all" + +do_configure_prepend() { + install -d ${WORKDIR}/source + cp -a ${S} ${WORKDIR}/source/ + find ${WORKDIR}/source -name ".svn"|xargs rm -rf +} + +do_install_append() { + install -d ${D}/usr/local/openmoko/source/ + cp -a ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ +} + diff --git a/packages/subversion/subversion_1.4.5.bb b/packages/subversion/subversion_1.4.5.bb new file mode 100644 index 0000000000..1daf45bd0c --- /dev/null +++ b/packages/subversion/subversion_1.4.5.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util neon" +RDEPENDS = "neon" +LICENSE = "Apache BSD" +HOMEPAGE = "http://subversion.tigris.org" + +PR = "r0" + +SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ + file://disable-revision-install.patch;patch=1 \ + file://neon-detection.patch;patch=1" + +EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \ + --without-berkeley-db --without-apxs --without-apache \ + --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ + --with-apr-util=${STAGING_BINDIR_CROSS}" + + +inherit autotools + +export LDFLAGS += " -L${STAGING_LIBDIR} " + +do_configure() { + gnu-configize + libtoolize --force + aclocal -I build/ -I build/ac-macros/ && autoconf + oe_runconf +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-toolchain-openmoko-sdk.bb index 062b05519b..945b4774f9 100644 --- a/packages/tasks/task-toolchain-openmoko-sdk.bb +++ b/packages/tasks/task-toolchain-openmoko-sdk.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" -PR = "r1" LICENSE = "MIT" ALLOW_EMPTY = "1" +PR = "r2" + PACKAGES = "${PN}" RDEPENDS_${PN} = "\ @@ -25,4 +26,6 @@ RDEPENDS_${PN} = "\ libmokoui2-dev \ libmokopanelui2-dev \ libmokojournal2-dev \ + \ + openmoko-sample2-src \ " diff --git a/packages/wesnoth/.mtn2git_empty b/packages/wesnoth/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wesnoth/.mtn2git_empty diff --git a/packages/wesnoth/wesnoth_svn.bb b/packages/wesnoth/wesnoth_svn.bb new file mode 100644 index 0000000000..430abe7d0f --- /dev/null +++ b/packages/wesnoth/wesnoth_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "fantasy turn-based strategy game" +PV = "0.01+svnr${SRCREV}" +PR = "r1" +SECTION = "games" +LICENSE = "GPL" +DEPENDS += "libsdl-image libsdl-mixer libsdl-net" +SRC_URI = "svn://svn.gna.org/svn/wesnoth;module=trunk;proto=http" + +EXTRA_OECONF += " --enable-tinygui --disable-python --enable-lite --enable-lowmem" + +S = "${WORKDIR}/trunk" + +inherit autotools + +addtask autogen after do_patch before do_configure + +do_autogen() { + cd ${WORKDIR}/trunk/ && ./autogen.sh --host=armv4t-angstrom-linux-gnueabi +} diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc index 8053e6c236..3b3c205e9e 100644 --- a/packages/xorg-driver/xorg-driver-common.inc +++ b/packages/xorg-driver/xorg-driver-common.inc @@ -2,7 +2,7 @@ DESCRIPTION = "X driver" HOMEPAGE = "http://www.x.org" SECTION = "x11/drivers" LICENSE = "MIT-X" -PR = "r1" +PR = "r2" DEPENDS = "randrproto xorg-server xproto" @@ -27,7 +27,7 @@ do_stage() { do_configure_prepend() { incdir=${STAGING_INCDIR}/xorg - for f in dri.h sarea.h dristruct.h exa.h; do + for f in dri.h sarea.h dristruct.h exa.h damage.h; do path="$incdir/$f" if [ -f "$path" ]; then p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'` diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 8ee6c3e04e..2e8535ef30 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -31,9 +31,9 @@ FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bin FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/modules ${libdir}/xorg/modules /etc/X11 " FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" -FILES_${PN}-dbg += "${libdir}//xorg/modules/.debug \ +FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/.debug \ - ${libdir}//xorg/modules/*/*/.debug \ + ${libdir}/xorg/modules/*/*/.debug \ " do_stage() { diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index 37ed418144..c8a3c42ed5 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r3" +PR = "r4" SRC_URI += "file://drmfix.patch;patch=1" diff --git a/packages/zaurusd/files/zaurus-hinge.bl-off b/packages/zaurusd/files/zaurus-hinge.bl-off index 888f90bfc5..ec3cefb2ca 100644 --- a/packages/zaurusd/files/zaurus-hinge.bl-off +++ b/packages/zaurusd/files/zaurus-hinge.bl-off @@ -6,5 +6,13 @@ # Filename: zaurus-hinge.bl-off # Date: 04-Jun-06 -test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin" -${ZD_BINDIR}/bl off +#test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin" +#${ZD_BINDIR}/bl off + + +STEP=5 +DRIVER="`ls /sys/class/backlight/|head -n 1`" +BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness" + +cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp +echo 0 > "$BRIGHTNESS_FILE" diff --git a/packages/zaurusd/files/zaurus-hinge.bl-on b/packages/zaurusd/files/zaurus-hinge.bl-on index b9b0e68749..61598155f2 100644 --- a/packages/zaurusd/files/zaurus-hinge.bl-on +++ b/packages/zaurusd/files/zaurus-hinge.bl-on @@ -12,7 +12,7 @@ ${ZD_BINDIR}/bl on # If the backlight does not come back on after a suspend, the driver is # still "on" (hence "bl on" does nothing) with a brightness of "0" -if test "`bl | awk '{print $2}'`" = "0" +( if test "`bl | awk '{print $2}'`" = "0" then x=0 while test "$x" != 4 @@ -24,5 +24,29 @@ then let x=$x+1 done -fi + + if mkdir /var/run/display_brightness.lock + then + if test -e /var/run/display_brightness.tmp + then + OLD_VALUE="`cat /var/run/display_brightness.tmp`" + echo "OLD BRIGHTNESS SETTING FOUND: $OLD_VALUE" + + if test "$OLD_VALUE" -gt 1 + then + STEP=5 + DRIVER="`ls /sys/class/backlight/|head -n 1`" + BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness" + + echo "SETTING $OLD_VALUE!" + echo "$OLD_VALUE" > "$BRIGHTNESS_FILE" + rm /var/run/display_brightness.tmp + echo "FINISH!" + fi + fi + rm -rf /var/run/display_brightness.lock + else + echo "BRIGHTNESS IS LOCKED" + fi +fi ) & diff --git a/packages/zaurusd/files/zaurus-hinge.matchbox-landscape b/packages/zaurusd/files/zaurus-hinge.matchbox-landscape index e7b92b5140..a048769f7d 100644 --- a/packages/zaurusd/files/zaurus-hinge.matchbox-landscape +++ b/packages/zaurusd/files/zaurus-hinge.matchbox-landscape @@ -16,6 +16,10 @@ # urg mbinputmgr should kill below killproc ${ZD_BINDIR}/matchbox-keyboard killproc ${ZD_BINDIR}/matchbox-stroke + if [ -x ${ZD_BINDIR}/xrandr ]; then - xrandr -o normal + if ! ( xrandr | awk '{print $4}' | grep -q normal ) + then + ${ZD_BINDIR}/xrandr -o normal + fi fi diff --git a/packages/zaurusd/files/zaurus-hinge.matchbox-portrait b/packages/zaurusd/files/zaurus-hinge.matchbox-portrait index bd04d328cc..291617cd02 100644 --- a/packages/zaurusd/files/zaurus-hinge.matchbox-portrait +++ b/packages/zaurusd/files/zaurus-hinge.matchbox-portrait @@ -1,7 +1,10 @@ #!/bin/sh if [ -x ${ZD_BINDIR}/xrandr ]; then - ${ZD_BINDIR}/xrandr -o left + if ! ( xrandr | awk '{print $4}' | grep -q left ) + then + ${ZD_BINDIR}/xrandr -o left + fi fi # just to be extra safe sleep 1 diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index f2d1f640b1..8bc0b2ba58 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Daemon to handle device specifc features." SECTION = "base" LICENSE = "GPL" -DEPENDS = "tslib gpe-conf" -RDEPENDS = "procps gpe-conf" +DEPENDS = "tslib" +RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r12" +PR = "r14" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ |