[oe-commits] org.oe.dev merge of '761183d571c60b5df965993faf1c23d3f933718b'
openmoko commit
openembedded-commits at lists.openembedded.org
Sun Sep 2 21:32:47 UTC 2007
merge of '761183d571c60b5df965993faf1c23d3f933718b'
and 'd52a54d5f2ae378fe03f9c8d4cfb66d2d6a45d41'
Author: openmoko at openembedded.org
Branch: org.openembedded.dev
Revision: dbbc63a37b09740af3c0510873a32846256aef3e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dbbc63a37b09740af3c0510873a32846256aef3e
Files:
1
conf/machine/include/LAB-settings.conf
conf/machine/include/LAB-settings.inc
conf/machine/include/collie-2.4.conf
conf/machine/include/collie-2.4.inc
conf/machine/include/collie-2.6.conf
conf/machine/include/collie-2.6.inc
conf/machine/include/ixp4xx.conf
conf/machine/include/ixp4xx.inc
conf/machine/include/lsppc.conf
conf/machine/include/lsppc.inc
conf/machine/include/motorola-ezx.conf
conf/machine/include/motorola-ezx.inc
conf/machine/include/palm.conf
conf/machine/include/palm.inc
conf/machine/include/poodle-2.6.conf
conf/machine/include/poodle-2.6.inc
conf/machine/include/qemu.conf
conf/machine/include/qemu.inc
conf/machine/include/simpad-2.4.conf
conf/machine/include/simpad-2.4.inc
conf/machine/include/simpad-2.6.conf
conf/machine/include/simpad-2.6.inc
conf/machine/include/tune-arm1136jf-s.conf
conf/machine/include/tune-arm1136jf-s.inc
conf/machine/include/tune-arm920t.conf
conf/machine/include/tune-arm920t.inc
conf/machine/include/tune-arm926ejs.conf
conf/machine/include/tune-arm926ejs.inc
conf/machine/include/tune-arm9tdmi.conf
conf/machine/include/tune-arm9tdmi.inc
conf/machine/include/tune-athlonmp.conf
conf/machine/include/tune-athlonmp.inc
conf/machine/include/tune-c3.conf
conf/machine/include/tune-c3.inc
conf/machine/include/tune-ep9312.conf
conf/machine/include/tune-ep9312.inc
conf/machine/include/tune-iwmmxt.conf
conf/machine/include/tune-iwmmxt.inc
conf/machine/include/tune-ppc405.conf
conf/machine/include/tune-ppc405.inc
conf/machine/include/tune-ppc440.conf
conf/machine/include/tune-ppc440.inc
conf/machine/include/tune-ppc440e.conf
conf/machine/include/tune-ppc440e.inc
conf/machine/include/tune-ppc603e.conf
conf/machine/include/tune-ppc603e.inc
conf/machine/include/tune-ppce500.conf
conf/machine/include/tune-ppce500.inc
conf/machine/include/tune-sh3.conf
conf/machine/include/tune-sh3.inc
conf/machine/include/tune-sh4.conf
conf/machine/include/tune-sh4.inc
conf/machine/include/tune-strongarm.conf
conf/machine/include/tune-strongarm.inc
conf/machine/include/tune-supersparc.conf
conf/machine/include/tune-supersparc.inc
conf/machine/include/tune-thumb.conf
conf/machine/include/tune-thumb.inc
conf/machine/include/tune-x86-nocona.conf
conf/machine/include/tune-x86-nocona.inc
conf/machine/include/tune-x86-prescott.conf
conf/machine/include/tune-x86-prescott.inc
conf/machine/include/tune-xscale.conf
conf/machine/include/tune-xscale.inc
packages/gnome/gnome-common
packages/gnome/gnome-common-2.18.0
packages/gnome/gnome-common_2.4.0.bb
packages/gnome/gnome-common_2.18.0.bb
packages/tinymail/tinymail_svn.bb
packages/tinymail/libtinymail_svn.bb
packages/linux/linux-rp-2.6.22
packages/angstrom/angstrom-feed-configs.bb
packages/linux/linux-rp-2.6.22/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.22/defconfig-akita
packages/linux/linux-rp-2.6.22/defconfig-bootcdx86
packages/linux/linux-rp-2.6.22/defconfig-c7x0
packages/linux/linux-rp-2.6.22/defconfig-collie
packages/linux/linux-rp-2.6.22/defconfig-htcuniversal
packages/linux/linux-rp-2.6.22/defconfig-hx2000
packages/linux/linux-rp-2.6.22/defconfig-poodle
packages/linux/linux-rp-2.6.22/defconfig-qemuarm
packages/linux/linux-rp-2.6.22/defconfig-qemux86
packages/linux/linux-rp-2.6.22/defconfig-spitz
packages/linux/linux-rp-2.6.22/defconfig-tosa
packages/linux/linux-rp-2.6.22/hostap-monitor-mode.patch
packages/linux/linux-rp-2.6.22/htcuni-acx.patch
packages/linux/linux-rp-2.6.22/htcuni.patch
packages/linux/linux-rp-2.6.22/pda-power.patch
packages/linux/linux-rp-2.6.22/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.22/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.22/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.22/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
packages/linux/linux-rp-2.6.22/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp_2.6.22.bb
packages/tinymail/libtinymail_0.0.1.bb
classes/gnome.bbclass
classes/gtk-binver.bbclass
classes/pkgconfig.bbclass
conf/checksums.ini
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom.inc
conf/machine/acern30.conf
conf/machine/akita.conf
conf/machine/amsdelta.conf
conf/machine/asus620.conf
conf/machine/asus730.conf
conf/machine/at91sam9263ek.conf
conf/machine/aximx50.conf
conf/machine/collie.conf
conf/machine/compulab-pxa270.conf
conf/machine/davinci-dvevm.conf
conf/machine/devkitidp-pxa255.conf
conf/machine/dht-walnut.conf
conf/machine/efika.conf
conf/machine/ep93xx.conf
conf/machine/epia.conf
conf/machine/eteng500.conf
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/fsg3be.conf
conf/machine/guinness.conf
conf/machine/h1910.conf
conf/machine/h1940.conf
conf/machine/h2200.conf
conf/machine/h3600.conf
conf/machine/h3900.conf
conf/machine/h4000.conf
conf/machine/h5000.conf
conf/machine/h6300.conf
conf/machine/htcalpine.conf
conf/machine/htcapache.conf
conf/machine/htcblueangel.conf
conf/machine/htchimalaya.conf
conf/machine/htcsable.conf
conf/machine/htctornado.conf
conf/machine/htcuniversal.conf
conf/machine/htcwallaby.conf
conf/machine/hx2000.conf
conf/machine/hx4700.conf
conf/machine/include/gumstix.inc
conf/machine/include/motorola-ezx-base.inc
conf/machine/include/zaurus-2.6.inc
conf/machine/ixp4xxbe.conf
conf/machine/ixp4xxle.conf
conf/machine/jornada56x.conf
conf/machine/jornada6xx.conf
conf/machine/jornada7xx.conf
conf/machine/kb9202.conf
conf/machine/ks8695.conf
conf/machine/lite5200.conf
conf/machine/logicpd-pxa270.conf
conf/machine/looxc550.conf
conf/machine/lsarm.conf
conf/machine/lsppchd.conf
conf/machine/lsppchg.conf
conf/machine/magicbox.conf
conf/machine/magician.conf
conf/machine/mainstone.conf
conf/machine/mtx-3.conf
conf/machine/mx21ads.conf
conf/machine/mx31ads.conf
conf/machine/n2100.conf
conf/machine/navman-icn330.conf
conf/machine/netbook-pro.conf
conf/machine/nokia770.conf
conf/machine/nokia800.conf
conf/machine/nslu2be.conf
conf/machine/nslu2le.conf
conf/machine/omap1510inn.conf
conf/machine/omap1610h2.conf
conf/machine/omap1710h3.conf
conf/machine/omap2420h4.conf
conf/machine/omap2430sdp.conf
conf/machine/omap5912osk.conf
conf/machine/palmld.conf
conf/machine/palmt650.conf
conf/machine/palmt680.conf
conf/machine/palmtc.conf
conf/machine/palmtt.conf
conf/machine/palmtt3.conf
conf/machine/palmtt5.conf
conf/machine/palmtx.conf
conf/machine/palmz31.conf
conf/machine/palmz71.conf
conf/machine/palmz72.conf
conf/machine/poodle.conf
conf/machine/qemuarm.conf
conf/machine/qemux86.conf
conf/machine/rx1950.conf
conf/machine/rx3000.conf
conf/machine/sarge-at91.conf
conf/machine/sequoia.conf
conf/machine/shark.conf
conf/machine/simpad.conf
conf/machine/smdk2440.conf
conf/machine/smdk2443.conf
conf/machine/storcenter.conf
conf/machine/titan.conf
conf/machine/tosa.conf
conf/machine/triton.conf
conf/machine/turbostation.conf
conf/machine/x86-32-nocona.conf
conf/machine/x86-prescott.conf
conf/machine/x86.conf
conf/machine/xilinx-ml403.conf
conf/machine/xilinx-ml410.conf
packages/eds/eds-dbus_svn.bb
packages/gnome/gnome-common-2.18.0/omf.patch
packages/gnome/libsoup_2.2.100.bb
packages/initscripts/initscripts-1.0/bootmisc.sh
packages/initscripts/initscripts-1.0/save-rtc.sh
packages/initscripts/initscripts_1.0.bb
packages/linux/linux-rp-2.6.21/defconfig-akita
packages/linux/linux-rp-2.6.21/defconfig-c7x0
packages/linux/linux-rp-2.6.21/defconfig-hx2000
packages/linux/linux-rp-2.6.21/defconfig-poodle
packages/linux/linux-rp-2.6.21/defconfig-qemuarm
packages/linux/linux-rp-2.6.21/defconfig-qemux86
packages/linux/linux-rp-2.6.21/defconfig-spitz
packages/linux/linux-rp-2.6.21/defconfig-tosa
packages/linux/linux-rp.inc
packages/qmake/qmake2-native_2.10a.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/xcalibrateext/xcalibrateext_git.bb
packages/xfce/xfce-mcs-manager.inc
packages/zaurus-updater/zaurus-updater.bb
site/arm-common
site/arm-linux
site/common
site/common-glibc
site/ix86-common
packages/tslib/tslib/e680
packages/tslib/tslib/e680/tslib.sh
packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
packages/tasks/task-openmoko.bb
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
Diffs:
#
# mt diff -r761183d571c60b5df965993faf1c23d3f933718b -rdbbc63a37b09740af3c0510873a32846256aef3e
#
#
#
# rename "conf/machine/include/LAB-settings.conf"
# to "conf/machine/include/LAB-settings.inc"
#
# rename "conf/machine/include/collie-2.4.conf"
# to "conf/machine/include/collie-2.4.inc"
#
# rename "conf/machine/include/collie-2.6.conf"
# to "conf/machine/include/collie-2.6.inc"
#
# rename "conf/machine/include/ixp4xx.conf"
# to "conf/machine/include/ixp4xx.inc"
#
# rename "conf/machine/include/lsppc.conf"
# to "conf/machine/include/lsppc.inc"
#
# rename "conf/machine/include/motorola-ezx.conf"
# to "conf/machine/include/motorola-ezx.inc"
#
# rename "conf/machine/include/palm.conf"
# to "conf/machine/include/palm.inc"
#
# rename "conf/machine/include/poodle-2.6.conf"
# to "conf/machine/include/poodle-2.6.inc"
#
# rename "conf/machine/include/qemu.conf"
# to "conf/machine/include/qemu.inc"
#
# rename "conf/machine/include/simpad-2.4.conf"
# to "conf/machine/include/simpad-2.4.inc"
#
# rename "conf/machine/include/simpad-2.6.conf"
# to "conf/machine/include/simpad-2.6.inc"
#
# rename "conf/machine/include/tune-arm1136jf-s.conf"
# to "conf/machine/include/tune-arm1136jf-s.inc"
#
# rename "conf/machine/include/tune-arm920t.conf"
# to "conf/machine/include/tune-arm920t.inc"
#
# rename "conf/machine/include/tune-arm926ejs.conf"
# to "conf/machine/include/tune-arm926ejs.inc"
#
# rename "conf/machine/include/tune-arm9tdmi.conf"
# to "conf/machine/include/tune-arm9tdmi.inc"
#
# rename "conf/machine/include/tune-athlonmp.conf"
# to "conf/machine/include/tune-athlonmp.inc"
#
# rename "conf/machine/include/tune-c3.conf"
# to "conf/machine/include/tune-c3.inc"
#
# rename "conf/machine/include/tune-ep9312.conf"
# to "conf/machine/include/tune-ep9312.inc"
#
# rename "conf/machine/include/tune-iwmmxt.conf"
# to "conf/machine/include/tune-iwmmxt.inc"
#
# rename "conf/machine/include/tune-ppc405.conf"
# to "conf/machine/include/tune-ppc405.inc"
#
# rename "conf/machine/include/tune-ppc440.conf"
# to "conf/machine/include/tune-ppc440.inc"
#
# rename "conf/machine/include/tune-ppc440e.conf"
# to "conf/machine/include/tune-ppc440e.inc"
#
# rename "conf/machine/include/tune-ppc603e.conf"
# to "conf/machine/include/tune-ppc603e.inc"
#
# rename "conf/machine/include/tune-ppce500.conf"
# to "conf/machine/include/tune-ppce500.inc"
#
# rename "conf/machine/include/tune-sh3.conf"
# to "conf/machine/include/tune-sh3.inc"
#
# rename "conf/machine/include/tune-sh4.conf"
# to "conf/machine/include/tune-sh4.inc"
#
# rename "conf/machine/include/tune-strongarm.conf"
# to "conf/machine/include/tune-strongarm.inc"
#
# rename "conf/machine/include/tune-supersparc.conf"
# to "conf/machine/include/tune-supersparc.inc"
#
# rename "conf/machine/include/tune-thumb.conf"
# to "conf/machine/include/tune-thumb.inc"
#
# rename "conf/machine/include/tune-x86-nocona.conf"
# to "conf/machine/include/tune-x86-nocona.inc"
#
# rename "conf/machine/include/tune-x86-prescott.conf"
# to "conf/machine/include/tune-x86-prescott.inc"
#
# rename "conf/machine/include/tune-xscale.conf"
# to "conf/machine/include/tune-xscale.inc"
#
# rename "packages/gnome/gnome-common"
# to "packages/gnome/gnome-common-2.18.0"
#
# rename "packages/gnome/gnome-common_2.4.0.bb"
# to "packages/gnome/gnome-common_2.18.0.bb"
#
# rename "packages/tinymail/tinymail_svn.bb"
# to "packages/tinymail/libtinymail_svn.bb"
#
# add_dir "packages/linux/linux-rp-2.6.22"
#
# add_file "packages/angstrom/angstrom-feed-configs.bb"
# content [0ea9d88230134ade107de738ba3400d561a97222]
#
# add_file "packages/linux/linux-rp-2.6.22/connectplus-remove-ide-HACK.patch"
# content [8ffef06194b29e2b22abed7edb6044a5ad4316d7]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-akita"
# content [3b4350d48675e15178efe1715de3f38002b7129d]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-bootcdx86"
# content [5558cdd18f447599d6ba549819dae3d99d919cbb]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-c7x0"
# content [74a3fb8e2f5401c826fb60ca0018e4347559ebf6]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-collie"
# content [1ded8b2f91fa52cff90e08f938c3860fc94907a2]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-htcuniversal"
# content [973595583e565c8b2fccf183b71b20418739ac36]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-hx2000"
# content [ca400be76cfeca2feb187a33538407a633e15bc5]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-poodle"
# content [48b1f25f947c9d614a87810486a63edbaaeec93b]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-qemuarm"
# content [677d6694b1fa93712c468b324b1cda3ba60d1787]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-qemux86"
# content [13ba6932d390681dfa74465511435d21ed675514]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-spitz"
# content [a320b43cc6042b445a74e623ddca9b62a6986c7f]
#
# add_file "packages/linux/linux-rp-2.6.22/defconfig-tosa"
# content [db15e2aa6464fd82b3b9a756eff0884b88791d0d]
#
# add_file "packages/linux/linux-rp-2.6.22/hostap-monitor-mode.patch"
# content [7b6d1b43c24eb7c1135e018aa8ef42f28f5ded00]
#
# add_file "packages/linux/linux-rp-2.6.22/htcuni-acx.patch"
# content [7c721d8962ce5c8541249861ae9ebb9fe132077c]
#
# add_file "packages/linux/linux-rp-2.6.22/htcuni.patch"
# content [514864241e0864887981aac9eeca794d33b7daf1]
#
# add_file "packages/linux/linux-rp-2.6.22/pda-power.patch"
# content [728868cdaa492d47a4ebe6c2120aadb4bc586dba]
#
# add_file "packages/linux/linux-rp-2.6.22/pxa-serial-hack.patch"
# content [af916d2b2561b14a1e40383de584a3a60110b5e4]
#
# add_file "packages/linux/linux-rp-2.6.22/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
# content [dd09cc9eb4d3abd338470eb2a61db0e8faf293cb]
#
# add_file "packages/linux/linux-rp-2.6.22/squashfs3.0-2.6.15.patch"
# content [ba41a51c14e2dcd2abc07591956a2a5f3f1f481e]
#
# add_file "packages/linux/linux-rp-2.6.22/vesafb-tng-1.0-rc2-2.6.20-rc2.patch"
# content [0033c2e7562c5864a973d3815e8ef5439e8bf9db]
#
# add_file "packages/linux/linux-rp-2.6.22/wm97xx-lcdnoise-r0.patch"
# content [f3d77590d33c723c46416833e88f28293f41626b]
#
# add_file "packages/linux/linux-rp_2.6.22.bb"
# content [dc29be19e8eaf4db51405bb3511a5ad4248ee05b]
#
# add_file "packages/tinymail/libtinymail_0.0.1.bb"
# content [76a20e62775e634dbe5cdbb18db3e76e05a0247d]
#
# patch "classes/gnome.bbclass"
# from [bdcbc14ad016e658c7d7fd24567face5d878b0da]
# to [32562f23ed1d1abec396b659b9a6f79394f5b0be]
#
# patch "classes/gtk-binver.bbclass"
# from [cc323de5673190cbd0ddba2a5e9c48dfd81055b9]
# to [090b062f40915666e474c6e90a0d13796fdd2cc6]
#
# patch "classes/pkgconfig.bbclass"
# from [7fbd67747ce8dbd5a57e8e7b03e4b94c34647b0c]
# to [63cdda1bfc6dad494dbd704675246aa24fc852ae]
#
# patch "conf/checksums.ini"
# from [7f11cb4cb2741628402536773c45335a59cc97d7]
# to [a08fa28c098b54cf9c6f748c8b4cf57ecf6944db]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [854daa8fca5bd432a53da00b9cfe542bb9051a48]
# to [74d52894de81c753876efd67a5bdc1df826e5c1c]
#
# patch "conf/distro/include/angstrom.inc"
# from [b77bf1ae8065f62d290b081224c4460ffb79335e]
# to [314e54232030fd4279f9794dc77445d68a4fa3ba]
#
# patch "conf/machine/acern30.conf"
# from [9c52a1cccbe17187e7b52c351948ae86e0b32e62]
# to [72106957aeed33380303ce2f91caa034d6e83682]
#
# patch "conf/machine/akita.conf"
# from [2df3dcb96666cf8cfca46aa0e7decce2a2a0fa1f]
# to [d78f90a2a5e1ad9b362e5152e6132f227e1e8839]
#
# patch "conf/machine/amsdelta.conf"
# from [7a168f5e3e89417ec384c50a70cabaa5551bee30]
# to [80e0ce75aac17e3eae00ceff82b57f7683649c47]
#
# patch "conf/machine/asus620.conf"
# from [3ec2bcaf2f3a141ac7d301ef1f1a9b0617789913]
# to [7c6cba10f4fe585713c72b9b6ee53255a0a4781c]
#
# patch "conf/machine/asus730.conf"
# from [69e2646849af8289e44ffe373f9695c42d09b026]
# to [86f13ce569d019bfda5a5ba4cd088d204b9b9c7a]
#
# patch "conf/machine/at91sam9263ek.conf"
# from [3ee1c7f18e3af408e61e46c2790a4a96784cc4f7]
# to [de1f41bf42f63494406ba30edb623326df2ef493]
#
# patch "conf/machine/aximx50.conf"
# from [72a5d88c7a8529d282176fc486b64e123da52db5]
# to [1cb21ff34a007017cdd242f2096aa1e4ef1a3b12]
#
# patch "conf/machine/collie.conf"
# from [f13a846cb39377717a6e8bb8f0a02cc543155554]
# to [8ec2568fe9cb9c9b5580adf5e26eb873400e040c]
#
# patch "conf/machine/compulab-pxa270.conf"
# from [0ae0bc3504f44c5c874639256fb2920d10ca79ce]
# to [2b6427127e8dd3428e4576ac92776a4611ca17e1]
#
# patch "conf/machine/davinci-dvevm.conf"
# from [ad3f1d36c3ae769c5772533d8f1a3c8a48db13e4]
# to [0724a4837da1f6aff6132b99c87c834f94e6fa1b]
#
# patch "conf/machine/devkitidp-pxa255.conf"
# from [f3eeff04ce7120d587a9c550eb96d829ce5fdfca]
# to [255ae16820db0a8e634aeb52d2c4d3e384462214]
#
# patch "conf/machine/dht-walnut.conf"
# from [bfbe361e5ef76bb71b1abf9414cc4b5e588d6f19]
# to [767ff97da524b39ccc11f1de9d21ab148f3a69c8]
#
# patch "conf/machine/efika.conf"
# from [0fae6d5aebbe28bdcb7256376f49eb7b44fba0c6]
# to [184e69179f6f62271e3e28383fe63d1f3da35f8e]
#
# patch "conf/machine/ep93xx.conf"
# from [6b3bccfdc5225df82c8525e77d5acaf087d7b5cb]
# to [66ed0c81801ff3e3dd107626b87414c05b2a1d63]
#
# patch "conf/machine/epia.conf"
# from [b9d513ffac950087fa7ca9ed84684b6186b32006]
# to [447a89306f42410510b6676e2e317f2a893709b4]
#
# patch "conf/machine/eteng500.conf"
# from [a250d05bdfd2830904b372bd882edc65eb668eb1]
# to [172f93ce02dbf253af7bef27c64bdfb38d791894]
#
# patch "conf/machine/fic-gta01.conf"
# from [5963b93e5d99dde03e807e1c5b13b55278626cb0]
# to [1c711840be95b64cb1a2f2235a958946d248996d]
#
# patch "conf/machine/fic-gta02.conf"
# from [4fbb158021014b4664354ac5dea7b71c8e5fd417]
# to [6429c345c220cf4df533401bcc9e3ae162c8f41a]
#
# patch "conf/machine/fsg3be.conf"
# from [0985b6fc93f5ebf67761f503ee5b6aaa1b35d3e2]
# to [b2503b2e00a33c3b2bf103346becac69d9181024]
#
# patch "conf/machine/guinness.conf"
# from [a0afdf0c7e1609a6ccdc964544650fb1848ec71d]
# to [73fc910a04f64a44077423b2ae1d4a124f4ebfdc]
#
# patch "conf/machine/h1910.conf"
# from [d8fc676782c248b44559c7b0f6935bb778ac5e35]
# to [24ca3ec1a79acd1bb022db75c3333158c8a72b58]
#
# patch "conf/machine/h1940.conf"
# from [c30a38640529c3acd8f703fa55ad67edfa26ffeb]
# to [049b100411c0eb5e07e8aa959eb355443ebc8e62]
#
# patch "conf/machine/h2200.conf"
# from [20009a5a241422421f15d37c746d94fb7ce42c9b]
# to [26ae84016d9f008f9ddece62dba5fa41dc982c31]
#
# patch "conf/machine/h3600.conf"
# from [c7d3b15dbb45c245394213ddc198aa936bb65efe]
# to [0e1eab15b3887f17c14b3a824d2c96a447d2ee3a]
#
# patch "conf/machine/h3900.conf"
# from [3b3c95e6d499cc7a07dd38d1cbdd2b05b267b82c]
# to [ba6e4bdcb26b319daae0835f4eef2c47a841fa3e]
#
# patch "conf/machine/h4000.conf"
# from [43908da203130e1aa147ed483ddda1e50cd99d9e]
# to [815610e0013bc849d757cb2b6589136864d8e04a]
#
# patch "conf/machine/h5000.conf"
# from [367aab3fcfd3df1fe3e07cb9d12ab127a5f0cc87]
# to [bb77d647234a173113a7e97b543d1059381c7257]
#
# patch "conf/machine/h6300.conf"
# from [48641608e1fe5cfd6f9233b8bd0eea9be92c1a9a]
# to [e1a2c9d17fb731040d2e84bc13ba955232d0f5c9]
#
# patch "conf/machine/htcalpine.conf"
# from [997139ee2dff935258cff496b5ce816d3056e782]
# to [f98db98a7f6a213ef95099564d36eb534dcf7e1e]
#
# patch "conf/machine/htcapache.conf"
# from [cb1409688fb5471a4dc431e5157fb7e94e3d6a24]
# to [85b3799dbf21a7bc89bc888892fb26f330a3b213]
#
# patch "conf/machine/htcblueangel.conf"
# from [54400a45483dcfe44328405f2925ebb85c1add59]
# to [e65ecf996a1d84af3f34a86f70afe617dec9e302]
#
# patch "conf/machine/htchimalaya.conf"
# from [a0904b8ded1cea237c6175d0c6c6d85d527247be]
# to [e402ae7923faf0ef767e500842820754adf95d26]
#
# patch "conf/machine/htcsable.conf"
# from [7239f3067b521a987c159b5188b080d36f4bd2c5]
# to [e839db7ced3fc8ad5fa110b108879d7deb946433]
#
# patch "conf/machine/htctornado.conf"
# from [91eae5c7c70a2f75414882e68a9e315824e89d85]
# to [92930583820f744123783398b9289029467426bb]
#
# patch "conf/machine/htcuniversal.conf"
# from [4d1341f27ea5a29d604a458fb6974a2aa4fc933c]
# to [43f093279581726335ce51c61212c3e9e06fab8d]
#
# patch "conf/machine/htcwallaby.conf"
# from [1aa710bea907b5e57d65cc2cea7f14ded372c633]
# to [6197c7cff0cafc821c99e4e46921fb8cf0e4e1b4]
#
# patch "conf/machine/hx2000.conf"
# from [a3696733b0f44f3e26fbb5dff6befb8f69462535]
# to [4c388078f8a393457e2d370a6d0b8321e53a27dc]
#
# patch "conf/machine/hx4700.conf"
# from [7fc3dbf7c795d1c23929a02c6fb2d560d8674018]
# to [179a54e56304f0ee92e6d3fb8e9df9d6cc4d9eed]
#
# patch "conf/machine/include/gumstix.inc"
# from [4f23fdf13b573be4f10b1cecd95b3977df99b4d7]
# to [a9b8b761a9a47e6df416c842987c359d772d4580]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [7b779edc9fd8828894f616345b80dbf28d8d9fee]
# to [5b66cf8defe8eb514bdb3f0eeb2d69b870a8f2b1]
#
# patch "conf/machine/include/lsppc.inc"
# from [5c03f9e242ae8597343a6a9f4eb2206eb9fb9ec4]
# to [7f1dc9a105f2190f55613b5995313303818f0095]
#
# patch "conf/machine/include/motorola-ezx-base.inc"
# from [cc3e17c47e1d7e85bab4623332d8971fa96d76ad]
# to [8bbf6fcb6d743ec82eee5c17d5c1d5de771d769b]
#
# patch "conf/machine/include/palm.inc"
# from [331af80bcf618ef789a759aa1dcf21d38ffa3496]
# to [166ae8b4b06d4c97637ae03d01c773ace2a78f09]
#
# patch "conf/machine/include/qemu.inc"
# from [822cfa4ccc59e353b0a4c3b38015b20e6135aa0b]
# to [298c9ee68a35039a8a520bff72b70c1f9f939c4a]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [139d86a1bf9e6a09586996371439ca744c3a4c8e]
# to [7baf3e010a9649ace2bc8172df240209ae4c83f0]
#
# patch "conf/machine/ixp4xxbe.conf"
# from [bde9db3ec0ec183465c84d2be6e295876a8b4774]
# to [297e8b7edcc6650926cd84c561cfaca5624ecf98]
#
# patch "conf/machine/ixp4xxle.conf"
# from [2a641ad0d5809065fd9222425c51adcdb5479469]
# to [d3fcaaebf886408cb836d83b34cfb379a4e3f527]
#
# patch "conf/machine/jornada56x.conf"
# from [011e3d847c731bb0b3a7580ca9c86c761c93f699]
# to [feef2730324948026b5302d47b01bae79fa6bc39]
#
# patch "conf/machine/jornada6xx.conf"
# from [8f522e35bd2e966906ebfb0711b4fbe30475bea5]
# to [b17e1ecf2b7a98288b82648ad9c4723b9124a0bf]
#
# patch "conf/machine/jornada7xx.conf"
# from [2861d8915577285483e72b73452f7ee14fd58b51]
# to [c41cc23268b4ae13d751e61be124cbce148e220b]
#
# patch "conf/machine/kb9202.conf"
# from [796cb3dca2995c5538dfdf811eb1d8ed0b4d8a73]
# to [bfe5bd6a1366a6a94f3d9e5a11854862cef6dafe]
#
# patch "conf/machine/ks8695.conf"
# from [3eb7daa5e0c6ce816343843c5328d5ae52b0a38a]
# to [451bc0a8ca8cfbcb51ece50306e85bbf55894bd3]
#
# patch "conf/machine/lite5200.conf"
# from [625a093bf82d2f0fdc20fc83dc13ab5b464f1e98]
# to [550cccbf194154fc45f7741e90fac591a15f54b0]
#
# patch "conf/machine/logicpd-pxa270.conf"
# from [d98939902914888d95c13a1dba125d8795c27eb3]
# to [a32dc872b345f6f560fcd16768772403b487d5fb]
#
# patch "conf/machine/looxc550.conf"
# from [6359ad9d0de70d918a9008fc0b5f95adeaf74dff]
# to [529a76fa9a251dc8860a581573be21b93a713c79]
#
# patch "conf/machine/lsarm.conf"
# from [b44af64a4287c6712e40083f19df42bce256abcd]
# to [d394193bdeced3417b65be1f2d80b14c4896f695]
#
# patch "conf/machine/lsppchd.conf"
# from [66ab01c3b12b071b4a8941ae4cea93d058ce052a]
# to [120dfa210ca86ec82ddf98877f947afc5ab9474f]
#
# patch "conf/machine/lsppchg.conf"
# from [e7f65b1ce266c2acebb3896110cb4c93ed9076ce]
# to [d6a73f2b2be33f579872c0a9d7559b5316a423d8]
#
# patch "conf/machine/magicbox.conf"
# from [c6ff5832b2cb08decf745a438d09dd6db1e30f72]
# to [258d65a553b998a591c90af66c6065e4c922738a]
#
# patch "conf/machine/magician.conf"
# from [d3eace552477d42a45705e3431b858974e0578b6]
# to [8fdf0542994a9fd288727dc5edcbfdf644e0e5a6]
#
# patch "conf/machine/mainstone.conf"
# from [a64eca004c780be5fda61467640365b38559d53e]
# to [134b815b2cb6f8a28e428420e907a46d4d279dd1]
#
# patch "conf/machine/mtx-3.conf"
# from [1bebf44c7181c6a92290d5a15409fe55e7dd8a8c]
# to [9b9e036a4a7a89d9b599440014d3c63acfdfbe39]
#
# patch "conf/machine/mx21ads.conf"
# from [c3ed8d859b485ac2c7454f91345f7c2b5a2962c8]
# to [f1a41fc57c7323cd253075a108fab1e208a606e6]
#
# patch "conf/machine/mx31ads.conf"
# from [e56b6fc4dd37c85e55a1dde5e1dd117e35f50e28]
# to [16e503%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd52a54d5f2ae378fe03f9c8d4cfb66d2d6a45d41 -rdbbc63a37b09740af3c0510873a32846256aef3e
#
#
#
# delete "packages/tslib/tslib/e680"
#
# delete "packages/tslib/tslib/e680/tslib.sh"
#
# add_file "packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb"
# content [495850358f832a2fcc80aa7cf6bb796acea8fc42]
#
# patch "conf/machine/fic-gta01.conf"
# from [e38e4b95eed91eaa9a8b705b4a9a1ddc5f1777c1]
# to [1c711840be95b64cb1a2f2235a958946d248996d]
#
# patch "conf/machine/fic-gta02.conf"
# from [4bc00e80387c5c85d2a4ae3427cb56434e260f07]
# to [6429c345c220cf4df533401bcc9e3ae162c8f41a]
#
# patch "conf/machine/include/motorola-ezx-base.inc"
# from [e694aa079715c70b67eaae8ea8f6860bfc3e4a04]
# to [8bbf6fcb6d743ec82eee5c17d5c1d5de771d769b]
#
# patch "packages/tasks/task-openmoko.bb"
# from [d07b9cd90e2a77b275934886cf40b954014b09c2]
# to [42cdffc8a3ad775182f6a319ca88cd8a0230c625]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
# from [eeb36e59b49d025119f1c675d7a876dc144a9de3]
# to [86b0b241fd7f1d69eb6b419725d06c0b83c622bc]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [f577f4abd5a0266a816f433ba1f52d27966848b8]
# to [23aa4a6fe757122a344302dbed566ea29a6b4f5e]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [c83be1216b1a852eff7f8d4ec37b350cce95f3b0]
# to [fdeb17ae69a5b4e0f75d5465ad49c3c492da548f]
#
============================================================
--- packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb 495850358f832a2fcc80aa7cf6bb796acea8fc42
+++ packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb 495850358f832a2fcc80aa7cf6bb796acea8fc42
@@ -0,0 +1,26 @@
+DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, QVGA edition"
+SECTION = "openmoko/base"
+RCONFLICTS = "openmoko-theme-standard"
+RPROVIDES = "openmoko-theme-standard-2"
+PV = "0.1.0+${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2-qvga;proto=http"
+S = "${WORKDIR}/openmoko-standard-2-qvga"
+
+do_install() {
+ find ${WORKDIR} -name ".svn" | xargs rm -rf
+ install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0
+ cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
+ rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
+
+ install -d ${D}${sysconfdir}/gtk-2.0
+ echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
+}
+
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir} ${sysconfdir}"
============================================================
--- conf/machine/fic-gta01.conf e38e4b95eed91eaa9a8b705b4a9a1ddc5f1777c1
+++ conf/machine/fic-gta01.conf 1c711840be95b64cb1a2f2235a958946d248996d
@@ -11,6 +11,10 @@ MACHINE_FEATURES = "kernel26 apm alsa bl
UBOOT_ENTRYPOINT = "30008000"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "285"
# package machine specific modules
MACHINE_EXTRA_RRECOMMENDS = "\
============================================================
--- conf/machine/fic-gta02.conf 4bc00e80387c5c85d2a4ae3427cb56434e260f07
+++ conf/machine/fic-gta02.conf 6429c345c220cf4df533401bcc9e3ae162c8f41a
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
#@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973.2 GSM phone
+#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
@@ -11,6 +11,10 @@ MACHINE_FEATURES = "kernel26 apm alsa bl
UBOOT_ENTRYPOINT = "30008000"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "285"
# package machine specific modules
MACHINE_EXTRA_RRECOMMENDS = "\
============================================================
--- conf/machine/include/motorola-ezx-base.inc e694aa079715c70b67eaae8ea8f6860bfc3e4a04
+++ conf/machine/include/motorola-ezx-base.inc 8bbf6fcb6d743ec82eee5c17d5c1d5de771d769b
@@ -1,4 +1,3 @@
-
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
@@ -16,9 +15,14 @@ MACHINE_FEATURES = "kernel26 touchscreen
MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-#the EZX phones need a userspace daemon to stop the BP from shutting down the phone
+# the EZX phones need a userspace daemon to stop the BP from shutting down the phone
MACHINE_EXTRA_RDEPENDS += "opentapi"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "180"
+
ROOT_FLASH_SIZE = "24"
EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
============================================================
--- packages/tasks/task-openmoko.bb d07b9cd90e2a77b275934886cf40b954014b09c2
+++ packages/tasks/task-openmoko.bb 42cdffc8a3ad775182f6a319ca88cd8a0230c625
@@ -68,14 +68,25 @@ RDEPENDS_task-openmoko-ui = "\
settings-daemon \
\
openmoko-session2 \
- openmoko-theme-standard2 \
- openmoko-icon-theme-standard2 \
openmoko-sound-system \
openmoko-sound-theme-standard \
neod \
gpe-scap \
"
+# handle theming. FIXME: properly use machine database in a smart way,
+# taking into account not only size but also PPI! Ultimately this might
+# need recomputing some theme files and images on-the-fly :/ SVG and logical
+# theme description anyone?
+THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
+THEMES_a780 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_e680 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_a1200 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_rokr2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_rokr6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+
+RDEPENDS_task-openmoko-ui += "${THEMES}"
+
#
# task-openmoko-base
#
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/Xserver eeb36e59b49d025119f1c675d7a876dc144a9de3
+++ packages/xserver-kdrive-common/xserver-kdrive-common/Xserver 86b0b241fd7f1d69eb6b419725d06c0b83c622bc
@@ -74,8 +74,7 @@ case `module_id` in
*Poodle)
ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
*Collie)
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270"
- ;;
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
ARGS="$ARGS -dpi 200 -rgba rgb" ;;
"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
@@ -90,23 +89,23 @@ case `module_id` in
ARGS="$ARGS -dpi 142" ;;
"HTC Universal")
ARGS="$ARGS -dpi 225 -screen 480x640 at 270" ;;
- "ARM-IntegratorCP" | "ARM-Versatile PB")
- ARGS="$ARGS -rgba vrgb" ;;
- "Compulab CM-x270")
+ "ARM-IntegratorCP" | "ARM-Versatile PB")
+ ARGS="$ARGS -rgba vrgb" ;;
+ "Compulab CM-x270")
modprobe mbxfb
- ARGS="$ARGS -fb /dev/fb1"
- ;;
- "GTA01")
+ ARGS="$ARGS -fb /dev/fb1" ;;
+ "GTA01" | "GTA02")
ARGS="$ARGS -dpi 285 -screen 480x640" ;;
"Nokia N800")
- ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+ ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+ "Motorola Ezx Platform")
+ ARGS="$ARGS -dpi 170 -screen 240x320" ;;
*)
- # Its a device we dont know about - in which case force
- # kdrive to use the current framebuffer geometry otherwise
- # it will defualt to trying to achieve 1024x768
+ # It is a device we do not know about, in which case we force
+ # kdrive to use the current framebuffer geometry -- otherwise
+ # it will default to trying to achieve 1024x768
S=`fallback_screen_arg`
- ARGS="$ARGS -screen $S"
- ;;
+ ARGS="$ARGS -screen $S" ;;
esac
DISPLAY=':0'
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver f577f4abd5a0266a816f433ba1f52d27966848b8
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 23aa4a6fe757122a344302dbed566ea29a6b4f5e
@@ -24,8 +24,6 @@ fi
. /etc/profile
-
-
fallback_screen_arg() {
geom=`fbset | grep geometry`
w=`echo $geom | awk '{ print $2 }'`
@@ -90,23 +88,23 @@ case `module_id` in
ARGS="$ARGS -br -dpi 142" ;;
"HTC Universal")
ARGS="$ARGS -br -dpi 225 -screen 480x640 at 270" ;;
- "ARM-IntegratorCP" | "ARM-Versatile PB")
- ARGS="$ARGS -br -rgba vrgb" ;;
- "Compulab CM-x270")
+ "ARM-IntegratorCP" | "ARM-Versatile PB")
+ ARGS="$ARGS -br -rgba vrgb" ;;
+ "Compulab CM-x270")
modprobe mbxfb
- ARGS="$ARGS -br -fb /dev/fb1"
- ;;
+ ARGS="$ARGS -br -fb /dev/fb1" ;;
"GTA01" | "GTA02")
ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
+ "Motorola Ezx Platform")
+ ARGS="$ARGS -dpi 170 -screen 240x320 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
"Nokia N800")
- ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
- *)
- # Its a device we dont know about - in which case force
- # kdrive to use the current framebuffer geometry otherwise
- # it will defualt to trying to achieve 1024x768
- S=`fallback_screen_arg`
- ARGS="$ARGS -screen $S"
- ;;
+ ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+ *)
+ # It is a device we do not know about, in which case we force
+ # kdrive to use the current framebuffer geometry -- otherwise
+ # it will default to trying to achieve 1024x768
+ S=`fallback_screen_arg`
+ ARGS="$ARGS -screen $S" ;;
esac
DISPLAY=':0'
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb c83be1216b1a852eff7f8d4ec37b350cce95f3b0
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb fdeb17ae69a5b4e0f75d5465ad49c3c492da548f
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r17"
+PR = "r18"
SRC_URI = "\
file://Xdefaults \
More information about the Openembedded-commits
mailing list