From 708032118904d36953ce1f0140a2d4d65e7ea2db Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 27 Nov 2007 20:47:28 +0000 Subject: xkbd 0.8.15: Add default common slides. * xkbd has supports for "slides", where instead of just click on key, there's a gesture up, down, left, or right. These can be specified in keyboard definition, and xkbd has defaults for each 4. But of 4 pristine defaults, only 1 is useful - up is shift+key. The other are for ctrl, alt, etc modifiers, which are less useful in real life. Instead, have following defaults: left - backspace, right - space, down - Enter. This means that on common xkbd file w/o slide definition, making a right-to-left gesture anywhere on keyboard will be equivalent of backspace, etc. --- .../xkbd-0.8.15/add-default-common-slides.patch | 44 ++++++++++++++++++++++ packages/xkbd/xkbd_0.8.15.bb | 3 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch diff --git a/packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch b/packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch new file mode 100644 index 0000000000..0423ee1eed --- /dev/null +++ b/packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch @@ -0,0 +1,44 @@ +diff -r 6b20ef8fbdee src/kb.c +--- a/src/kb.c Tue Nov 27 21:28:21 2007 +0200 ++++ b/src/kb.c Tue Nov 27 22:27:09 2007 +0200 +@@ -954,6 +954,13 @@ void kb_send_keypress(button *b) + int slide_flag = 0; + + struct keycodeEntry vk_keycodes[10]; ++ ++ static KeySym ksSpace, ksBackSpace, ksReturn; ++ if (!ksSpace) { ++ ksSpace = XStringToKeysym("space"); ++ ksBackSpace = XStringToKeysym("BackSpace"); ++ ksReturn = XStringToKeysym("Return"); ++ } + + if (b->kb->state & KB_STATE_SHIFT || b->kb->state & KB_STATE_CAPS) + { +@@ -981,20 +988,17 @@ void kb_send_keypress(button *b) + ks = b->slide_up_ks; + if (ks == 0) ks = b->shift_ks; + break; +- case down : /* hold ctrl */ ++ case down : + ks = b->slide_down_ks; +- if (ks == 0) slide_flag = KB_STATE_CTRL; ++ if (ks == 0) ks = ksReturn; + break; +- case left : /* hold alt */ ++ case left : + ks = b->slide_left_ks; +- if (ks == 0) +- { +- ks = b->mod_ks; +- slide_flag = KB_STATE_MOD; +- } ++ if (ks == 0) ks = ksBackSpace; + break; +- case right : /* hold alt */ ++ case right : + ks = b->slide_right_ks; ++ if (ks == 0) ks = ksSpace; + break; + case none: + break; diff --git a/packages/xkbd/xkbd_0.8.15.bb b/packages/xkbd/xkbd_0.8.15.bb index 2d070fd7ad..f27189f597 100644 --- a/packages/xkbd/xkbd_0.8.15.bb +++ b/packages/xkbd/xkbd_0.8.15.bb @@ -2,9 +2,10 @@ SRC_URI = "http://handhelds.org/~mallum/xkbd/xkbd-${PV}-CVS.tar.gz \ file://libtool-lossage.patch;patch=1;pnum=1 \ file://fix-equalsign.patch;patch=1 \ file://fix-circumkey.patch;patch=1 \ + file://add-default-common-slides.patch;patch=1 \ file://xkbd.png" LICENSE = "GPL" -PR = "r2" +PR = "r3" SECTION = "x11" DEPENDS = "libxpm libxtst libxft" -- cgit v1.2.3 From 52b15d1b1c6f46cf6ad78609d6c1238bdfa7ddc6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 27 Nov 2007 22:57:37 +0000 Subject: matchbox-keyboard svn: Unbreak. * Please don't commit spurious changes. --- packages/matchbox-keyboard/matchbox-keyboard_svn.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb index 27ea4aea1d..696486b6ef 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -5,13 +5,13 @@ RCONFLICTS = matchbox-keyboard-inputmethod RPROVIDES_${PN} = matchbox-keyboard-inputmethod SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR="r6" +PR="r7" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://smallscreen-fontsize.patch;patch=1 \ -# file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ -# file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ -# file://4-Add-rendering-debug-logging.patch;patch=1 \ + file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ + file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ + file://4-Add-rendering-debug-logging.patch;patch=1 \ file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \ file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \ " -- cgit v1.2.3 From 437af8f045847a573bd30b5cc4d82cb4faded0fd Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 29 Nov 2007 11:03:24 +0000 Subject: matchbox-applet-inputmanager 0.6: Implement smart IM visibility protocol. * One of the very noticeable pain points in matchbox' IM handling is high latency of IM popping up, which can take up to half-second with complex screen layouts. This is rooted in the fact that IM process is killed when IM window is hidden, and started again afterwards. * I wanted to address this on inputmanager level, transparently to actual IM implementation, by hiding/showing IM's window by the manager. Unfortunately, there appears to be no reliable method to figure out window IDs from process properties (for example, _MB_CLIENT_EXEC_MAP X property, maintained by matcbox, doesm't capture all apps started, in particular, it captures neither xkbd nor matchbox-keyboard, GPE's term app is not caught too, while either GPE apps are). Then, wanted to implement custom PropertyNotify-based protocol, though there would be left issue of distinguishing IMs which support this protocol and ones which don't. Finally, by random gerpping, I found that xkbd supports Unix signal based visibility protocol! By receiving SIGUSR1, it hides/shows its window. This seems like 100% win, as the default behavior for SIGUSR1 is process termination, so unsupporting clients will be just terminated as before. --- .../files/visibility-protocol.patch | 33 ++++++++++++++++++++++ .../matchbox-applet-inputmanager_0.6.bb | 3 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 packages/matchbox-applet-inputmanager/files/visibility-protocol.patch diff --git a/packages/matchbox-applet-inputmanager/files/visibility-protocol.patch b/packages/matchbox-applet-inputmanager/files/visibility-protocol.patch new file mode 100644 index 0000000000..545d4808d9 --- /dev/null +++ b/packages/matchbox-applet-inputmanager/files/visibility-protocol.patch @@ -0,0 +1,33 @@ +# HG changeset patch +# User "Paul Sokolovsky " +# Date 1196333272 -7200 +# Node ID 4ec785864bbe896eda3b933e65a5f2d71864b9b3 +# Parent 375f9e4a30d3de9852b00cd1decb259f4f04446e +Implement an IM [Unix-]signal-based visibility protocol, as supported +by xkbd. By receiving SISUSR1, IM implementation toggles its visibility. +The most valuable, default action for SIGUSR1 is process termination, so +we can send SIGUSR1 unconditionally, replacing old method of sending +SIGTERM (and there's also check for process existence before sending +signal, so if process is dead, it will be just restarted). + +diff -r 375f9e4a30d3 -r 4ec785864bbe mbinputmgr.c +--- a/mbinputmgr.c Wed Nov 28 03:41:20 2007 +0200 ++++ b/mbinputmgr.c Thu Nov 29 12:47:52 2007 +0200 +@@ -1,3 +1,4 @@ ++#include + #include "mbinputmgr.h" + + static void +@@ -233,8 +234,10 @@ mbinputmgr_toggle_selected_method (MBInp + if ( (inpmgr->PidCurrent != -1) /* Something running */ + && (kill(inpmgr->PidCurrent, 0) != -1) ) + { +- kill(inpmgr->PidCurrent, 15); /* kill it */ +- inpmgr->PidCurrent = -1; ++ /* Send a SIGUSR1. Smart IMs will toggle their visibility. ++ Dumb, which don't handle it at all, will just die ++ per default action for SIGUSR1, termination. */ ++ kill(inpmgr->PidCurrent, SIGUSR1); + } + else fork_exec(inpmgr, inpmgr->MethodSelected->exec); + } diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb index 4afdd426db..09f2a7d999 100644 --- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb +++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb @@ -3,11 +3,12 @@ LICENSE = "GPL" DEPENDS = "matchbox-wm libmatchbox" SECTION = "x11/wm" -PR = "r3" +PR = "r4" SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz \ file://update-to-svn.diff;patch=1 \ file://mbinputmgr-libgtkinput.patch;patch=1 \ + file://visibility-protocol.patch;patch=1 \ " S = "${WORKDIR}/mb-applet-input-manager-${PV}" -- cgit v1.2.3 From 37b5214d02ac06525ec6a9fa817ec8862d16eeb2 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 29 Nov 2007 14:14:30 +0000 Subject: gpe-login 0.90: Fix autolock landscape/portrait behavior. * When autolock was activated in lanscape mode, and then switched to portrait, the window doesn't fit to screen. Fixed. --- .../gpe-login/files/size-autolock-properly.patch | 26 ++++++++++++++++++++++ packages/gpe-login/gpe-login_0.90.bb | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/gpe-login/files/size-autolock-properly.patch diff --git a/packages/gpe-login/files/size-autolock-properly.patch b/packages/gpe-login/files/size-autolock-properly.patch new file mode 100644 index 0000000000..b8e2cd6f4f --- /dev/null +++ b/packages/gpe-login/files/size-autolock-properly.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# User "Paul Sokolovsky " +# Date 1196345352 -7200 +# Node ID ebe625e21708cb9257201a4dd6e536b99f1f0220 +# Parent 976c01632feacbcce2058a061a0b1f6faed2275a +When configuring autolock window, make sure to set not only the minimal +("requested") size, but also the actual one. This fixes issue that after +autolock screen have been shown in landscape mode, it no longer fits the +screen in portrait mode. + +Also, gtk_widget_set_usize() marked as deprecated, replace with +gtk_widget_set_size_request(). + +diff -r 976c01632fea -r ebe625e21708 gpe-login.c +--- a/gpe-login.c Sun Nov 25 22:39:23 2007 +0200 ++++ b/gpe-login.c Thu Nov 29 16:09:12 2007 +0200 +@@ -558,7 +558,8 @@ filter (GdkXEvent *xevp, GdkEvent *ev, g + { + spawn_xkbd (); + gtk_label_set_markup (GTK_LABEL (label_result), ""); +- gtk_widget_set_usize (window, gdk_screen_width (), gdk_screen_height ()); ++ gtk_widget_set_size_request (window, gdk_screen_width (), gdk_screen_height ()); ++ gtk_window_resize (window, gdk_screen_width (), gdk_screen_height ()); + gtk_widget_show_all (window); + if (ownerinfo) + { diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb index c2a274ba8b..253d581953 100644 --- a/packages/gpe-login/gpe-login_0.90.bb +++ b/packages/gpe-login/gpe-login_0.90.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd gpe-theme-clearlooks" RPROVIDES_${PN} = "gpe-session-starter" -PR = "r4" +PR = "r5" SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" @@ -18,6 +18,7 @@ SRC_URI += "file://removeblue-fontsize8.patch;patch=1" SRC_URI += " file://chvt-keylaunch.patch;patch=1 " SRC_URI += " file://lock-on-supend.patch;patch=1 " SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 " +SRC_URI += " file://size-autolock-properly.patch;patch=1 " SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1" SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1" -- cgit v1.2.3 From 958237d3a0e8777796da653ae886ac2854ac62ec Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 30 Nov 2007 00:28:48 +0000 Subject: task-toolchain-openmoko-sdk: ship openmoko-sample2-src --- packages/openmoko2/openmoko-sample2_svn.bb | 24 ++++++++++++++++++++++++ packages/tasks/task-toolchain-openmoko-sdk.bb | 5 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko2/openmoko-sample2_svn.bb 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/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 \ " -- cgit v1.2.3 From 36190bdbddbb82fc7d69b15ac5260bba1d900257 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 30 Nov 2007 02:00:28 +0000 Subject: Forward port PRO34130 patch for gcc 4.2 variants. Move eglibc to revision 4355 which has -Os support. --- conf/distro/include/sane-srcrevs.inc | 6 +++--- packages/gcc/gcc-4.2.1/pr34130.patch | 16 ++++++++++++++++ packages/gcc/gcc-4.2.2/pr34130.patch | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 packages/gcc/gcc-4.2.1/pr34130.patch create mode 100644 packages/gcc/gcc-4.2.2/pr34130.patch diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index df4be2d2e0..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" 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)); -- cgit v1.2.3 From 39565118303f565d78a6b5429eafdbad99ee6351 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 30 Nov 2007 09:48:04 +0000 Subject: linux.inc : change the generation of uImage to do_compile_append so that the later stages like install/packaging/deploy can make use of this. This was done so that kernel-image could contain a uImage but is suitable for other cases as well. --- packages/linux/linux.inc | 48 ++++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) 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}" -- cgit v1.2.3 From 6b1fd5f198553ce441cfe7bb8b94eff1226874b6 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 30 Nov 2007 11:33:12 +0000 Subject: nslu2-minimal-image: Added (on Koen's advice) to allow creation of NSLU2 Angstrom (or other DISTRO) flashable images without needing to create a new DISTRO --- packages/images/nslu2-minimal-image.bb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 packages/images/nslu2-minimal-image.bb diff --git a/packages/images/nslu2-minimal-image.bb b/packages/images/nslu2-minimal-image.bb new file mode 100644 index 0000000000..db2312c613 --- /dev/null +++ b/packages/images/nslu2-minimal-image.bb @@ -0,0 +1,3 @@ +require minimal-image.bb + +INHERIT += nslu2-image -- cgit v1.2.3 From df583e53b537df5d9becc184789d641ec0788c11 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 30 Nov 2007 11:47:45 +0000 Subject: netbase: Added 'auto eth0' to interfaces file as per RFC on list, and cause busybox ifup doesn't support allow-hotplug. --- packages/netbase/netbase/interfaces | 1 + packages/netbase/netbase_4.21.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces index c9b2faf3f8..ca449168a9 100644 --- a/packages/netbase/netbase/interfaces +++ b/packages/netbase/netbase/interfaces @@ -41,6 +41,7 @@ iface wlan0 inet dhcp iface atml0 inet dhcp # Wired or wireless interfaces +auto eth0 iface eth0 inet dhcp iface eth1 inet dhcp diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 289e9bbc05..82464d82c6 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r24" +PR = "r25" inherit update-rc.d -- cgit v1.2.3 From e2eeb4244cee6d046602182b4d9c95bbfb18ba80 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 30 Nov 2007 12:35:17 +0000 Subject: sane-srcrevs: (and friends): Added openmoko-sample2 --- conf/distro/include/insane-srcrevs.inc | 1 + conf/distro/include/moko-autorev.inc | 1 + conf/distro/include/sane-srcrevs.inc | 1 + 3 files changed, 3 insertions(+) diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index 7c675087ab..e039a144d3 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -62,6 +62,7 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-session ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 0e29c19c5c..316fc5a4de 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -45,6 +45,7 @@ SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-session ?= "${AUTOREV}" SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8fee94e9d9..a65f477296 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -95,6 +95,7 @@ SRCREV_pn-openmoko-panel-gsm ?= "3256" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" SRCREV_pn-openmoko-panel-usb ?= "3360" SRCREV_pn-openmoko-session ?= "152" +SRCREV_pn-openmoko-sample2 ?= "3537" SRCREV_pn-openmoko-simplemediaplayer ?= "1688" SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192" SRCREV_pn-openmoko-stylus-demo ?= "2324" -- cgit v1.2.3 From 22d8e49c3956522d7dba6e885c7ca04f06aea97c Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Fri, 30 Nov 2007 13:54:20 +0000 Subject: base.bbclass: add buildall task from Poky Suggested by Richard as a way to force ipk's of dependencies to get build when building a package. This is handy if your are building a package for a feed that does not get installed in an image. --- classes/base.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/classes/base.bbclass b/classes/base.bbclass index 06a49814d2..1794382699 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -508,6 +508,13 @@ base_do_fetchall() { : } +addtask buildall after do_build +do_buildall[recrdeptask] = "do_build" +base_do_buildall() { + : +} + + def oe_unpack_file(file, data, url = None): import bb, os if not url: -- cgit v1.2.3 From 2b8cee3e63a824c699d6bb718b3e9fb636b7522c Mon Sep 17 00:00:00 2001 From: Jeroen Hoek Date: Fri, 30 Nov 2007 16:20:33 +0000 Subject: contrib/angstrom/angstrom.svg: An Angstrom logo design, accepted as the official. * Contributed by Jeroen Hoek , see http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2007-May/000286.html --- contrib/angstrom/.mtn2git_empty | 0 contrib/angstrom/angstrom.svg | 632 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 632 insertions(+) create mode 100644 contrib/angstrom/.mtn2git_empty create mode 100644 contrib/angstrom/angstrom.svg diff --git a/contrib/angstrom/.mtn2git_empty b/contrib/angstrom/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/contrib/angstrom/angstrom.svg b/contrib/angstrom/angstrom.svg new file mode 100644 index 0000000000..8ae0bfc873 --- /dev/null +++ b/contrib/angstrom/angstrom.svg @@ -0,0 +1,632 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + Colour scheme + + + ngström + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Large version, thinner lines + Small version for psplash + Small version for psplash (300×300) + + + ngström + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 550e6926680d70c8013ccffce7233564e93ca539 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Nov 2007 16:50:05 +0000 Subject: mboxkbd-layouts-gui: Sane-itize and add desktop icon. * Icon was shamelessly hacked up from matchbox-keyboards' and gpe-conf-time's. --- .../mboxkbd-layouts-gui/.mtn2git_empty | 0 .../mboxkbd-layouts-gui/auto-mkdir.patch | 16 ++++++++++++++++ .../mboxkbd-layouts-gui/mboxkbd-layouts-gui.png | Bin 0 -> 739 bytes .../mboxkbd-layouts-gui/sanitize-desktop-file.patch | 18 ++++++++++++++++++ packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb | 14 +++++++++++--- 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty create mode 100644 packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch create mode 100644 packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png create mode 100644 packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty b/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch b/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch new file mode 100644 index 0000000000..82f6cb50b9 --- /dev/null +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch @@ -0,0 +1,16 @@ +diff -r cccb513c808c src/interface.c +--- a/src/interface.c Wed Nov 28 01:22:54 2007 +0200 ++++ b/src/interface.c Wed Nov 28 01:43:12 2007 +0200 +@@ -93,8 +93,12 @@ static void fill_user_list(GtkListStore + strcpy(linkpath, home_dir); + strcat(linkpath, "/"); + strcat(linkpath, USR_LAYOUT_SUFFIX); ++ if (access(linkpath, X_OK)) { ++ mkdir(linkpath, 0711); ++ } + dir = opendir(linkpath); + if(!dir) { ++ fprintf(stderr, "Cannot read %s directory: ", linkpath); + perror("opendir"); + exit(1); + } diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png b/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png new file mode 100644 index 0000000000..d08be372ac Binary files /dev/null and b/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png differ diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch b/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch new file mode 100644 index 0000000000..095a8d337a --- /dev/null +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch @@ -0,0 +1,18 @@ +diff -r a6959d06b0fb mk-layouts-gui.desktop +--- a/mk-layouts-gui.desktop Wed Nov 28 02:07:06 2007 +0200 ++++ b/mk-layouts-gui.desktop Wed Nov 28 02:08:49 2007 +0200 +@@ -1,9 +1,9 @@ + [Desktop Entry] + Name=MK Layout Manager + Comment=Manage matchbox-keyboard layouts +-Exec=mk-layouts-gui ++Exec=mboxkbd-layouts-gui + Type=Application +-Icon=mk-layouts-gui.png +-Categories=Application;SystemSettings;MB +-StartupNotify=True +-SingleInstance=True ++Icon=mboxkbd-layouts-gui ++Categories=Application;SystemSettings;MB; ++StartupNotify=true ++SingleInstance=true diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb index 2dfba07fc7..584b81c086 100644 --- a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb @@ -3,12 +3,20 @@ AUTHOR = "Sergey Lapin" SECTION = "x11" LICENSE = "GPL" DEPENDS = "gtk+" -PR = "r3" +PR = "r4" -PV = "0.0+git${SRCDATE}" +PV = "0.0+git5b42aeff36d930dc3a9b75eedc74dacfec45f43f" -SRC_URI = "git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git" +SRC_URI = "git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git;tag=5b42aeff36d930dc3a9b75eedc74dacfec45f43f \ + file://auto-mkdir.patch;patch=1 \ + file://sanitize-desktop-file.patch;patch=1 \ + file://mboxkbd-layouts-gui.png" S = "${WORKDIR}/git" inherit autotools + +do_install_append() { + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/mboxkbd-layouts-gui.png ${D}${datadir}/pixmaps/ +} -- cgit v1.2.3 From fda022550dc1980ce2d8e255c8699b95432543ed Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Nov 2007 17:04:47 +0000 Subject: mboxkbd-layouts-gui: Use git snaphot tarball as repo is offline currently. --- packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb index 584b81c086..6a466a1e9a 100644 --- a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb @@ -3,11 +3,12 @@ AUTHOR = "Sergey Lapin" SECTION = "x11" LICENSE = "GPL" DEPENDS = "gtk+" -PR = "r4" +PR = "r5" PV = "0.0+git5b42aeff36d930dc3a9b75eedc74dacfec45f43f" -SRC_URI = "git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git;tag=5b42aeff36d930dc3a9b75eedc74dacfec45f43f \ +SRC_URI = "http://linux-h4000.sourceforge.net/mirror/mk-layouts-gui.git_5b42aeff36d930dc3a9b75eedc74dacfec45f43f.tar.gz \ +#git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git;tag=5b42aeff36d930dc3a9b75eedc74dacfec45f43f \ file://auto-mkdir.patch;patch=1 \ file://sanitize-desktop-file.patch;patch=1 \ file://mboxkbd-layouts-gui.png" -- cgit v1.2.3 From 33c40b15a78be31216e1dec07a92d0df643afde5 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 30 Nov 2007 20:44:28 +0000 Subject: pulseaudio: add 0.9.8, remove 0.9.7 --- packages/pulseaudio/pulse.inc | 1 - packages/pulseaudio/pulseaudio_0.9.7.bb | 12 ------------ packages/pulseaudio/pulseaudio_0.9.8.bb | 12 ++++++++++++ 3 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 packages/pulseaudio/pulseaudio_0.9.7.bb create mode 100644 packages/pulseaudio/pulseaudio_0.9.8.bb diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc index f765bec1a1..08b0b5cd14 100644 --- a/packages/pulseaudio/pulse.inc +++ b/packages/pulseaudio/pulse.inc @@ -3,7 +3,6 @@ HOMEPAGE = "http://www.pulseaudio.org" AUTHOR = "Lennart Poettering" SECTION = "libs/multimedia" LICENSE = "LGPL" - DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "alsa-lib glib-2.0" diff --git a/packages/pulseaudio/pulseaudio_0.9.7.bb b/packages/pulseaudio/pulseaudio_0.9.7.bb deleted file mode 100644 index d466086b50..0000000000 --- a/packages/pulseaudio/pulseaudio_0.9.7.bb +++ /dev/null @@ -1,12 +0,0 @@ -require pulse.inc - -# this is not correct (see below) -SRC_URI += "file://disable-using-glibc-tls.patch;patch=1" - -PR = "r0" - -# problems w/ pulseaudio 0.9.7 atm: -# 1.) needs libtool 1.2.24 (which miscompiles plugins in OE, hence we can't make it the default yet) -# 2.) doesn't build w/ glibc TLS support (hence patched out) -DEFAULT_PREFERENCE = "-1" - diff --git a/packages/pulseaudio/pulseaudio_0.9.8.bb b/packages/pulseaudio/pulseaudio_0.9.8.bb new file mode 100644 index 0000000000..76bf6e8411 --- /dev/null +++ b/packages/pulseaudio/pulseaudio_0.9.8.bb @@ -0,0 +1,12 @@ +require pulse.inc + +# this is not correct (see below) +SRC_URI += "file://disable-using-glibc-tls.patch;patch=1" + +PR = "r0" + +# problems w/ pulseaudio 0.9.8 atm: +# 1.) needs libtool >= 1.5.24 (yes, any older version will NOT work) +# 2.) doesn't build w/ glibc TLS support (hence patched out) +DEFAULT_PREFERENCE = "-1" + -- cgit v1.2.3