diff options
author | Michael Lauer <mickey@vanille-media.de> | 2008-01-18 00:51:26 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2008-01-18 00:51:26 +0000 |
commit | c2906680781aaebafa1a72afa8be1d941bea847a (patch) | |
tree | 7b80684d81926e6aafd4a9de900c5d05837faa2b /packages | |
parent | 5e7715dbbd5785f528181cf4cf3f92adf19c9073 (diff) | |
parent | 5a47ec1835998c7c02a8397a043a83e7fc010096 (diff) |
merge of '324c9ae28ad0981fb0295081bc51f62d2b0333ab'
and '6fdc0cb19db57ac2a4d88dec24b554f7b34c593d'
Diffstat (limited to 'packages')
21 files changed, 138 insertions, 28 deletions
diff --git a/packages/gnutls/gnutls/.mtn2git_empty b/packages/gnutls/gnutls-1.6.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnutls/gnutls/.mtn2git_empty +++ b/packages/gnutls/gnutls-1.6.3/.mtn2git_empty diff --git a/packages/gnutls/gnutls/configure_madness.patch b/packages/gnutls/gnutls-1.6.3/configure_madness.patch index 26111dfe96..26111dfe96 100644 --- a/packages/gnutls/gnutls/configure_madness.patch +++ b/packages/gnutls/gnutls-1.6.3/configure_madness.patch diff --git a/packages/gnutls/gnutls/gnutls-openssl.patch b/packages/gnutls/gnutls-1.6.3/gnutls-openssl.patch index e2c189592f..e2c189592f 100644 --- a/packages/gnutls/gnutls/gnutls-openssl.patch +++ b/packages/gnutls/gnutls-1.6.3/gnutls-openssl.patch diff --git a/packages/gnutls/gnutls/gnutls-texinfo-euro.patch b/packages/gnutls/gnutls-1.6.3/gnutls-texinfo-euro.patch index e2a2762424..e2a2762424 100644 --- a/packages/gnutls/gnutls/gnutls-texinfo-euro.patch +++ b/packages/gnutls/gnutls-1.6.3/gnutls-texinfo-euro.patch diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc index 2211d5f798..d08b0ca931 100644 --- a/packages/gnutls/gnutls.inc +++ b/packages/gnutls/gnutls.inc @@ -4,10 +4,7 @@ DEPENDS = "zlib libgcrypt lzo" LICENSE = "LGPL" -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ - file://gnutls-openssl.patch;patch=1 \ - file://gnutls-texinfo-euro.patch;patch=1 \ - file://configure_madness.patch;patch=1 " +SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" inherit autotools binconfig pkgconfig diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb index a5b5341156..ddaef1dea3 100644 --- a/packages/gnutls/gnutls_1.6.3.bb +++ b/packages/gnutls/gnutls_1.6.3.bb @@ -1,2 +1,9 @@ require gnutls.inc + +SRC_URI += "\ + file://gnutls-openssl.patch;patch=1 \ + file://gnutls-texinfo-euro.patch;patch=1 \ + file://configure_madness.patch;patch=1 \ + " + PR = "r3" diff --git a/packages/gpe-scap/gpe-scap-1.3/.mtn2git_empty b/packages/gpe-scap/gpe-scap-1.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-scap/gpe-scap-1.3/.mtn2git_empty diff --git a/packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch b/packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch new file mode 100644 index 0000000000..766c5a51d9 --- /dev/null +++ b/packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch @@ -0,0 +1,26 @@ +Index: gpe-scap-1.3/configure +=================================================================== +--- gpe-scap-1.3.orig/configure 2008-01-17 17:01:49.000000000 +0100 ++++ gpe-scap-1.3/configure 2008-01-17 17:03:01.000000000 +0100 +@@ -6327,7 +6327,7 @@ + + + +-GLADE_MODULES="libglade-2.0 >= 2.4.2" ++GLADE_MODULES="libglade-2.0 >= 2.4.0" + + pkg_failed=no + { echo "$as_me:$LINENO: checking for GLADE" >&5 +Index: gpe-scap-1.3/configure.ac +=================================================================== +--- gpe-scap-1.3.orig/configure.ac 2008-01-17 17:35:15.000000000 +0100 ++++ gpe-scap-1.3/configure.ac 2008-01-17 17:35:20.000000000 +0100 +@@ -29,7 +29,7 @@ + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + +-GLADE_MODULES="libglade-2.0 >= 2.4.2" ++GLADE_MODULES="libglade-2.0 >= 2.4.0" + PKG_CHECK_MODULES(GLADE, $GLADE_MODULES) + AC_SUBST(GLADE_CFLAGS) + AC_SUBST(GLADE_LIBS) diff --git a/packages/gpe-scap/gpe-scap_1.3.bb b/packages/gpe-scap/gpe-scap_1.3.bb index aec5819e6e..438a80f4a3 100644 --- a/packages/gpe-scap/gpe-scap_1.3.bb +++ b/packages/gpe-scap/gpe-scap_1.3.bb @@ -11,3 +11,5 @@ DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup" GPE_TARBALL_SUFFIX = "bz2" inherit gpe autotools + +SRC_URI += " file://allow-glade-2.4.0.patch;patch=1" diff --git a/packages/gpe-session-scripts/files/angstrom/matchbox-session b/packages/gpe-session-scripts/files/angstrom/matchbox-session index b0bec8c742..d48b9ed308 100644 --- a/packages/gpe-session-scripts/files/angstrom/matchbox-session +++ b/packages/gpe-session-scripts/files/angstrom/matchbox-session @@ -1,8 +1,6 @@ #!/bin/sh -XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` - - matchbox-desktop & - -matchbox-panel --no-flip --orientation south & +#XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` +matchbox-desktop & +matchbox-panel --no-flip --orientation south & diff --git a/packages/gpe-session-scripts/files/matchbox-session b/packages/gpe-session-scripts/files/matchbox-session index e4c0e0c68e..77d5db9df8 100644 --- a/packages/gpe-session-scripts/files/matchbox-session +++ b/packages/gpe-session-scripts/files/matchbox-session @@ -1,8 +1,6 @@ #!/bin/sh -XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` - - matchbox-desktop & - -MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south & +#XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` +matchbox-desktop & +MB_MENU_PANEL_DISABLED=1 matchbox-panel --orientation south & diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb index b8d91538c6..bab26e7df0 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb @@ -11,7 +11,7 @@ DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputm SRC_URI += "file://matchbox-session \ file://disable-composite.xsettings" -PR = "r10" +PR = "r11" #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1" diff --git a/packages/linux/chumby-kernel/chumby-override-cmdline.patch b/packages/linux/chumby-kernel/chumby-override-cmdline.patch new file mode 100644 index 0000000000..4ff29f9007 --- /dev/null +++ b/packages/linux/chumby-kernel/chumby-override-cmdline.patch @@ -0,0 +1,13 @@ +Index: linux-2.6.16/arch/arm/kernel/setup.c +=================================================================== +--- linux-2.6.16.orig/arch/arm/kernel/setup.c 2008-01-17 21:49:50.000000000 +0100 ++++ linux-2.6.16/arch/arm/kernel/setup.c 2008-01-17 22:20:40.000000000 +0100 +@@ -660,7 +660,7 @@ + + static int __init parse_tag_cmdline(const struct tag *tag) + { +- strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); ++ //strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); + return 0; + } + diff --git a/packages/linux/chumby-kernel/defconfig b/packages/linux/chumby-kernel/defconfig index 0fa62db9f8..db836c1561 100644 --- a/packages/linux/chumby-kernel/defconfig +++ b/packages/linux/chumby-kernel/defconfig @@ -766,7 +766,7 @@ CONFIG_FB_IMX=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=m +CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y CONFIG_FONT_8x8=y @@ -783,8 +783,8 @@ CONFIG_FONT_MINI_4x6=y # # Logo configuration # -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y +# CONFIG_LOGO is not set +# CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set # CONFIG_LOGO_TURBOCHEF_CLUT224 is not set @@ -895,7 +895,7 @@ CONFIG_USB_LIBUSUAL=y # # USB Input Devices # -CONFIG_USB_HID=m +CONFIG_USB_HID=y CONFIG_USB_HIDINPUT=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set @@ -1033,9 +1033,9 @@ CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set diff --git a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb index d85f001c78..89546e0bf9 100644 --- a/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb +++ b/packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb @@ -3,10 +3,11 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Chumby" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz \ http://files.chumby.com/source/ironforge/build396/align.pl \ + file://chumby-override-cmdline.patch;patch=1 \ file://defconfig \ " @@ -21,10 +22,17 @@ ARCH = "arm" #CMDLINE_ROOT = "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000" #CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mem=64M" #CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" -#CMDLINE = "console=ttyS0,38400 root=/dev/mtdblock5 rootfstype=cramfs psplash=false" +CMDLINE = "console=ttyS0,38400 root=/dev/mtdblock5 rootfstype=jffs2 psplash=false" COMPATIBLE_MACHINE = "chumby" +module_autoload_chumby_accel = "chumby_accel" +module_autoload_chumby_emma = "chumby_emma" +module_autoload_chumby_sense1 = "chumby_sense1" +module_autoload_chumby_timer = "chumby_timer" +module_autoload_chumby_udma = "chumby_udma" +module_autoload_chumby-tsc2100 = "chumby-tsc2100" + do_deploy_prepend() { perl ../align.pl arch/arm/boot/zImage } diff --git a/packages/rt2x00/rt73-chumby_1.2.bb b/packages/rt2x00/rt73-chumby_1.2.bb new file mode 100644 index 0000000000..3d6cd0cb51 --- /dev/null +++ b/packages/rt2x00/rt73-chumby_1.2.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Driver for Ralink rt73 USB 802.11g WiFi sticks found in the Chumby" +HOMEPAGE = "http://www.chumby.com" +SECTION = "kernel/modules" +LICENSE = "GPL" +PR = "r2" + +SRC_URI="http://files.chumby.com/source/ironforge/build396/${PN}-${PV}.tar.gz" + +inherit module + +S = "${WORKDIR}/wifi/rt73/Module/" + +EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + install -m 0644 rt73${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/ + install -d ${D}${sysconfdir}/Wireless/RT73STA/ + install -m 0644 rt73.bin ${D}${sysconfdir}/Wireless/RT73STA/ +} + diff --git a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb index ca048155c9..8d4ede20af 100644 --- a/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb +++ b/packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" DESCRIPTION = "Transparent xcursor theme for handheld systems" SECTION = "x11/base" -PR="r1" +PR="r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \ file://use-relative-symlinks.patch;patch=1 \ @@ -9,3 +9,5 @@ SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" inherit autotools + +PACKAGE_ARCH = "all" diff --git a/packages/xcursor-transparent-theme/xcursor-watchonly-theme/.mtn2git_empty b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/.mtn2git_empty diff --git a/packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent new file mode 100755 index 0000000000..6fa068214e --- /dev/null +++ b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent @@ -0,0 +1,7 @@ +#!/bin/sh + +# Only if there's no mouse at all, we use use transparent cursors +# for stylus use comfort. +if ! ls /dev/input/mouse* >/dev/null 2>&1; then + echo "Xcursor.theme: xcursor-transparent" | xrdb -merge -nocpp +fi diff --git a/packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch new file mode 100644 index 0000000000..5c13fa885a --- /dev/null +++ b/packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch @@ -0,0 +1,23 @@ +diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am +--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am 2003-10-30 13:13:59.000000000 +0100 ++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2005-12-20 23:35:17.000000000 +0100 +@@ -79,7 +79,6 @@ + ul_angle \ + ur_angle \ + v_double_arrow \ +- watcha \ + xterm + + CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors +diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in xcursor-transparent-theme-0.1.1/cursors/Makefile.in +--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in 2003-10-31 15:31:13.000000000 +0100 ++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.in 2005-12-20 23:35:36.000000000 +0100 +@@ -67,7 +67,7 @@ + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + +-CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow watcha xterm ++CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow xterm + + + CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors diff --git a/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb b/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb index e9e6479daf..094b303409 100644 --- a/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb +++ b/packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb @@ -3,13 +3,21 @@ DESCRIPTION = "Transparent xcursor theme for handheld systems with visible watch SECTION = "x11/base" RREPLACES = "xcursor-transparent-theme" RPROVIDES = "xcursor-transparent-theme" -PR="r2" +PR="r4" SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \ file://use-relative-symlinks.patch;patch=1 \ - file://skip_watch_cursor.patch;patch=1" + file://skip_watch_cursor.patch;patch=1 \ + file://20xcursor-transparent" S = "${WORKDIR}/xcursor-transparent-theme-${PV}" -FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" +FILES_${PN} += "${datadir}/icons/xcursor-transparent/cursors/*" inherit autotools + +do_install_append () { + install -d ${D}${sysconfdir}/X11/Xsession.d + install -m 0755 ${WORKDIR}/20xcursor-transparent ${D}${sysconfdir}/X11/Xsession.d +} + +PACKAGE_ARCH = "all" |