[oe-commits] org.oe.dev merge of '676ed5b61806189cd1aeea21920d3c8fa842f8c7'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Jan 8 00:33:15 UTC 2008
merge of '676ed5b61806189cd1aeea21920d3c8fa842f8c7'
and 'f556521018478109967b108bb830f8109aefbb0e'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 562c973381fd0816ab9bc3ab53a276a6c274c8b2
ViewMTN: http://monotone.openembedded.org/revision/info/562c973381fd0816ab9bc3ab53a276a6c274c8b2
Files:
1
packages/linux/linux-rp-2.6.16
packages/linux/linux-rp-2.6.16/00-hostap.patch
packages/linux/linux-rp-2.6.16/10-pcnet.patch
packages/linux/linux-rp-2.6.16/add-oz-release-string.patch
packages/linux/linux-rp-2.6.16/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.16/defconfig-akita
packages/linux/linux-rp-2.6.16/defconfig-c7x0
packages/linux/linux-rp-2.6.16/defconfig-collie
packages/linux/linux-rp-2.6.16/defconfig-hx2000
packages/linux/linux-rp-2.6.16/defconfig-poodle
packages/linux/linux-rp-2.6.16/defconfig-qemuarm
packages/linux/linux-rp-2.6.16/defconfig-spitz
packages/linux/linux-rp-2.6.16/defconfig-tosa
packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp-2.6.16/locomo-kbd-hotkeys.patch
packages/linux/linux-rp-2.6.16/locomo-lcd-def-bightness.patch
packages/linux/linux-rp-2.6.16/locomo-sysrq+keyrepeat.patch
packages/linux/linux-rp-2.6.16/maxpower-message.patch
packages/linux/linux-rp-2.6.16/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.16/rmk-mmc1.patch
packages/linux/linux-rp-2.6.16/rmk-mmc2.patch
packages/linux/linux-rp-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.16/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.17
packages/linux/linux-rp-2.6.17/00-hostap.patch
packages/linux/linux-rp-2.6.17/10-pcnet.patch
packages/linux/linux-rp-2.6.17/add-oz-release-string.patch
packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch
packages/linux/linux-rp-2.6.17/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.17/defconfig-akita
packages/linux/linux-rp-2.6.17/defconfig-c7x0
packages/linux/linux-rp-2.6.17/defconfig-collie
packages/linux/linux-rp-2.6.17/defconfig-hx2000
packages/linux/linux-rp-2.6.17/defconfig-poodle
packages/linux/linux-rp-2.6.17/defconfig-qemuarm
packages/linux/linux-rp-2.6.17/defconfig-qemux86
packages/linux/linux-rp-2.6.17/defconfig-spitz
packages/linux/linux-rp-2.6.17/defconfig-tosa
packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
packages/linux/linux-rp-2.6.17/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.17/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.17/tosa-lcdnoise-r0.patch
packages/linux/linux-rp-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch
packages/linux/linux-rp-2.6.17/wm9712-reset-loop-r2.patch
packages/linux/linux-rp-2.6.17/wm9712-suspend-cold-res-r2.patch
packages/linux/linux-rp-2.6.17/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp-2.6.21
packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch
packages/linux/linux-rp-2.6.21/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.21/defconfig-akita
packages/linux/linux-rp-2.6.21/defconfig-bootcdx86
packages/linux/linux-rp-2.6.21/defconfig-c7x0
packages/linux/linux-rp-2.6.21/defconfig-collie
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-2.6.21/hostap-monitor-mode.patch
packages/linux/linux-rp-2.6.21/orinoco-remove-all-which-are-in-hostap-HACK.patch
packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.21/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.21/sharpsl-rc-r1.patch
packages/linux/linux-rp-2.6.21/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.21/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
packages/linux/linux-rp-2.6.21/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp_2.6.16.bb
packages/linux/linux-rp_2.6.17.bb
packages/linux/linux-rp_2.6.21.bb
packages/cmake/cmake-native_2.2.3.bb
packages/cmake/cmake.inc
packages/linux/linux-ixp4xx/defconfig-2.6.23.8
packages/linux/linux-ixp4xx/defconfig-2.6.23.12
packages/linux/linux-ixp4xx_2.6.23.8.bb
packages/linux/linux-ixp4xx_2.6.23.12.bb
packages/cmake/cmake-native_2.4.7.bb
packages/cmake/cmake_2.4.7.bb
packages/distcc/files/no-man.patch
packages/python/python-pyqt/assistantclient-fix.patch
classes/base.bbclass
classes/opie_i18n.bbclass
classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass
classes/sanity.bbclass
conf/checksums.ini
conf/distro/include/sane-srcrevs.inc
contrib/mtn2git/mtn2git.py
contrib/mtn2git/status.py
packages/distcc/distcc_2.18.3.bb
packages/docbook-utils/docbook-utils-native_0.6.13.bb
packages/dpkg/dpkg.inc
packages/flite/flite.inc
packages/flite/flite_1.2.bb
packages/flite/flite_1.3.bb
packages/freenote/freenote_1.12.0.bb
packages/gnome-mplayer/gnome-mplayer_cvs.bb
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/helloworld/helloworld_1.0.0.bb
packages/kdepimpi/kdepimpi-base.inc
packages/knights/knights_1.14.bb
packages/linux/linux-ixp4xx.inc
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-collie
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb
packages/mgetty/mgetty_1.1.30.bb
packages/nonworking/imkit/imkit_0.4.5.bb
packages/nunome/nunome_1.0.2.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/python/python-pyqt_4.3.3.bb
packages/python/python24-pyqt2_3.13.bb
packages/python/python24-pyqwt2_3.10.bb
packages/qmake/qmake2-native.inc
packages/qpe-games/crossword_0.0.3.bb
packages/qpegps/qpegps.inc
packages/qpegps/qpegps_0.9.2.3.3.bb
packages/qpegps/qpegps_0.9.3.1.bb
packages/qpegps/qpegps_svn.bb
packages/slutils/slutils_0.1.0.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
packages/u-boot/u-boot-openmoko_svn.bb
Diffs:
#
# mt diff -r676ed5b61806189cd1aeea21920d3c8fa842f8c7 -r562c973381fd0816ab9bc3ab53a276a6c274c8b2
#
#
#
# delete "packages/linux/linux-rp-2.6.16"
#
# delete "packages/linux/linux-rp-2.6.16/00-hostap.patch"
#
# delete "packages/linux/linux-rp-2.6.16/10-pcnet.patch"
#
# delete "packages/linux/linux-rp-2.6.16/add-oz-release-string.patch"
#
# delete "packages/linux/linux-rp-2.6.16/connectplus-remove-ide-HACK.patch"
#
# delete "packages/linux/linux-rp-2.6.16/defconfig-akita"
#
# delete "packages/linux/linux-rp-2.6.16/defconfig-c7x0"
#
# delete "packages/linux/linux-rp-2.6.16/defconfig-collie"
#
# delete "packages/linux/linux-rp-2.6.16/defconfig-hx2000"
#
# delete "packages/linux/linux-rp-2.6.16/defconfig-poodle"
#
# delete "packages/linux/linux-rp-2.6.16/defconfig-qemuarm"
#
# delete "packages/linux/linux-rp-2.6.16/defconfig-spitz"
#
# delete "packages/linux/linux-rp-2.6.16/defconfig-tosa"
#
# delete "packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch"
#
# delete "packages/linux/linux-rp-2.6.16/locomo-kbd-hotkeys.patch"
#
# delete "packages/linux/linux-rp-2.6.16/locomo-lcd-def-bightness.patch"
#
# delete "packages/linux/linux-rp-2.6.16/locomo-sysrq+keyrepeat.patch"
#
# delete "packages/linux/linux-rp-2.6.16/maxpower-message.patch"
#
# delete "packages/linux/linux-rp-2.6.16/pxa-serial-hack.patch"
#
# delete "packages/linux/linux-rp-2.6.16/rmk-mmc1.patch"
#
# delete "packages/linux/linux-rp-2.6.16/rmk-mmc2.patch"
#
# delete "packages/linux/linux-rp-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
#
# delete "packages/linux/linux-rp-2.6.16/squashfs3.0-2.6.15.patch"
#
# delete "packages/linux/linux-rp-2.6.17"
#
# delete "packages/linux/linux-rp-2.6.17/00-hostap.patch"
#
# delete "packages/linux/linux-rp-2.6.17/10-pcnet.patch"
#
# delete "packages/linux/linux-rp-2.6.17/add-oz-release-string.patch"
#
# delete "packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch"
#
# delete "packages/linux/linux-rp-2.6.17/connectplus-remove-ide-HACK.patch"
#
# delete "packages/linux/linux-rp-2.6.17/defconfig-akita"
#
# delete "packages/linux/linux-rp-2.6.17/defconfig-c7x0"
#
# delete "packages/linux/linux-rp-2.6.17/defconfig-collie"
#
# delete "packages/linux/linux-rp-2.6.17/defconfig-hx2000"
#
# delete "packages/linux/linux-rp-2.6.17/defconfig-poodle"
#
# delete "packages/linux/linux-rp-2.6.17/defconfig-qemuarm"
#
# delete "packages/linux/linux-rp-2.6.17/defconfig-qemux86"
#
# delete "packages/linux/linux-rp-2.6.17/defconfig-spitz"
#
# delete "packages/linux/linux-rp-2.6.17/defconfig-tosa"
#
# delete "packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch"
#
# delete "packages/linux/linux-rp-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch"
#
# delete "packages/linux/linux-rp-2.6.17/pxa-serial-hack.patch"
#
# delete "packages/linux/linux-rp-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
#
# delete "packages/linux/linux-rp-2.6.17/squashfs3.0-2.6.15.patch"
#
# delete "packages/linux/linux-rp-2.6.17/tosa-lcdnoise-r0.patch"
#
# delete "packages/linux/linux-rp-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch"
#
# delete "packages/linux/linux-rp-2.6.17/wm9712-reset-loop-r2.patch"
#
# delete "packages/linux/linux-rp-2.6.17/wm9712-suspend-cold-res-r2.patch"
#
# delete "packages/linux/linux-rp-2.6.17/wm97xx-lcdnoise-r0.patch"
#
# delete "packages/linux/linux-rp-2.6.21"
#
# delete "packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch"
#
# delete "packages/linux/linux-rp-2.6.21/connectplus-remove-ide-HACK.patch"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-akita"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-bootcdx86"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-c7x0"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-collie"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-hx2000"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-poodle"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-qemuarm"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-qemux86"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-spitz"
#
# delete "packages/linux/linux-rp-2.6.21/defconfig-tosa"
#
# delete "packages/linux/linux-rp-2.6.21/hostap-monitor-mode.patch"
#
# delete "packages/linux/linux-rp-2.6.21/orinoco-remove-all-which-are-in-hostap-HACK.patch"
#
# delete "packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch"
#
# delete "packages/linux/linux-rp-2.6.21/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
#
# delete "packages/linux/linux-rp-2.6.21/sharpsl-rc-r1.patch"
#
# delete "packages/linux/linux-rp-2.6.21/squashfs3.0-2.6.15.patch"
#
# delete "packages/linux/linux-rp-2.6.21/vesafb-tng-1.0-rc2-2.6.20-rc2.patch"
#
# delete "packages/linux/linux-rp-2.6.21/wm97xx-lcdnoise-r0.patch"
#
# delete "packages/linux/linux-rp_2.6.16.bb"
#
# delete "packages/linux/linux-rp_2.6.17.bb"
#
# delete "packages/linux/linux-rp_2.6.21.bb"
#
# rename "packages/cmake/cmake-native_2.2.3.bb"
# to "packages/cmake/cmake.inc"
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.23.8"
# to "packages/linux/linux-ixp4xx/defconfig-2.6.23.12"
#
# rename "packages/linux/linux-ixp4xx_2.6.23.8.bb"
# to "packages/linux/linux-ixp4xx_2.6.23.12.bb"
#
# add_file "packages/cmake/cmake-native_2.4.7.bb"
# content [253a8635e2bef253afccbc433df9b9f65649cb40]
#
# add_file "packages/cmake/cmake_2.4.7.bb"
# content [15b0b49ebb8470a51c6d1374f3871d8bd2d8b215]
#
# add_file "packages/distcc/files/no-man.patch"
# content [d340b667a5cb5703952649cdcc5321e6e14dea85]
#
# add_file "packages/python/python-pyqt/assistantclient-fix.patch"
# content [9ca8668619cf956f78dfe1470e55f7671347a31a]
#
# patch "classes/base.bbclass"
# from [d034cdab57388cbe9087fb1c8dfd47a162e139de]
# to [583a674a3a555fcc67d3f5d898d5433b6053f2cd]
#
# patch "classes/opie_i18n.bbclass"
# from [8e209cac4778de785791dca1f5858c9afe28bfcd]
# to [b6de291923c7e9e7c0b197d62fb116b16ef9cd6c]
#
# patch "classes/rootfs_deb.bbclass"
# from [a11a09e4cbc92351c6a2152d90f32d639e23ee76]
# to [e8db3994e43f6306e9aa0a2b2d8c58e06e87b803]
#
# patch "classes/rootfs_ipk.bbclass"
# from [9a35d1bcda6049ada7a521242c47fa46ef40ee64]
# to [bf45905ffdc916560ffe662769f35387e731975b]
#
# patch "classes/sanity.bbclass"
# from [ebf6cc13d544c4d677c13e3ea8dd18655c21e172]
# to [c93bcb7294008f5c9b589ee59a39efbdb9a82616]
#
# patch "conf/checksums.ini"
# from [18e72ca2a2d5b3a7586fc3fe6bed5093235eab58]
# to [6107a0e5221d7dd5b1ba6940f49cfd2a8d3e256c]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [11acb028456fb05345111447a0655b656a67d690]
# to [6d7b2bbfb57a80d4d3d27fe559300eeca5f0af22]
#
# patch "contrib/mtn2git/mtn2git.py"
# from [f336e19760df662e35b161bf5791041c5a6e1824]
# to [ef2f536d1f3ef8e1e749df1cc8645740a9accdfd]
#
# patch "contrib/mtn2git/status.py"
# from [d3682877d9debb3e8439b6a0558bb11e6e2262b0]
# to [f6bd6e54ea9b86318ee717e4f86cc27701263844]
#
# patch "packages/cmake/cmake.inc"
# from [2619d3cba1049cef77c63787f7dba5f2b33db1fb]
# to [6d2ae923a2e4014772f56c1ccc93b209400347d9]
#
# patch "packages/distcc/distcc_2.18.3.bb"
# from [980168c7626a06af4ee3c091da786c662f16fad8]
# to [761cc7f2560dbb4f9a2c2717f0b21dd831649fb3]
#
# patch "packages/docbook-utils/docbook-utils-native_0.6.13.bb"
# from [a7ee2c212558f566489c117e06527d0e0f46fc6c]
# to [5a30863d8af8a1ace0ae926650c01cdf83d4af2e]
#
# patch "packages/dpkg/dpkg.inc"
# from [73042524486227d9936337860a313a3864cb255c]
# to [2d9820d2eae2b5362e1c7943d40e5e4252fc3983]
#
# patch "packages/flite/flite.inc"
# from [0e515e9756aeb4a250e89e9ae76603a2e466c2a9]
# to [5bb4dcb463910dfe6f9fe31bfb88baf7160a3547]
#
# patch "packages/flite/flite_1.2.bb"
# from [fb14a4e6b5f4590b49c33b5ec1ce032cffe413a7]
# to [8c135052fbbe90b46e8aa42bad184915303766fe]
#
# patch "packages/flite/flite_1.3.bb"
# from [561a0ff7fb4a9081263d72fd32c6cdd3f66add10]
# to [d0dede73dd4e7eced5a2b87fa053746ff7208827]
#
# patch "packages/freenote/freenote_1.12.0.bb"
# from [bb9baee29bfaef9ca451fcf916d745c35f21c05b]
# to [4d7ff6b9034129d3a75820e0a6d7c41bfb2230f2]
#
# patch "packages/gnome-mplayer/gnome-mplayer_cvs.bb"
# from [c34de96207774639cc00196181f1fb56aadbf586]
# to [8364ceed9a6f7763168e7bd6b5d97884a56b4015]
#
# patch "packages/gpe-session-scripts/gpe-session-scripts_0.67.bb"
# from [66c3ab86d2f892000aaad0732b969b1749d60985]
# to [e886f9c3d56e6dba00f20b02fdb8cff205713397]
#
# patch "packages/helloworld/helloworld_1.0.0.bb"
# from [1b2bf451b37e9d4a7c2ac6608651e2c41a8ba2e7]
# to [8556f8bfbf93a0f8c1005e4bb0d11a8a663fa697]
#
# patch "packages/kdepimpi/kdepimpi-base.inc"
# from [ede0b8f85fda46ba2efefb1270028763c8537951]
# to [4d7e652100ac9841e442091c7ba2ed04d465f8ba]
#
# patch "packages/knights/knights_1.14.bb"
# from [62373c66a5433266a5194728090d968c594ce599]
# to [a5ba2d28a4f7a900587b14a33bb552faa5d92f01]
#
# patch "packages/linux/linux-ixp4xx.inc"
# from [104c898701b243728e14a24a5ac89d50ede467ad]
# to [22f02122239bf39a17155973a510c77a0e4d9de9]
#
# patch "packages/linux/linux-ixp4xx_2.6.23.12.bb"
# from [5072d1cda9fcc89b0db1894b9225812ec971acc9]
# to [91f144590f8e37b3d4894d7feebebb9a022be434]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-collie"
# from [1ded8b2f91fa52cff90e08f938c3860fc94907a2]
# to [1d0a3e54d0540b9d7fb266e65df279c450fcc317]
#
# patch "packages/linux/linux-rp.inc"
# from [0754d43aed9f1733a268bc5a327d596268b601e3]
# to [fae5978f66ce47eb9bd8319f1cd9e61ed9288f26]
#
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb"
# from [d5e81e383b5b22fe28113f00aed76b14cdbccb3d]
# to [0dad9c9f8cd8741095ce3f11996fb46de85e1c66]
#
# patch "packages/mgetty/mgetty_1.1.30.bb"
# from [2119c1d587441997ccba28e0e3fba3e5bf5a8e48]
# to [844bfc2fa4af283d57f515b658047992ca7f4110]
#
# patch "packages/nonworking/imkit/imkit_0.4.5.bb"
# from [f1c5de967015632742c9f469d8047c09d060ec8c]
# to [41d3613a62710cfe6b01a1ff132d553f82f6bfbd]
#
# patch "packages/nunome/nunome_1.0.2.bb"
# from [4e108210a865069507a587476dc0c0801a48e1bc]
# to [ba3b7952f30711c4139c1af9a100322113202b8e]
#
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
# from [d37afe89e905deef090ef0996202047c614de03a]
# to [5ebf0c7982f702f7e54cd30c62e54e213188d939]
#
# patch "packages/python/python-pyqt_4.3.3.bb"
# from [4c9dd6dd767d79bb118e973d47bbda095cc45c6f]
# to [223ab1067352bfd8f64a2ce301d5cc0b02dcce43]
#
# patch "packages/python/python24-pyqt2_3.13.bb"
# from [a86c25cf42602e66a89c20552b8800b315d44ab8]
# to [f33b08fdb47711f481ac48c369d52a25cf47616f]
#
# patch "packages/python/python24-pyqwt2_3.10.bb"
# from [d73c7873c5613b17078902a2de603a34cbb06184]
# to [3ad6bd6c959096b5ed2cf1bab4edec4afcfcb7d5]
#
# patch "packages/qmake/qmake2-native.inc"
# from [fddea3b5f77f8297595bf49e8c4424d359cb4d8c]
# to [18bf1cd3568fef0b75bb3527dc1810cb148196b2]
#
# patch "packages/qpe-games/crossword_0.0.3.bb"
# from [de0992c794628f861712dad71b8b93d6813207d4]
# to [974f66cc1b2db347d67083ec116808f888a4780d]
#
# patch "packages/qpegps/qpegps.inc"
# from [ad06c195bd677200966728bcf93101e47b96eeb8]
# to [6b0786ad10c9ced24f0819dcb121c6824a0b4cf8]
#
# patch "packages/qpegps/qpegps_0.9.2.3.3.bb"
# from [5ed209f056be5ae98b7ed0041ffdc771e271b7be]
# to [020f6ea0ffbee3f4dd735009992f71dd0968f22c]
#
# patch "packages/qpegps/qpegps_0.9.3.1.bb"
# from [94d58e717e493f06eaeb86303f48c0952d98b097]
# to [31dee0d09641f8515b414c0aa0fd7432d35376f5]
#
# patch "packages/qpegps/qpegps_svn.bb"
# from [33113854f73f3efe09ce78ca8f3ff118170d1365]
# to [df4cfb3cf1278b690aa0cb71b15bc4cc5be171e6]
#
# patch "packages/slutils/slutils_0.1.0.bb"
# from [e2c26b78e55011f838bef351ef8f14571b2a352d]
# to [d2c466ef562660850455e109bf974a66908b693a]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
# from [c9837b4198cd07399be8e9f76ed051e1a9919cfe]
# to [3f44a727a1525cb60f6aa240c365271b2658798b]
#
============================================================
--- packages/cmake/cmake-native_2.4.7.bb 253a8635e2bef253afccbc433df9b9f65649cb40
+++ packages/cmake/cmake-native_2.4.7.bb 253a8635e2bef253afccbc433df9b9f65649cb40
@@ -0,0 +1,3 @@
+CMAKE_MAJOR_VERSION="2.4"
+require cmake.inc
+inherit native
============================================================
--- packages/cmake/cmake_2.4.7.bb 15b0b49ebb8470a51c6d1374f3871d8bd2d8b215
+++ packages/cmake/cmake_2.4.7.bb 15b0b49ebb8470a51c6d1374f3871d8bd2d8b215
@@ -0,0 +1,2 @@
+CMAKE_MAJOR_VERSION="2.4"
+require cmake.inc
============================================================
--- packages/distcc/files/no-man.patch d340b667a5cb5703952649cdcc5321e6e14dea85
+++ packages/distcc/files/no-man.patch d340b667a5cb5703952649cdcc5321e6e14dea85
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.in 2008-01-06 16:44:45.696595605 +0100
++++ distcc-2.18.3/Makefile.in 2008-01-06 16:44:56.879181132 +0100
+@@ -556,7 +556,7 @@
+ # install-sh can't handle multiple arguments, but we don't need any
+ # tricky features so mkinstalldirs and cp will do
+
+-install: showpaths install-doc install-man install-programs install-example @INSTALL_GNOME@
++install: showpaths install-doc install-programs install-example @INSTALL_GNOME@
+
+ install-programs: $(bin_PROGRAMS)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
============================================================
--- packages/python/python-pyqt/assistantclient-fix.patch 9ca8668619cf956f78dfe1470e55f7671347a31a
+++ packages/python/python-pyqt/assistantclient-fix.patch 9ca8668619cf956f78dfe1470e55f7671347a31a
@@ -0,0 +1,13 @@
+Index: PyQt-x11-gpl-4.3.3/sip/QtAssistant/qassistantclient.sip
+===================================================================
+--- PyQt-x11-gpl-4.3.3.orig/sip/QtAssistant/qassistantclient.sip 2008-01-07 13:31:35.000000000 +0100
++++ PyQt-x11-gpl-4.3.3/sip/QtAssistant/qassistantclient.sip 2008-01-07 13:32:20.000000000 +0100
+@@ -26,7 +26,7 @@
+ {
+
+ %TypeHeaderCode
+-#include <qassistantclient.h>
++#include <QtAssistant/qassistantclient.h>
+ %End
+
+ %ConvertToSubClassCode
============================================================
--- classes/base.bbclass d034cdab57388cbe9087fb1c8dfd47a162e139de
+++ classes/base.bbclass 583a674a3a555fcc67d3f5d898d5433b6053f2cd
@@ -906,7 +906,7 @@ def check_app_exists(app, d):
from bb import which, data
app = data.expand(app, d)
- path = data.getVar('PATH', d)
+ path = data.getVar('PATH', d, 1)
return len(which(path, app)) != 0
def check_gcc3(data):
============================================================
--- classes/opie_i18n.bbclass 8e209cac4778de785791dca1f5858c9afe28bfcd
+++ classes/opie_i18n.bbclass b6de291923c7e9e7c0b197d62fb116b16ef9cd6c
@@ -13,7 +13,7 @@ die () {
DEPENDS += "opie-i18n"
die () {
- echo -e "opie_18n: ERROR: $1"
+ printf "opie_18n: ERROR: $1\n"
exit 1
}
@@ -60,21 +60,21 @@ do_build_opie_i18n () {
package_name2="`echo "${PN}"| sed "s/^opie\-//;s/\-//"`"
test "$package_name" != "$package_name2" && I18N_FILES="${package_name}.ts lib${package_name}.ts opie-${package_name}.ts ${package_name2}.ts lib${package_name2}.ts opie-${package_name2}.ts"
test "$package_name" = "$package_name2" && I18N_FILES="${package_name}.ts lib${package_name}.ts opie-${package_name}.ts"
- echo -e "I18N Datafiles: ${I18N_FILES} (auto-detected)\nYou can overide the auto-detection by setting I18N_FILES in your .oe file"
+ printf "I18N Datafiles: ${I18N_FILES} (auto-detected)\nYou can overide the auto-detection by setting I18N_FILES in your .oe file\n"
else
echo "I18N Datafiles: ${I18N_FILES} (provided by .bb)"
fi
rm -f "${WORKDIR}/FILES.tmp" "${WORKDIR}/PACKAGES.tmp"
- echo -e "\nFILES is set to [${FILES}]\n"
+ printf "\nFILES is set to [${FILES}]\n\n"
for file in ${I18N_FILES}
do
echo "Working on [$file]"
for ts_file in `ls -1 */*.ts | egrep "/$file"`
do
- echo -e "\tCompiling [$ts_file]"
+ printf "\tCompiling [$ts_file]\n"
cd "${WORKDIR}/i18n/`dirname $ts_file`" || die "[${WORKDIR}/i18n/`dirname $ts_file`] not found"
opie-lrelease "`basename $ts_file`" || die "lrelease failed! Make sure that <inherit opie_i18n> or <inherit opie> is *below* <DEPENDS =>!"
@@ -82,7 +82,7 @@ do_build_opie_i18n () {
# to allow packaging as "_" is not allowed in a package name
lang="`echo "$ts_file" | sed -n "s#\(.*\)/\(.*\)#\1#p"`"
lang_sane="`echo "$ts_file" | sed -n "s#\(.*\)/\(.*\)#\1#p"|sed s/\_/\-/`"
- e%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf556521018478109967b108bb830f8109aefbb0e -r562c973381fd0816ab9bc3ab53a276a6c274c8b2
#
#
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [d812cd2b7484ad3d696a1616eea6e3e80706d31c]
# to [728dd133bb54e3b77f041e6046fba6405c2a6b2e]
#
============================================================
--- packages/u-boot/u-boot-openmoko_svn.bb d812cd2b7484ad3d696a1616eea6e3e80706d31c
+++ packages/u-boot/u-boot-openmoko_svn.bb 728dd133bb54e3b77f041e6046fba6405c2a6b2e
@@ -6,7 +6,7 @@ PV = "1.3.1${LOCALVERSION}"
PROVIDES = "virtual/bootloader"
LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
PV = "1.3.1${LOCALVERSION}"
-PR = "r3"
+PR = "r0"
SRCREV_FORMAT = "patches"
@@ -20,7 +20,7 @@ SRC_URI = "\
file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
file://makefile-no-dirafter.patch;patch=1 \
- file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1 \
+ file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1;maxrev=3775 \
"
S = "${WORKDIR}/git"
More information about the Openembedded-commits
mailing list