[oe-commits] org.oe.dev merge of '3664c8386a83989b0e4b61c25a0c3f5782c2b71f'
hrw commit
openembedded-commits at lists.openembedded.org
Fri Oct 26 13:57:47 UTC 2007
merge of '3664c8386a83989b0e4b61c25a0c3f5782c2b71f'
and 'b968656776ab23ced6e8710b760e509bfc537fe1'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 550fa1f65575fd511a7c73802cabf4e8d3e8426b
ViewMTN: http://monotone.openembedded.org/revision/info/550fa1f65575fd511a7c73802cabf4e8d3e8426b
Files:
1
packages/linux/linux-rp.inc
packages/opie-todo/files/gcc-syntax-fix.patch
packages/gsm/files/gsmd
packages/opie-todo/opie-todo_1.2.3.bb
Diffs:
#
# mt diff -r3664c8386a83989b0e4b61c25a0c3f5782c2b71f -r550fa1f65575fd511a7c73802cabf4e8d3e8426b
#
#
#
# patch "packages/linux/linux-rp.inc"
# from [f0c317eb10cb2f40cf0bff43801c47d20836ed32]
# to [3a8abe2f6791601f240fbf36eb1b3f9dbbab5d37]
#
============================================================
--- packages/linux/linux-rp.inc f0c317eb10cb2f40cf0bff43801c47d20836ed32
+++ packages/linux/linux-rp.inc 3a8abe2f6791601f240fbf36eb1b3f9dbbab5d37
@@ -13,7 +13,6 @@ TKSRC = "http://www.informatik.hu-berlin
CHSRC = "http://oz.drigon.com/patches"
TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
-EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
COMPATIBLE_HOST = "(arm|i.86).*-linux"
COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86|htcuniversal)'
@@ -45,16 +44,13 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT
CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"
###############################################################
-# Enable or disable ELPP via local.conf - default is "no"
-#
-ENABLE_ELPP = '${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}'
-
-###############################################################
# module configs specific to this kernel
#
-module_autoload_ohci-hcd_tosa = "ohci-hcd"
module_autoload_pxaficp_ir = "pxaficp_ir"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_pcmcia_core = "pcmcia_core"
+module_autoload_pxa2xx_cs = "pxa2xx_cs"
+module_autoload_ohci-hcd_tosa = "ohci-hcd"
module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi"
module_autoload_snd-soc-spitz_akita = "snd-soc-spitz"
module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz"
@@ -96,15 +92,6 @@ do_configure() {
echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
- #if [ "${ENABLE_ELPP}" = "yes" ]; then
- # echo "# Enhanced Linux Progress Patch" >> ${S}/.config
- # echo "CONFIG_FB_ELPP=y" >> ${S}/.config
- # echo "CONFIG_LOGO=y" >> ${S}/.config
- # echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config
- #else
- # echo "# CONFIG_FB_ELPP is not set" >> ${S}/.config
- #fi
-
if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
echo "CONFIG_AEABI=y" >> ${S}/.config
echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
@@ -113,29 +100,8 @@ do_configure() {
echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
fi
- if [ "${DISTRO}" = "openzaurus" -a "${MACHINE}" != "collie" ]; then
- case ${MACHINE} in
- c7x0 | akita | spitz )
- echo "CONFIG_LOGO_OZ640_CLUT224=y" >> ${S}/.config
- echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
- echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
- ;;
- tosa )
- echo "CONFIG_LOGO_OZ480_CLUT224=y" >> ${S}/.config
- echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
- echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
- ;;
- poodle | collie )
- echo "CONFIG_LOGO_OZ240_CLUT224=y" >> ${S}/.config
- echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
- echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
- ;;
- esac
+ if [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then
echo "CONFIG_LOGO=y" >> ${S}/.config
- echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
- echo "# CONFIG_LOGO_OHAND_CLUT224 is not set" >> ${S}/.config
- elif [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then
- echo "CONFIG_LOGO=y" >> ${S}/.config
echo "CONFIG_LOGO_OHAND_CLUT224=y" >> ${S}/.config
echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
@@ -196,8 +162,7 @@ do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME}
cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_SYMLINK_NAME}
- ln -s ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME}
+ ln -sf ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME}
tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib
}
#
# mt diff -rb968656776ab23ced6e8710b760e509bfc537fe1 -r550fa1f65575fd511a7c73802cabf4e8d3e8426b
#
#
#
# add_file "packages/opie-todo/files/gcc-syntax-fix.patch"
# content [928cf46eba32a67339dcc2f1a92649098356a029]
#
# patch "packages/gsm/files/gsmd"
# from [0e44967ffb2d602f531bea0cde6006d337dc4cf8]
# to [a0382c9880f568f23f6fb0fb4ad912ceaab45cc5]
#
# patch "packages/opie-todo/opie-todo_1.2.3.bb"
# from [fa5692c1c78a3154de141f5a42ac10a434d5134c]
# to [b18e452c738f481bbe600dafbef96cca4254ca0c]
#
============================================================
--- packages/opie-todo/files/gcc-syntax-fix.patch 928cf46eba32a67339dcc2f1a92649098356a029
+++ packages/opie-todo/files/gcc-syntax-fix.patch 928cf46eba32a67339dcc2f1a92649098356a029
@@ -0,0 +1,17 @@
+diff --git a/quickedit.h b/quickedit.h
+index a479d9e..dc798b3 100644
+--- a/quickedit.h
++++ b/quickedit.h
+@@ -41,9 +41,9 @@ using Opie::OPimTodo;
+ namespace Todo{
+ class MainWindow;
+ struct QuickEditBase {
+- virtual OPimTodo todo()const = 0l;
+- virtual QSignal* signal() = 0l;
+- virtual QWidget* widget() = 0l;
++ virtual OPimTodo todo()const = 0;
++ virtual QSignal* signal() = 0;
++ virtual QWidget* widget() = 0;
+ };
+ /*
+ * this is my second try
============================================================
--- packages/gsm/files/gsmd 0e44967ffb2d602f531bea0cde6006d337dc4cf8
+++ packages/gsm/files/gsmd a0382c9880f568f23f6fb0fb4ad912ceaab45cc5
@@ -1,4 +1,4 @@
-##!/bin/sh
+#! /bin/sh
#
# gsmd This shell script starts and stops gsmd.
#
@@ -37,13 +37,11 @@ case "$1" in
restart|force-reload)
$0 stop
$0 start
- exit
;;
*)
- echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+ echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
exit 1
;;
esac
exit 0
-
============================================================
--- packages/opie-todo/opie-todo_1.2.3.bb fa5692c1c78a3154de141f5a42ac10a434d5134c
+++ packages/opie-todo/opie-todo_1.2.3.bb b18e452c738f481bbe600dafbef96cca4254ca0c
@@ -1,7 +1,8 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};m
require ${PN}.inc
PR = "r0"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ file://unbreak-logging.patch;patch=1 \
+ file://gcc-syntax-fix.patch;patch=1"
- file://unbreak-logging.patch;patch=1"
More information about the Openembedded-commits
mailing list