From ae9f6dcc023821f66ce3cb51e89f6113e3cc783c Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 1 Feb 2008 21:31:59 +0000 Subject: h5000.conf: Ship kernel-module-i2c-pxa. * Spotted by Milan Plzik * Fixes #2628 --- conf/machine/h5000.conf | 3 ++- packages/tasks/task-base.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index c4c1237bae..1f29438061 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -27,7 +27,8 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootf MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ kernel-module-h5400-battery \ - kernel-module-snd-soc-h5000" + kernel-module-snd-soc-h5000 \ + kernel-module-i2c-pxa" # # Modules autoload and other boot properties diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index a44056f316..f8a94c63b2 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r58" +PR = "r59" inherit task -- cgit v1.2.3 From e3e8f31ef232a80edd2556edc87bd4a09c373a64 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 2 Feb 2008 20:07:58 +0000 Subject: inetutils: bumped up to latest upstream revision --- packages/inetutils/inetutils_1.5.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/inetutils/inetutils_1.5.bb diff --git a/packages/inetutils/inetutils_1.5.bb b/packages/inetutils/inetutils_1.5.bb new file mode 100644 index 0000000000..0971e58967 --- /dev/null +++ b/packages/inetutils/inetutils_1.5.bb @@ -0,0 +1,17 @@ +SECTION = "libs" +DEPENDS = "ncurses" +LICENSE = "GPL" +DESCRIPTION = "The GNU inetutils are a collection of common \ +networking utilities and servers including ftp, ftpd, rcp, \ +rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \ +talkd, telnet, telnetd, tftp, tftpd, and uucpd." + +SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz" + +inherit autotools + +EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR}" + +do_configure_prepend () { + rm -f ${S}/glob/configure* +} -- cgit v1.2.3 From 64d04dd1dca9f1dcc022d0c808bafc39ec04aadf Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 2 Feb 2008 23:05:52 +0000 Subject: bdftopcf-native: simplify recipe, use the same source tarball as bdftopcf --- packages/xorg-app/bdftopcf-native_1.0.0.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/xorg-app/bdftopcf-native_1.0.0.bb b/packages/xorg-app/bdftopcf-native_1.0.0.bb index 8ab592b2b2..41049946e5 100644 --- a/packages/xorg-app/bdftopcf-native_1.0.0.bb +++ b/packages/xorg-app/bdftopcf-native_1.0.0.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "Native bdftopdf utility" -SECTION = "x11/fonts" -LICENSE = "MIT-X" +inherit native +require xorg-app-common.inc PE = "1" -S="${WORKDIR}/bdftopcf-${PV}" +XORG_PN = "bdftopcf" DEPENDS = "libxfont-native" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz" - -inherit native autotools pkgconfig - -- cgit v1.2.3 From 1bc7962516feae076b10cfcfd2212cd4fab4e480 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 2 Feb 2008 23:07:30 +0000 Subject: font-util-native: simplify recipe, use the same source tarball as font-util --- packages/xorg-font/font-util-native_1.0.1.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/xorg-font/font-util-native_1.0.1.bb b/packages/xorg-font/font-util-native_1.0.1.bb index 8db0b71898..32ea62c3d5 100644 --- a/packages/xorg-font/font-util-native_1.0.1.bb +++ b/packages/xorg-font/font-util-native_1.0.1.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "X font utils." -SECTION = "x11/fonts" -LICENSE = "MIT-X" +inherit native +require xorg-font-common.inc -S="${WORKDIR}/font-util-${PV}" +XORG_PN = "font-util" DEPENDS = "bdftopcf-native" PE = "1" - -SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz" - -inherit native autotools pkgconfig -- cgit v1.2.3 From 6746a39d827d29d7657add85613833f2fd49ab5e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 2 Feb 2008 23:15:29 +0000 Subject: xserver-kdrive: remove a blocking read in the keyboard driver resume path --- .../keyboard-resume-workaround.patch | 18 ++++++++++++++++++ packages/xorg-xserver/xserver-kdrive_1.4.bb | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch b/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch new file mode 100644 index 0000000000..ced1904916 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch @@ -0,0 +1,18 @@ +Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c +=================================================================== +--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 2007-09-29 18:31:15.000000000 +0200 ++++ xorg-server-1.4/hw/kdrive/linux/keyboard.c 2007-09-29 18:33:02.000000000 +0200 +@@ -743,11 +743,8 @@ + cfsetispeed(&nTty, 9600); + cfsetospeed(&nTty, 9600); + tcsetattr(fd, TCSANOW, &nTty); +- /* +- * Flush any pending keystrokes +- */ +- while ((n = read (fd, buf, sizeof (buf))) > 0) +- ; ++ n = fcntl(fd, F_GETFL); ++ fprintf(stderr, "LinuxConsoleFd status flags: %x (O_NONBLOCK = %x)\n", n, O_NONBLOCK); + KdRegisterFd (fd, LinuxKeyboardRead, ki); + return Success; + } diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb index f4d5be38e1..c87090197c 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.4.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "hal libxkbfile libxcalibrate pixman" PE = "1" -PR = "r2" +PR = "r3" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://xcalibrate-new-input-world-order.patch;patch=1 \ file://tslib-default-device.patch;patch=1 \ file://fbdev-evdev.patch;patch=1 \ + file://keyboard-resume-workaround.patch;patch=1 \ file://xorg-avr32-support.diff;patch=1 \ " -- cgit v1.2.3 From 008a8b2d36ff42916ccc1b84aadef456785019e2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 2 Feb 2008 23:19:08 +0000 Subject: xserver-kdrive-1.4: remove debugging left-overs from keyboard-resume-workaround --- .../xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch b/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch index ced1904916..4964ff5479 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch @@ -2,7 +2,7 @@ Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c =================================================================== --- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 2007-09-29 18:31:15.000000000 +0200 +++ xorg-server-1.4/hw/kdrive/linux/keyboard.c 2007-09-29 18:33:02.000000000 +0200 -@@ -743,11 +743,8 @@ +@@ -743,11 +743,6 @@ cfsetispeed(&nTty, 9600); cfsetospeed(&nTty, 9600); tcsetattr(fd, TCSANOW, &nTty); @@ -11,8 +11,6 @@ Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c - */ - while ((n = read (fd, buf, sizeof (buf))) > 0) - ; -+ n = fcntl(fd, F_GETFL); -+ fprintf(stderr, "LinuxConsoleFd status flags: %x (O_NONBLOCK = %x)\n", n, O_NONBLOCK); KdRegisterFd (fd, LinuxKeyboardRead, ki); return Success; } -- cgit v1.2.3 From 01f0994efc30b67cfccc803ddb1fa902d6b2d949 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 3 Feb 2008 00:15:59 +0000 Subject: qemu: Fix writev syscall null value handling, fixes glibc LC_CTYPE errors during locale generation --- packages/qemu/qemu-0.9.1/writev_fix.patch | 17 +++++++++++++++++ packages/qemu/qemu_0.9.1.bb | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 packages/qemu/qemu-0.9.1/writev_fix.patch diff --git a/packages/qemu/qemu-0.9.1/writev_fix.patch b/packages/qemu/qemu-0.9.1/writev_fix.patch new file mode 100644 index 0000000000..e0ed4af972 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/writev_fix.patch @@ -0,0 +1,17 @@ +--- + linux-user/syscall.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: qemu-0.9.1/linux-user/syscall.c +=================================================================== +--- qemu-0.9.1.orig/linux-user/syscall.c 2008-02-03 00:00:00.000000000 +0000 ++++ qemu-0.9.1/linux-user/syscall.c 2008-02-03 00:00:38.000000000 +0000 +@@ -1048,7 +1048,7 @@ static abi_long lock_iovec(int type, str + base = tswapl(target_vec[i].iov_base); + vec[i].iov_len = tswapl(target_vec[i].iov_len); + vec[i].iov_base = lock_user(type, base, vec[i].iov_len, copy); +- if (!vec[i].iov_base) ++ if (!vec[i].iov_base && vec[i].iov_len) + goto fail; + } + unlock_user (target_vec, target_addr, 0); diff --git a/packages/qemu/qemu_0.9.1.bb b/packages/qemu/qemu_0.9.1.bb index 2f0aba7e64..164296b0d4 100644 --- a/packages/qemu/qemu_0.9.1.bb +++ b/packages/qemu/qemu_0.9.1.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DEPENDS = "zlib" -PR = "r6" +PR = "r7" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}" @@ -31,6 +31,7 @@ SRC_URI = "\ file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \ file://workaround_bad_futex_headers.patch;patch=1 \ file://fix_segfault.patch;patch=1 \ + file://writev_fix.patch;patch=1 \ file://configure_symlinkpath_fix.patch;patch=1 \ file://disable-error-in-configure.patch;patch=1 \ file://no-strip.patch;patch=1" -- cgit v1.2.3 From df21c09a84e69864b5fe1bd008c4e739252f4876 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 3 Feb 2008 14:57:10 +0000 Subject: opie-ttf-support: fix uninitialized ${palmtopdir}/lib/fonts/fontdir, oebug 3720 * replace tab with space --- packages/opie-ttf-support/opie-ttf-support_1.1.bb | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/opie-ttf-support/opie-ttf-support_1.1.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb index d11d8ea75f..c6ed53ffbd 100644 --- a/packages/opie-ttf-support/opie-ttf-support_1.1.bb +++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb @@ -1,23 +1,33 @@ DESCRIPTION = "Meta-package for Opie TTF support" SECTION = "opie/fonts" DEPENDS = "freetype" -PR = "r3" +PR = "r4" SRC_URI = "file://update-qtttffontdir.c" S = "${WORKDIR}" do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -I${STAGING_INCDIR}/freetype2 -lfreetype -o update-qtttffontdir update-qtttffontdir.c + ${CC} ${CFLAGS} ${LDFLAGS} -I${STAGING_INCDIR}/freetype2 -lfreetype -o update-qtttffontdir update-qtttffontdir.c } do_install() { - install -d ${D}${sbindir} - install -d ${D}${sysconfdir}/update-fonts-common.d/ - install -m 0755 update-qtttffontdir ${D}${sbindir} + echo " #!/bin/sh # Author: Rolf Leggewie ${sbindir}/update-qtttffontdir ${datadir}/fonts/truetype > ${palmtopdir}/lib/fonts/fontdir -" > ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update +" > ${WORKDIR}/02qtttffont-update + + install -d ${D}${sbindir} + install -d ${D}${sysconfdir}/update-fonts-common.d/ + install -m 0755 update-qtttffontdir ${D}${sbindir} + install -m 0755 02qtttffont-update ${D}${sysconfdir}/update-fonts-common.d/ +} + +pkg_postinst() { + if ! [ -d ${palmtopdir}/lib/fonts ]; then + mkdir -p ${palmtopdir}/lib/fonts + fi + ${sysconfdir}/update-fonts-common.d/02qtttffont-update } -- cgit v1.2.3 From cbfe7d32af3742c49392eb3ed3f3dcdac64ec3ab Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sun, 3 Feb 2008 18:06:46 +0000 Subject: sane-srcrevs.inc : increment linux-openmoko for the 2.6.24 patches --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 50ba415363..3411f2bb19 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -45,7 +45,7 @@ SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1021" -SRCREV_pn-linux-openmoko ?= "3801" +SRCREV_pn-linux-openmoko ?= "4013" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" -- cgit v1.2.3 From 7b2c14cc02aa5fdaa8c13c872dc14ecbd2cafaba Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sun, 3 Feb 2008 19:57:51 +0000 Subject: gsmd.inc : update the location of reset and power on gta01/02 devices and bump PR --- packages/gsm/files/default | 5 +++++ packages/gsm/gsmd.inc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/gsm/files/default b/packages/gsm/files/default index f113d8bab0..467bd339eb 100644 --- a/packages/gsm/files/default +++ b/packages/gsm/files/default @@ -5,8 +5,13 @@ case `machine_id` in "gta01"|"gta02") GSMD_OPTS="-s 115200 -F" + if [ -d '/sys/bus/platform/devices/gta01-pm-gsm.0' ] ; then GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" + else + GSM_POW="/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on" + GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset" + fi GSM_DEV="/dev/ttySAC0" ;; "htc_apache"|"htc_blueangel"|"htc_universal") diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc index f7d609e2c9..a6b6fb7a6a 100644 --- a/packages/gsm/gsmd.inc +++ b/packages/gsm/gsmd.inc @@ -5,7 +5,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r40" +PR = "r41" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ -- cgit v1.2.3 From 4f3ab3fe8e081cb25ca124f55ff2c21e6dd4072a Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sun, 3 Feb 2008 20:50:31 +0000 Subject: nux-openmoko_2.6.24.bb : take account of KERNEL_LOCALVERSION and set right variables to the right values. Fixes sound. --- packages/linux/linux-openmoko_2.6.24.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb index d58f231d69..0c63fc9bbd 100644 --- a/packages/linux/linux-openmoko_2.6.24.bb +++ b/packages/linux/linux-openmoko_2.6.24.bb @@ -5,10 +5,10 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ VANILLA_VERSION = "2.6.24" KERNEL_RELEASE = "2.6.24" -KERNEL_VERSION = "${KERNEL_RELEASE}" +KERNEL_VERSION = "${KERNEL_RELEASE}-moko11" PV = "${VANILLA_VERSION}+svnr${SRCREV}" -PR = "r1" +PR = "r2" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" @@ -54,7 +54,7 @@ do_prepatch() { mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av mv patches patches.openmoko mv .pc .pc.old - mv ${WORKDIR}/config/defconfig-${KERNEL_VERSION} ${WORKDIR}/defconfig + mv ${WORKDIR}/config/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig } addtask prepatch after do_unpack before do_patch -- cgit v1.2.3