[oe-commits] org.oe.dev merge of '19595382c19aadeee7dac4939deb285a05e428eb'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Feb 4 00:00:09 UTC 2008
merge of '19595382c19aadeee7dac4939deb285a05e428eb'
and '31ced983465ce39a8b2be69de54096ba17a8b404'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e59d936bafa8fcb6a44f33950b9995094981a468
ViewMTN: http://monotone.openembedded.org/revision/info/e59d936bafa8fcb6a44f33950b9995094981a468
Files:
1
packages/inetutils/inetutils_1.5.bb
packages/qemu/qemu-0.9.1/writev_fix.patch
packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch
conf/distro/include/sane-srcrevs.inc
conf/machine/h5000.conf
packages/gsm/files/default
packages/gsm/gsmd.inc
packages/linux/linux-openmoko_2.6.24.bb
packages/opie-ttf-support/opie-ttf-support_1.1.bb
packages/qemu/qemu_0.9.1.bb
packages/tasks/task-base.bb
packages/xorg-app/bdftopcf-native_1.0.0.bb
packages/xorg-font/font-util-native_1.0.1.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
conf/machine/mpc8313e-rdb.conf
conf/machine/mpc8323e-rdb.conf
packages/linux/linux.inc
Diffs:
#
# mt diff -r19595382c19aadeee7dac4939deb285a05e428eb -re59d936bafa8fcb6a44f33950b9995094981a468
#
#
#
# add_file "packages/inetutils/inetutils_1.5.bb"
# content [dfddc68af03f52a9106590446cca1d62313b47dc]
#
# add_file "packages/qemu/qemu-0.9.1/writev_fix.patch"
# content [3f2bd27101b7c9040d2fb4744e2ebe2231460cff]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch"
# content [2dd41bf751f18da06f0d638ee68db2ba1a670f11]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a5473bb5c86337913d9f630632a7ed94f804d24f]
# to [177af5a39717b36a7c50de2dcaf6aa384b8e4568]
#
# patch "conf/machine/h5000.conf"
# from [b6fb552c41aeff2850cd35e5d3dfb99733e1e56d]
# to [e03a562f647e39de325cf64e33abb934e96da504]
#
# patch "packages/gsm/files/default"
# from [2c9ff75946e58892430cb9cee5cb6e6a16739d7c]
# to [d981c451d500ec2d0079c4622536ebe440f68480]
#
# patch "packages/gsm/gsmd.inc"
# from [9ddb79e73fa5344cdebd3d8fd96e8acc67ea81f0]
# to [69249920053eb5816872a237e49b8a365ceac6e5]
#
# patch "packages/linux/linux-openmoko_2.6.24.bb"
# from [4527abefc5b7568128b1443a52304c3ab1f9f35b]
# to [1a98497aa440ea6863e4f36ee5233b799fe5b221]
#
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
# from [09c30f685e453e48a2f95e26642436c3429b832d]
# to [31bd2beed5a8228f8da31953542c42edf4b43385]
#
# patch "packages/qemu/qemu_0.9.1.bb"
# from [f8d662dfd4e4b410c48acb09eac959d69412e332]
# to [bf513f5e837d2341359ac2ed28d1e0c8b9d8ef93]
#
# patch "packages/tasks/task-base.bb"
# from [c13ff0dc014dd2c93926e1f1aef880d9dda3571c]
# to [1a4f000020453dc9598a87cbb8a1df9e88bc5c96]
#
# patch "packages/xorg-app/bdftopcf-native_1.0.0.bb"
# from [60d6c9131e6edb0c83a67fd03de07e9b8331719c]
# to [7f4e40b838d6811415a1d0a5752d2cc807af3d67]
#
# patch "packages/xorg-font/font-util-native_1.0.1.bb"
# from [e15331aa720a2c0392a072ac4bedee6d2406739c]
# to [38bd9ec3ecff18a104db97c5ea359a0ec7b06c93]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
# from [b08682b1e497d6999914f7b52000ff0293b6b2ef]
# to [e924574025f2310b2e6051f3aeef14fd3082d730]
#
============================================================
--- packages/inetutils/inetutils_1.5.bb dfddc68af03f52a9106590446cca1d62313b47dc
+++ packages/inetutils/inetutils_1.5.bb dfddc68af03f52a9106590446cca1d62313b47dc
@@ -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*
+}
============================================================
--- packages/qemu/qemu-0.9.1/writev_fix.patch 3f2bd27101b7c9040d2fb4744e2ebe2231460cff
+++ packages/qemu/qemu-0.9.1/writev_fix.patch 3f2bd27101b7c9040d2fb4744e2ebe2231460cff
@@ -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);
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch 2dd41bf751f18da06f0d638ee68db2ba1a670f11
+++ packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch 2dd41bf751f18da06f0d638ee68db2ba1a670f11
@@ -0,0 +1,16 @@
+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,6 @@
+ cfsetispeed(&nTty, 9600);
+ cfsetospeed(&nTty, 9600);
+ tcsetattr(fd, TCSANOW, &nTty);
+- /*
+- * Flush any pending keystrokes
+- */
+- while ((n = read (fd, buf, sizeof (buf))) > 0)
+- ;
+ KdRegisterFd (fd, LinuxKeyboardRead, ki);
+ return Success;
+ }
============================================================
--- conf/distro/include/sane-srcrevs.inc a5473bb5c86337913d9f630632a7ed94f804d24f
+++ conf/distro/include/sane-srcrevs.inc 177af5a39717b36a7c50de2dcaf6aa384b8e4568
@@ -45,7 +45,7 @@ SRCREV_pn-linux-ixp4xx ?= "1021"
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"
============================================================
--- conf/machine/h5000.conf b6fb552c41aeff2850cd35e5d3dfb99733e1e56d
+++ conf/machine/h5000.conf e03a562f647e39de325cf64e33abb934e96da504
@@ -27,7 +27,8 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
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
============================================================
--- packages/gsm/files/default 2c9ff75946e58892430cb9cee5cb6e6a16739d7c
+++ packages/gsm/files/default d981c451d500ec2d0079c4622536ebe440f68480
@@ -5,8 +5,13 @@ case `machine_id` in
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")
============================================================
--- packages/gsm/gsmd.inc 9ddb79e73fa5344cdebd3d8fd96e8acc67ea81f0
+++ packages/gsm/gsmd.inc 69249920053eb5816872a237e49b8a365ceac6e5
@@ -5,7 +5,7 @@ PV = "0.1+svnr${SRCREV}"
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 \
============================================================
--- packages/linux/linux-openmoko_2.6.24.bb 4527abefc5b7568128b1443a52304c3ab1f9f35b
+++ packages/linux/linux-openmoko_2.6.24.bb 1a98497aa440ea6863e4f36ee5233b799fe5b221
@@ -5,10 +5,10 @@ KERNEL_RELEASE = "2.6.24"
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
============================================================
--- packages/opie-ttf-support/opie-ttf-support_1.1.bb 09c30f685e453e48a2f95e26642436c3429b832d
+++ packages/opie-ttf-support/opie-ttf-support_1.1.bb 31bd2beed5a8228f8da31953542c42edf4b43385
@@ -1,23 +1,33 @@ DEPENDS = "freetype"
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
+}
============================================================
--- packages/qemu/qemu_0.9.1.bb f8d662dfd4e4b410c48acb09eac959d69412e332
+++ packages/qemu/qemu_0.9.1.bb bf513f5e837d2341359ac2ed28d1e0c8b9d8ef93
@@ -1,6 +1,6 @@ DEPENDS = "zlib"
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"
============================================================
--- packages/tasks/task-base.bb c13ff0dc014dd2c93926e1f1aef880d9dda3571c
+++ packages/tasks/task-base.bb 1a4f000020453dc9598a87cbb8a1df9e88bc5c96
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r58"
+PR = "r59"
inherit task
============================================================
--- packages/xorg-app/bdftopcf-native_1.0.0.bb 60d6c9131e6edb0c83a67fd03de07e9b8331719c
+++ packages/xorg-app/bdftopcf-native_1.0.0.bb 7f4e40b838d6811415a1d0a5752d2cc807af3d67
@@ -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
-
============================================================
--- packages/xorg-font/font-util-native_1.0.1.bb e15331aa720a2c0392a072ac4bedee6d2406739c
+++ packages/xorg-font/font-util-native_1.0.1.bb 38bd9ec3ecff18a104db97c5ea359a0ec7b06c93
@@ -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
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.4.bb b08682b1e497d6999914f7b52000ff0293b6b2ef
+++ packages/xorg-xserver/xserver-kdrive_1.4.bb e924574025f2310b2e6051f3aeef14fd3082d730
@@ -1,9 +1,9 @@ PE = "1"
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/xse
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 \
"
#
# mt diff -r31ced983465ce39a8b2be69de54096ba17a8b404 -re59d936bafa8fcb6a44f33950b9995094981a468
#
#
#
# patch "conf/machine/mpc8313e-rdb.conf"
# from [f24e1a2aa898afd23e87bf623adfe947da548a3d]
# to [8d91dbc6066254429f7bb58a89ddd63064e893b6]
#
# patch "conf/machine/mpc8323e-rdb.conf"
# from [250e826f5d31182ea85bbc328c82de9c3973796b]
# to [54b0a85f3b2b21b088ba2cc07834fa16318a72d8]
#
# patch "packages/linux/linux.inc"
# from [a0d496b811bed73fa1cc6883dc248a306f18edef]
# to [80f38a1e1786c843bf61a35d6abaeb856434a160]
#
============================================================
--- conf/machine/mpc8313e-rdb.conf f24e1a2aa898afd23e87bf623adfe947da548a3d
+++ conf/machine/mpc8313e-rdb.conf 8d91dbc6066254429f7bb58a89ddd63064e893b6
@@ -10,6 +10,8 @@ MACHINE_FEATURES = "kernel26 usbhost ext
MACHINE_FEATURES = "kernel26 usbhost ext2"
+KERNEL_IMAGETYPE = "uImage"
+
PREFERRED_VERSION_u-boot = "1.3.1"
UBOOT_MACHINE = "MPC8313ERDB_33_config"
============================================================
--- conf/machine/mpc8323e-rdb.conf 250e826f5d31182ea85bbc328c82de9c3973796b
+++ conf/machine/mpc8323e-rdb.conf 54b0a85f3b2b21b088ba2cc07834fa16318a72d8
@@ -10,6 +10,8 @@ MACHINE_FEATURES = "kernel26 usbhost pci
MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
+KERNEL_IMAGETYPE = "uImage"
+
PREFERRED_VERSION_u-boot = "1.1.6"
UBOOT_MACHINE = "MPC8323ERDB_config"
============================================================
--- packages/linux/linux.inc a0d496b811bed73fa1cc6883dc248a306f18edef
+++ packages/linux/linux.inc 80f38a1e1786c843bf61a35d6abaeb856434a160
@@ -108,15 +108,20 @@ do_compile_append() {
do_compile_append() {
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
+ if test "x${ARCH}" = "xpowerpc" ; then
+ UBOOT_ARCH=ppc
+ else
+ UBOOT_ARCH=$ARCH
+ fi
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
+ uboot-mkimage -A ${UBOOT_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
+ uboot-mkimage -A ${UBOOT_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
More information about the Openembedded-commits
mailing list