[oe-commits] org.oe.dev merge of '1458e9ca6c6d9b78bff4114c4a3b09c7aa6b7a8e'
pfalcon commit
oe at amethyst.openembedded.net
Mon Mar 17 08:53:40 UTC 2008
merge of '1458e9ca6c6d9b78bff4114c4a3b09c7aa6b7a8e'
and 'df907de16e9f058a9d98b4ee458c93e7c4965a9c'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 478c13f37cd870d9bbc551cd4d7b43ee8c795195
ViewMTN: http://monotone.openembedded.org/revision/info/478c13f37cd870d9bbc551cd4d7b43ee8c795195
Files:
1
packages/gstreamer/gst-plugins-bad_0.10.3.bb
packages/gstreamer/gst-plugins-bad_0.10.5.bb
packages/gstreamer/gst-plugins-base_0.10.12.bb
packages/gstreamer/gst-plugins-base_0.10.14.bb
packages/gstreamer/gst-plugins-good_0.10.6.bb
packages/gstreamer/gstreamer_0.10.12.bb
packages/gstreamer/gstreamer_0.10.14.bb
packages/libol/libol_0.3.16.bb
packages/nano/nano-1.2.1
packages/nano/nano-1.2.1/configure.patch
packages/nano/nano-1.2.1/glib.m4
packages/nano/nano_1.2.1.bb
packages/ncurses/ncurses_5.3.bb
packages/starling/starling_0.1.bb
packages/starling/starling_0.2.bb
packages/aircrack/aircrack-ng_0.9.1.bb
packages/aircrack/aircrack-ng_0.9.3.bb
packages/gstreamer/gst-plugins-good_0.10.5.bb
packages/gstreamer/gst-plugins-good_0.10.7.bb
packages/gstreamer/gst-plugins-ugly_0.10.6.bb
packages/gstreamer/gst-plugins-ugly_0.10.7.bb
packages/nano/nano-2.0.6
packages/nano/files
packages/nano/nano_2.0.6.bb
packages/nano/nano_2.0.7.bb
packages/apr/apr
packages/apr/apr-util
packages/c-nc
packages/dt
packages/libgee
packages/libgee/files
packages/linux/linux-mainstone
packages/linux/linux-mainstone/mainstone
packages/pv
packages/pwgen
packages/apr/apr/configure_fixes.patch
packages/apr/apr-util/configure_fixes.patch
packages/apr/apr-util_1.2.12.bb
packages/apr/apr_1.2.12.bb
packages/c-nc/c-nc_0.5.bb
packages/dt/dt_15.14.bb
packages/gstreamer/gst-plugins-bad_0.10.6.bb
packages/gtk-webcore/midori_0.0.17.bb
packages/libgee/files/no-tests.patch
packages/libgee/libgee_0.1.2.bb
packages/libtool/libtool.inc
packages/linux/linux-mainstone/mainstone/defconfig
packages/linux/linux-mainstone/mainstone-keypad.patch
packages/linux/linux-mainstone_2.6.25-rc4.bb
packages/pv/pv_1.1.4.bb
packages/pwgen/pwgen_2.06.bb
packages/speech-dispatcher/files/configure_fix.patch
packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch
packages/wireless-tools/wireless-tools_29.bb
site/common-linux
classes/package_deb.bbclass
classes/package_ipk.bbclass
classes/qmake2.bbclass
classes/qtopia4core.bbclass
classes/rm_work.bbclass
classes/seppuku.bbclass
classes/siteinfo.bbclass
conf/bitbake.conf
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
conf/machine/at32stk1000.conf
conf/machine/atngw100.conf
conf/machine/mainstone.conf
packages/apr/apr-util_1.2.7.bb
packages/apr/apr_1.2.7.bb
packages/e2fsprogs/e2fsprogs.inc
packages/e2fsprogs/e2fsprogs_1.38.bb
packages/espeak/espeak_1.30.bb
packages/gcc/gcc-cross-initial.inc
packages/gnutls/gnutls.inc
packages/gnutls/gnutls_1.4.5.bb
packages/gnutls/gnutls_1.6.3.bb
packages/gstreamer/gst-plugins.inc
packages/libol/libol_0.3.18.bb
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-cross_1.5.22.bb
packages/libtool/libtool-cross_1.5.24.bb
packages/libtool/libtool-native_1.5.10.bb
packages/libtool/libtool-native_1.5.22.bb
packages/libtool/libtool-native_1.5.24.bb
packages/libtool/libtool_1.5.10.bb
packages/libtool/libtool_1.5.22.bb
packages/libtool/libtool_1.5.24.bb
packages/libtool/libtool_1.5.6.bb
packages/linux/linux-rp-2.6.24/htcuni.patch
packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch
packages/mplayer/mplayer_0.0+1.0rc2.bb
packages/ncurses/ncurses-native_5.4.bb
packages/ncurses/ncurses.inc
packages/ncurses/ncurses_5.4.bb
packages/python/python-lightmediascanner_svn.bb
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/qt4/qtopia-core.inc
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/starling/starling_svn.bb
packages/subversion/subversion_1.4.5.bb
packages/uclibc/uclibc_0.9.29.bb
site/arm-linux-uclibc
site/armeb-linux
site/powerpc-common
packages/initrdscripts/files/01-bootldr-buster.sh
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/files/87-kexecboot.sh
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-kexecboot_1.0.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
Diffs:
#
# mt diff -r1458e9ca6c6d9b78bff4114c4a3b09c7aa6b7a8e -r478c13f37cd870d9bbc551cd4d7b43ee8c795195
#
#
#
# delete "packages/gstreamer/gst-plugins-bad_0.10.3.bb"
#
# delete "packages/gstreamer/gst-plugins-bad_0.10.5.bb"
#
# delete "packages/gstreamer/gst-plugins-base_0.10.12.bb"
#
# delete "packages/gstreamer/gst-plugins-base_0.10.14.bb"
#
# delete "packages/gstreamer/gst-plugins-good_0.10.6.bb"
#
# delete "packages/gstreamer/gstreamer_0.10.12.bb"
#
# delete "packages/gstreamer/gstreamer_0.10.14.bb"
#
# delete "packages/libol/libol_0.3.16.bb"
#
# delete "packages/nano/nano-1.2.1"
#
# delete "packages/nano/nano-1.2.1/configure.patch"
#
# delete "packages/nano/nano-1.2.1/glib.m4"
#
# delete "packages/nano/nano_1.2.1.bb"
#
# delete "packages/ncurses/ncurses_5.3.bb"
#
# delete "packages/starling/starling_0.1.bb"
#
# delete "packages/starling/starling_0.2.bb"
#
# rename "packages/aircrack/aircrack-ng_0.9.1.bb"
# to "packages/aircrack/aircrack-ng_0.9.3.bb"
#
# rename "packages/gstreamer/gst-plugins-good_0.10.5.bb"
# to "packages/gstreamer/gst-plugins-good_0.10.7.bb"
#
# rename "packages/gstreamer/gst-plugins-ugly_0.10.6.bb"
# to "packages/gstreamer/gst-plugins-ugly_0.10.7.bb"
#
# rename "packages/nano/nano-2.0.6"
# to "packages/nano/files"
#
# rename "packages/nano/nano_2.0.6.bb"
# to "packages/nano/nano_2.0.7.bb"
#
# add_dir "packages/apr/apr"
#
# add_dir "packages/apr/apr-util"
#
# add_dir "packages/c-nc"
#
# add_dir "packages/dt"
#
# add_dir "packages/libgee"
#
# add_dir "packages/libgee/files"
#
# add_dir "packages/linux/linux-mainstone"
#
# add_dir "packages/linux/linux-mainstone/mainstone"
#
# add_dir "packages/pv"
#
# add_dir "packages/pwgen"
#
# add_file "packages/apr/apr/configure_fixes.patch"
# content [5e849d8b4a1b55d9bfb77536400dc6831a948907]
#
# add_file "packages/apr/apr-util/configure_fixes.patch"
# content [5e6541f99ae7a2db6ce2787142108a49984687fb]
#
# add_file "packages/apr/apr-util_1.2.12.bb"
# content [dc1badf7cf7f2131e45ac0ef4851197f4d8514ce]
#
# add_file "packages/apr/apr_1.2.12.bb"
# content [1c44d09d91c6eeeb9f28b54d241343149e7f3cb7]
#
# add_file "packages/c-nc/c-nc_0.5.bb"
# content [85e267eb9e3257a9374622a1346e40e03bfbc790]
#
# add_file "packages/dt/dt_15.14.bb"
# content [77fc423e05b1c76672a6775fee5a05a8ca645ec2]
#
# add_file "packages/gstreamer/gst-plugins-bad_0.10.6.bb"
# content [351ac025ffd365d467b479c195fc6e68d0e1304e]
#
# add_file "packages/gtk-webcore/midori_0.0.17.bb"
# content [3d8f7815947175065c2271654f26e21a970b8305]
#
# add_file "packages/libgee/files/no-tests.patch"
# content [91e5dddbfe715197da614b773ad72d04fcb5e975]
#
# add_file "packages/libgee/libgee_0.1.2.bb"
# content [b840c921c048f1b34d3d44ade9e0ef5787af392b]
#
# add_file "packages/libtool/libtool.inc"
# content [5e2573546ae1416fc12ad8b2d350176cf1379549]
#
# add_file "packages/linux/linux-mainstone/mainstone/defconfig"
# content [695ff71b3c23b15f14a776b87555625f23e485ce]
#
# add_file "packages/linux/linux-mainstone/mainstone-keypad.patch"
# content [89fef15f8739d2733d7ff623ea7a9d8db4f42893]
#
# add_file "packages/linux/linux-mainstone_2.6.25-rc4.bb"
# content [29b3397097c9738552c5f3d6b2e316f4e40d2bf1]
#
# add_file "packages/pv/pv_1.1.4.bb"
# content [b3f56e909b6bc174f2cd1b7df23d05b568851564]
#
# add_file "packages/pwgen/pwgen_2.06.bb"
# content [08cdecdd4658825f71e13bfa0973f96fd60b1e7b]
#
# add_file "packages/speech-dispatcher/files/configure_fix.patch"
# content [414e2b325a6a6f7240beb5f7ad791b83dc462295]
#
# add_file "packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch"
# content [d1d87a1d45487ab3992cb1b898e57bb621192a8d]
#
# add_file "packages/wireless-tools/wireless-tools_29.bb"
# content [2db019d75981b9804f0be92a076def62dfdcd544]
#
# add_file "site/common-linux"
# content [c62abd8aa23ce912d750c8815469009b6682162d]
#
# patch "classes/package_deb.bbclass"
# from [e1c18789aa0e0ad6a1e1faafbefb41e9b69e22de]
# to [29ec1e6d134d74483c5c26043872a32cdc95bdc9]
#
# patch "classes/package_ipk.bbclass"
# from [5034d6b967ea7da5ccaf3b815655ea7f85cd3ca0]
# to [29c2d1055840133cc3b8317a33dc52aeeb4cd9fc]
#
# patch "classes/qmake2.bbclass"
# from [e469f74476f5cd684b559146bbd4e808de9dcadb]
# to [8079b5564afd7c19bbc0088e21ca4e780a85b65f]
#
# patch "classes/qtopia4core.bbclass"
# from [b1d6e66685818c4024d7bfabaf21b47344f94360]
# to [9e44d07549e666bc39b473d49004ee2a271a4f3e]
#
# patch "classes/rm_work.bbclass"
# from [37e569d9d18711a27e5823cb5e00f79377d3d92b]
# to [a9555995e581d7e18e17129855ca40b4117ac461]
#
# patch "classes/seppuku.bbclass"
# from [5ccb6b3ee62481e1ee237df90ec2f4a399801311]
# to [d9299ad4bccbb02b32acfbe21f8b514f0ec16283]
#
# patch "classes/siteinfo.bbclass"
# from [ad8a25b8d98422ba10f5dd64a960dccedae4f42f]
# to [87040575ac54a47e976175623587d296fbb213d0]
#
# patch "conf/bitbake.conf"
# from [45b49bcfc0ae43467fb81cf6e557fa940512f5cf]
# to [70cb68395c739ccdb760bd8420dc346bf585df73]
#
# patch "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
# from [6fd702f5e783f5a5a86ad4433a7bd462335237a9]
# to [1b6f78d896a2edd5402766d2468d39523dfa9732]
#
# patch "conf/machine/at32stk1000.conf"
# from [994d60f948a5739d6823d08b129b0b578c266e6b]
# to [f10524857a44bab4e575452668a3691277b3f78f]
#
# patch "conf/machine/atngw100.conf"
# from [f8e16fd82334ed6e47de584e2bcbfbec63360ec3]
# to [89a6ee9913538126eac21df68b6676787b076b88]
#
# patch "conf/machine/mainstone.conf"
# from [cb04f4db21cd13e636401655fb4fdeaabc171584]
# to [355b60cc742949814d43264e16283d224b8df4bb]
#
# patch "packages/aircrack/aircrack-ng_0.9.3.bb"
# from [59aa98881f86a89e00056ccb89caad4a4b1136c7]
# to [8fe9a7ff831f58359845c754b510cf44b999d308]
#
# patch "packages/apr/apr-util_1.2.7.bb"
# from [662620cf3dc2aeaff4ac4ed3b34ed9acd9d2a39a]
# to [d73fa6884d2e4c9e46ab044d063aed3634f62268]
#
# patch "packages/apr/apr_1.2.7.bb"
# from [f51f9d791644263063719fdd0f9d24f9a44f7134]
# to [00bf1ea494a00a7ca7787d42f13f06305e77420c]
#
# patch "packages/e2fsprogs/e2fsprogs.inc"
# from [da4915afadd5e7e959c27d508cbcc77eebada9f0]
# to [cdd472daa2717eaf314e6cc2aaa52e17dc50f29d]
#
# patch "packages/e2fsprogs/e2fsprogs_1.38.bb"
# from [4a9215b927629a12d9aa3f026971197474ede066]
# to [45e5cacad8add44b34efbf54a86f087c867e3231]
#
# patch "packages/espeak/espeak_1.30.bb"
# from [0b187e4c430c8a401c4d5bd39c356847ef639578]
# to [a8eccd7e70daf05d588bdf9ab26438a62a6dfe71]
#
# patch "packages/gcc/gcc-cross-initial.inc"
# from [9ba43750cd0139966a6dcf2b4103056bf5ff486a]
# to [3169e83832ff092444d8ebefd61421998dbb8520]
#
# patch "packages/gnutls/gnutls.inc"
# from [542734338d3b2fde137f0cc594490a911647352b]
# to [5fc5d648df430e121acb5514c69bfecd76aaf984]
#
# patch "packages/gnutls/gnutls_1.4.5.bb"
# from [5db5b87c1a9e8d49c524010294fe8193a1c9cab9]
# to [7feb354f3471229408799faf8338e66809a5fe04]
#
# patch "packages/gnutls/gnutls_1.6.3.bb"
# from [870f5fbd7dcbf64dcbea5f197963a11c689cf0d2]
# to [b7fb2a58ba15b84f8e48bd71c5197a99ec511ffe]
#
# patch "packages/gstreamer/gst-plugins-good_0.10.7.bb"
# from [8e022b10f99f96c8cba7fe44d7252de0edc90cd9]
# to [1fc24ad28e259403e951f2d5f461bd35b817e0f9]
#
# patch "packages/gstreamer/gst-plugins-ugly_0.10.7.bb"
# from [0ae18af7d536bef9d7e0e9378b0f134ee108a0cd]
# to [5a261d177ce657b67976f6cf9617c332f7d25fcc]
#
# patch "packages/gstreamer/gst-plugins.inc"
# from [c5d1a211e42f0945f1aa564833b94e0de2ed64ca]
# to [570041851e8fc6d81c0037e1ed17cc21a4aa1f49]
#
# patch "packages/libol/libol_0.3.18.bb"
# from [a545d5692f51a931712602d69f586675ee7ac004]
# to [9af4b21753afc6dd460268a2111b70af976f2911]
#
# patch "packages/libtool/libtool-cross_1.5.10.bb"
# from [54bc11a40b3ffda524161118db81f8521ce06a24]
# to [fc61ef91876b8d677edc7bed56134504f5702d12]
#
# patch "packages/libtool/libtool-cross_1.5.22.bb"
# from [138113c078dbe30ab78a0d2ce0fb2f678723f078]
# to [5da896dba30f57599cdf078623842f395bff1b37]
#
# patch "packages/libtool/libtool-cross_1.5.24.bb"
# from [0aab7e15f589c0f61b67b253ce2e2b5105f5c496]
# to [b99c3310986c4141e212de9d4025e54df41f5541]
#
# patch "packages/libtool/libtool-native_1.5.10.bb"
# from [1637e2be734e54d7a59c21c3b10070585210ca96]
# to [8206614a1859c7f3de932c2c296721e671a28608]
#
# patch "packages/libtool/libtool-native_1.5.22.bb"
# from [033211d8e0f97f94c886544a0033645580a09c7f]
# to [68e41d1e179b4767e90116b23b5d5df1053c9071]
#
# patch "packages/libtool/libtool-native_1.5.24.bb"
# from [e5197c6fc402385737e26c1e4b3d057bc0c695c7]
# to [0a235422a53d4fa133e16c6e6ff5339a2fab020d]
#
# patch "packages/libtool/libtool_1.5.10.bb"
# from [e55c651cb0816e704d1aba735e8f2c01bae83dca]
# to [193a405689f2baba7b2c7eb26a551f5155c5011d]
#
# patch "packages/libtool/libtool_1.5.22.bb"
# from [6e9eb377b6284e78d06253d7cdd39a01e65f158b]
# to [31859451d723ca5b165d95756aa559fab043d457]
#
# patch "packages/libtool/libtool_1.5.24.bb"
# from [9aefa1ce0f4e6f6e2f585bfda7dded75c05269e1]
# to [2ddadb328145c416cc38bff265f28ae3a262fb8c]
#
# patch "packages/libtool/libtool_1.5.6.bb"
# from [317d9d0f9428cae00d85a4e969eb5a86494975f4]
# to [51a8970294e9293c7e753a5ed3555fee631262a3]
#
# patch "packages/linux/linux-rp-2.6.24/htcuni.patch"
# from [20a6236382ed2305b8a1b8ca29c8a26e2572c663]
# to [3734b428351aad5959f90bc473df40b7cfa27071]
#
# patch "packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch"
# from [73fadc16c16d9a7a8e42c53e79e6eba467cdf59b]
# to [555dcdc80fa0d4419bbeaa955328961258cf607e]
#
# patch "packages/mplayer/mplayer_0.0+1.0rc2.bb"
# from [4c6bb435884ed222a3bd0a326c1b3d4b4c0c8c7c]
# to [b480457528a1a247ec3cfadd16777a2a32b0d24e]
#
# patch "packages/nano/nano_2.0.7.bb"
# from [8b385a806eb9109631de3fe69a30bcf634b7b05f]
# to [c35daac89c10bfeb7b724cb364f08acc3e24135c]
#
# patch "packages/ncurses/ncurses-native_5.4.bb"
# from [a999c65ecabf966bb56d9b4f66f1bacabcf65a79]
# to [f65b055a1a4c674792bb9d45358f0eadbb9e8ff3]
#
# patch "packages/ncurses/ncurses.inc"
# from [2be0776267994e0ee952b0f848192aeb2bea1cd3]
# to [7eb4e260d67cd98e1401062553cf01da9cfb97c7]
#
# patch "packages/ncurses/ncurses_5.4.bb"
# from [d7a699b05dcac9fa77a97c45d770d8d95b25c805]
# to [1b3d153d70dfb9c8369190b60cb214c75e79fcfb]
#
# patch "packages/python/python-lightmediascanner_svn.bb"
# from [ed36f161da571ebe8825db20d3e604b2b97c3ff6]
# to [778bc16e62613a73db9a236456a1e283fc86bde8]
#
# patch "packages/qt4/qt4-x11-free.inc"
# from [4252aa567a338367399f3245e33c08da05b15677]
# to [89c46cc5b77c68a9396f847011f40dda890459a6]
#
# patch "packages/qt4/qt_packaging.inc"
# from [10c4b21735e8cff175978c971577e1cac4681cad]
# to [39f09b583e2e9f61e01f5d75bf57e75690501ed4]
#
# patch "packages/qt4/qt_staging.inc"
# from [299c95fa7b3b469f300d50bb8dfe49412a6ec9bf]
# to [f74af3775f1a2c2fb8670eca49ab7c2a89d91a53]
#
# patch "packages/qt4/qtopia-core.inc"
# from [3fc8e29466adb68cfe7d5609ee964d7ba4951bbe]
# to [ece71d23b6e95ccfa2dd065273aa0b93013c811a]
#
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# from [b70cba0c2b41cdc634eb88c2b47dabab343b316a]
# to [234b25c309b6b52f26d9fb1a049e4227b90ba438]
#
# patch "packages/starling/starling_svn.bb"
# from [41c225219a46f25d88d800d602cfc111847d3a8b]
# to [f40a8f4868be867eb5dba875a0fc0615665b8452]
#
# patch "packages/subversion/subversion_1.4.5.bb"
# from [b3247341e42924a7030a8993469f0c0eddeae7cd]
# to [044b4a42f948f26fcfc5218e2ad210298c3e4d4e]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [fbb16deda11e2a7ee5fd50b757a8cc92d0bb3294]
# to [3425ad6998ad40cbf49c5bd4b2ed1991f9232f23]
#
# patch "site/arm-linux-uclibc"
# from [ec92512a83b5986fb0052e62aec4fd766fe519c7]
# to [ff1acabb74ba46f785f01346595d53436bc9e022]
#
# patch "site/armeb-linux"
# from [64313e816e77f3fc1ba876967f4bf9f09566f3ba]
# to [8da9532ae815e85eece6690a826b54f4c7c87450]
#
# patch "site/powerpc-common"
# from [b4cc26ca7002d83fd301de6039083614215d4213]
# to [370995da643c1636ad58386997c8de08d9799b39]
#
============================================================
--- packages/apr/apr/configure_fixes.patch 5e849d8b4a1b55d9bfb77536400dc6831a948907
+++ packages/apr/apr/configure_fixes.patch 5e849d8b4a1b55d9bfb77536400dc6831a948907
@@ -0,0 +1,22 @@
+Index: apr-1.2.12/configure.in
+===================================================================
+--- apr-1.2.12.orig/configure.in 2008-03-08 21:41:43.000000000 +0000
++++ apr-1.2.12/configure.in 2008-03-08 21:43:08.000000000 +0000
+@@ -13,12 +13,11 @@
+ dnl
+ dnl Include our own M4 macros along with those for libtool
+ dnl
+-sinclude(build/apr_common.m4)
+-sinclude(build/apr_network.m4)
+-sinclude(build/apr_threads.m4)
+-sinclude(build/apr_hints.m4)
+-sinclude(build/libtool.m4)
+-sinclude(build/ltsugar.m4)
++#sinclude(build/apr_common.m4)
++#sinclude(build/apr_network.m4)
++#sinclude(build/apr_threads.m4)
++#sinclude(build/apr_hints.m4)
++#sinclude(build/libtool.m4)
+
+ dnl Hard-coded inclusion at the tail end of apr_private.h:
+ AH_BOTTOM([
============================================================
--- packages/apr/apr-util/configure_fixes.patch 5e6541f99ae7a2db6ce2787142108a49984687fb
+++ packages/apr/apr-util/configure_fixes.patch 5e6541f99ae7a2db6ce2787142108a49984687fb
@@ -0,0 +1,25 @@
+Index: apr-util-1.2.12/configure.in
+===================================================================
+--- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000
++++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000
+@@ -8,13 +8,13 @@
+ AC_CONFIG_HEADER(include/private/apu_config.h)
+ AC_CONFIG_AUX_DIR(build)
+
+-sinclude(build/apu-conf.m4)
+-sinclude(build/apu-iconv.m4)
+-sinclude(build/apu-hints.m4)
+-sinclude(build/apr_common.m4)
+-sinclude(build/find_apr.m4)
+-sinclude(build/dbm.m4)
+-sinclude(build/dbd.m4)
++#sinclude(build/apu-conf.m4)
++#sinclude(build/apu-iconv.m4)
++#sinclude(build/apu-hints.m4)
++#sinclude(build/apr_common.m4)
++#sinclude(build/find_apr.m4)
++#sinclude(build/dbm.m4)
++#sinclude(build/dbd.m4)
+
+ dnl Generate ./config.nice for reproducing runs of configure
+ dnl
============================================================
--- packages/apr/apr-util_1.2.12.bb dc1badf7cf7f2131e45ac0ef4851197f4d8514ce
+++ packages/apr/apr-util_1.2.12.bb dc1badf7cf7f2131e45ac0ef4851197f4d8514ce
@@ -0,0 +1,29 @@
+DESCRIPTION = "Apache Portable Runtime (APR) companion library"
+SECTION = "libs"
+DEPENDS = "apr expat gdbm"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r2"
+
+# apache mirrors?
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
+ file://configure_fixes.patch;patch=1"
+
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
+ --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
+ --without-sqlite2 \
+ --without-sqlite3 \
+ --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
+
+
+inherit autotools lib_package binconfig
+
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
+do_configure_prepend() {
+ cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
+}
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/apr/apr_1.2.12.bb 1c44d09d91c6eeeb9f28b54d241343149e7f3cb7
+++ packages/apr/apr_1.2.12.bb 1c44d09d91c6eeeb9f28b54d241343149e7f3cb7
@@ -0,0 +1,26 @@
+DESCRIPTION = "Apache Portable Runtime (APR) library"
+SECTION = "libs"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
+ file://configure_fixes.patch;patch=1"
+
+inherit autotools lib_package binconfig
+
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
+do_stage() {
+ autotools_stage_all
+ install -d ${STAGING_DATADIR}/apr
+ cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}/apr/
+ sed -i s,apr_builddir=.*,apr_builddir=,g ${STAGING_DATADIR}/apr/apr_rules.mk
+ sed -i s,apr_builders=.*,apr_builders=,g ${STAGING_DATADIR}/apr/apr_rules.mk
+ sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g ${STAGING_DATADIR}/apr/apr_rules.mk
+ sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g ${STAGING_DATADIR}/apr/apr_rules.mk
+ cp ${S}/build/mkdir.sh ${STAGING_DATADIR}/apr/
+ cp ${S}/build/make_exports.awk ${STAGING_DATADIR}/apr/
+ cp ${S}/build/make_var_export.awk ${STAGING_DATADIR}/apr/
+}
============================================================
--- packages/c-n%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rdf907de16e9f058a9d98b4ee458c93e7c4965a9c -r478c13f37cd870d9bbc551cd4d7b43ee8c795195
#
#
#
# patch "packages/initrdscripts/files/01-bootldr-buster.sh"
# from [4b513ffd4445d13ea94fcf8d11f8c2e6595f547a]
# to [06c99ee71af4a28b7c20c61895cd35422ea53f2a]
#
# patch "packages/initrdscripts/files/30-bootmenu.sh"
# from [505477ef54500012245c4b73e55bab875abbd964]
# to [ffda8669f836bece0b3630e338941750baed9d81]
#
# patch "packages/initrdscripts/files/87-kexecboot.sh"
# from [73528951640012dc82e2f85bfa592a5762cc3f45]
# to [3d3d0f3d83e60e2679d46b48f2b2ee16e9320ec6]
#
# patch "packages/initrdscripts/files/init.sh"
# from [c3caf34532f8b24aeef2f195ceffcd7ace300962]
# to [f01a2b1d615165dd1f22c6ce448caad76fe2bc21]
#
# patch "packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb"
# from [3769506f197a56b63696a02fd31a8f87a0d2c55a]
# to [a0475e2ec387c4888fecb4616ce43cd064be9b08]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [787b756415c69f2202b3abc828c203d46d04606d]
# to [665b9db27141be2a1f7b3578b4e1576aa298a03d]
#
# patch "packages/initrdscripts/initramfs-module-kexecboot_1.0.bb"
# from [50b73fbc6eac528a3565056e247019833cf00d3b]
# to [3abc34b3ee6e3d179139405a6e7554b2664a3a30]
#
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# from [7e0c529c41c46e4ac3fe84cf042dddb05f824a5d]
# to [78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06]
#
============================================================
--- packages/initrdscripts/files/01-bootldr-buster.sh 4b513ffd4445d13ea94fcf8d11f8c2e6595f547a
+++ packages/initrdscripts/files/01-bootldr-buster.sh 06c99ee71af4a28b7c20c61895cd35422ea53f2a
@@ -7,7 +7,7 @@ if expr "$cmdl" : '.*mtdparts=ipaq' > /d
echo "Detected Compaq bootldr or derivative"
echo "Kernel command line is assumed to be bogus and ignored"
echo "!!!!!!!!"
- CMDLINE=" "
+ CMDLINE="console=ttyS0,115200 console=tty0"
sleep 3
fi
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh 505477ef54500012245c4b73e55bab875abbd964
+++ packages/initrdscripts/files/30-bootmenu.sh ffda8669f836bece0b3630e338941750baed9d81
@@ -15,13 +15,6 @@ fi
exit 1
fi
-if [ -z "$rootdelay" ]; then
- echo "rootdelay parameter was not passed on kernel command line - assuming 2s delay"
- echo "If you would like to avoid this delay, pass explicit rootdelay=0"
- sleep 2
- dev_setup
-fi
-
mkdir -p $MOUNTLOC
list=""
@@ -36,14 +29,14 @@ show_menu() {
}
show_menu() {
- echo -e -n "${E}3;0H"
+ echo -e -n "${E}3;0H" >$CONSOLE
cnt=0
echo -e $list | \
while read l; do
if [ $cnt == $num ]; then
- echo -e -n "${E}1m"
+ echo -e -n "${E}1m" >$CONSOLE
fi
- echo -e "$cnt: $l${E}0m"
+ echo -e "$cnt: $l${E}0m" >$CONSOLE
cnt=$((cnt + 1))
done
}
@@ -109,14 +102,14 @@ num=0
num=0
# Draw UI
-stty -echo
-echo -e -n "${E}2J"
-echo -e -n "${E}0;0H"
-echo "Select boot image:"
+stty -F $CONSOLE -echo
+echo -e -n "${E}2J" >$CONSOLE
+echo -e -n "${E}0;0H" >$CONSOLE
+echo "Select boot image:" >$CONSOLE
# Main loop
show_menu
-while read -n1 i; do
+while read -s -n1 i; do
case "$i" in
"A")
num=$((num - 1))
@@ -139,7 +132,7 @@ while read -n1 i; do
esac
show_menu
# echo "*$esc$i"
-done
+done < $CONSOLE
stty echo
@@ -170,8 +163,8 @@ fi
CMDLINE="$CMDLINE root=$ROOT_DEVICE"
fi
-echo ROOT_DEVICE=$ROOT_DEVICE
-echo CMDLINE=$CMDLINE
+echo ROOT_DEVICE=$ROOT_DEVICE >$CONSOLE
+echo CMDLINE=$CMDLINE >$CONSOLE
##############################
fi
============================================================
--- packages/initrdscripts/files/87-kexecboot.sh 73528951640012dc82e2f85bfa592a5762cc3f45
+++ packages/initrdscripts/files/87-kexecboot.sh 3d3d0f3d83e60e2679d46b48f2b2ee16e9320ec6
@@ -3,15 +3,15 @@ if [ -n "$BOOT_ROOT" -a -f "$BOOT_ROOT/b
if [ -n "$BOOT_ROOT" -a -f "$BOOT_ROOT/boot/zImage" ]; then
if ! expr "$CMDLINE" : '.*nokexec'; then
- echo "Kernel found in rootfs:"
- ls -l "$BOOT_ROOT/boot/zImage"
+ echo "Kernel found in rootfs:" >$CONSOLE
+ ls -l "$BOOT_ROOT/boot/zImage" >$CONSOLE
initramfs=""
if [ -f "$BOOT_ROOT/boot/initramfs.bin" ]; then
echo "Initramfs found in rootfs:"
ls -l "$BOOT_ROOT/boot/initramfs.bin"
initramfs="--initrd=$BOOT_ROOT/boot/initramfs.bin"
fi
- echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec"
+ echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec" >$CONSOLE
sleep 10
/usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec"
sleep 10000
============================================================
--- packages/initrdscripts/files/init.sh c3caf34532f8b24aeef2f195ceffcd7ace300962
+++ packages/initrdscripts/files/init.sh f01a2b1d615165dd1f22c6ce448caad76fe2bc21
@@ -41,6 +41,7 @@ load_modules() {
load_modules() {
for module in $MODULE_DIR/$1; do
+ # Cannot redir to $CONSOLE here easily - may not be set yet
echo "initramfs: Loading $module module"
source $module
done
@@ -66,8 +67,13 @@ read_args
read_args
+if [ -z "$rootdelay" ]; then
+ echo "rootdelay parameter was not passed on kernel command line - assuming 2s delay"
+ echo "If you would like to avoid this delay, pass explicit rootdelay=0"
+ rootdelay="2"
+fi
if [ -n "$rootdelay" ]; then
- echo "Waiting $rootdelay seconds for devices to settle..."
+ echo "Waiting $rootdelay seconds for devices to settle..." >$CONSOLE
sleep $rootdelay
fi
============================================================
--- packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb 3769506f197a56b63696a02fd31a8f87a0d2c55a
+++ packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb a0475e2ec387c4888fecb4616ce43cd064be9b08
@@ -1,5 +1,5 @@ SRC_URI = "file://01-bootldr-buster.sh"
SRC_URI = "file://01-bootldr-buster.sh"
-PR = "r1"
+PR = "r2"
DESCRIPTION = "An initramfs module for ignoring bogus kernel commandline from Compaq bootldr"
RDEPENDS = "initramfs-uniboot"
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb 787b756415c69f2202b3abc828c203d46d04606d
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb 665b9db27141be2a1f7b3578b4e1576aa298a03d
@@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh"
SRC_URI = "file://30-bootmenu.sh"
-PR = "r15"
+PR = "r17"
DESCRIPTION = "An initramfs module with UI for selection of boot device."
RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
# For VFAT mounting.
============================================================
--- packages/initrdscripts/initramfs-module-kexecboot_1.0.bb 50b73fbc6eac528a3565056e247019833cf00d3b
+++ packages/initrdscripts/initramfs-module-kexecboot_1.0.bb 3abc34b3ee6e3d179139405a6e7554b2664a3a30
@@ -1,5 +1,5 @@ SRC_URI = "file://87-kexecboot.sh"
SRC_URI = "file://87-kexecboot.sh"
-PR = "r0.4"
+PR = "r1"
DESCRIPTION = "An initramfs module for kexecing kernel from rootfs."
RDEPENDS = "initramfs-uniboot kexec-static"
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb 7e0c529c41c46e4ac3fe84cf042dddb05f824a5d
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb 78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06
@@ -1,5 +1,5 @@ SRC_URI = "file://init.sh"
SRC_URI = "file://init.sh"
-PR = "r6"
+PR = "r8"
DESCRIPTON = "A modular initramfs init script system."
RRECOMMENDS = "kernel-module-mtdblock"
More information about the Openembedded-commits
mailing list