[oe-commits] org.oe.dev merge of '313f55e5f9f09b07e1ed5f50011e51c1c6acb73c'
koen commit
openembedded-commits at lists.openembedded.org
Wed Oct 10 09:49:45 UTC 2007
merge of '313f55e5f9f09b07e1ed5f50011e51c1c6acb73c'
and 'dbb53fe45696a4f12d4e96c449c65f691e0e8346'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 260b42dfb1d6585e2d36a2b8ad2b20c165cb344c
ViewMTN: http://monotone.openembedded.org/revision/info/260b42dfb1d6585e2d36a2b8ad2b20c165cb344c
Files:
1
packages/python/python-pygobject-native_2.12.2.bb
packages/python/python-pygobject_2.12.2.bb
contrib/armmon_xfer
contrib/mtn2git/mtn
packages/gcc/gcc-4.2.2
contrib/armmon_xfer/armmon_xfer.py
contrib/mtn2git/git2mtn.py
contrib/mtn2git/mtn/__init__.py
contrib/mtn2git/mtn/authors.py
contrib/mtn2git/mtn/common.py
contrib/mtn2git/mtn/genproxy.py
contrib/mtn2git/mtn/mtn.py
contrib/mtn2git/mtn/utility.py
contrib/mtn2git/mtn2git.py
contrib/mtn2git/status.py
packages/gcc/gcc-4.2.2/100-uclibc-conf.patch
packages/gcc/gcc-4.2.2/103-uclibc-conf-noupstream.patch
packages/gcc/gcc-4.2.2/110-arm-eabi.patch
packages/gcc/gcc-4.2.2/200-uclibc-locale.patch
packages/gcc/gcc-4.2.2/203-uclibc-locale-no__x.patch
packages/gcc/gcc-4.2.2/204-uclibc-locale-wchar_fix.patch
packages/gcc/gcc-4.2.2/205-uclibc-locale-update.patch
packages/gcc/gcc-4.2.2/300-libstdc++-pic.patch
packages/gcc/gcc-4.2.2/301-missing-execinfo_h.patch
packages/gcc/gcc-4.2.2/302-c99-snprintf.patch
packages/gcc/gcc-4.2.2/303-c99-complex-ugly-hack.patch
packages/gcc/gcc-4.2.2/304-index_macro.patch
packages/gcc/gcc-4.2.2/305-libmudflap-susv3-legacy.patch
packages/gcc/gcc-4.2.2/306-libstdc++-namespace.patch
packages/gcc/gcc-4.2.2/307-locale_facets.patch
packages/gcc/gcc-4.2.2/402-libbackend_dep_gcov-iov.h.patch
packages/gcc/gcc-4.2.2/602-sdk-libstdc++-includes.patch
packages/gcc/gcc-4.2.2/740-sh-pr24836.patch
packages/gcc/gcc-4.2.2/800-arm-bigendian.patch
packages/gcc/gcc-4.2.2/801-arm-bigendian-eabi.patch
packages/gcc/gcc-4.2.2/904-flatten-switch-stmt-00.patch
packages/gcc/gcc-4.2.2/README
packages/gcc/gcc-4.2.2/arm-crunch-20000320.patch
packages/gcc/gcc-4.2.2/arm-crunch-32bit-disable.patch
packages/gcc/gcc-4.2.2/arm-crunch-64bit-disable-4.2.0.patch
packages/gcc/gcc-4.2.2/arm-crunch-64bit-disable0.patch
packages/gcc/gcc-4.2.2/arm-crunch-and-or.patch
packages/gcc/gcc-4.2.2/arm-crunch-cfcvt64-disable.patch
packages/gcc/gcc-4.2.2/arm-crunch-cfcvtds-disable.patch
packages/gcc/gcc-4.2.2/arm-crunch-cirrus-bugfixes.patch
packages/gcc/gcc-4.2.2/arm-crunch-compare-geu.patch
packages/gcc/gcc-4.2.2/arm-crunch-compare-unordered.patch
packages/gcc/gcc-4.2.2/arm-crunch-compare-unordered.patch-z-eq
packages/gcc/gcc-4.2.2/arm-crunch-compare.patch
packages/gcc/gcc-4.2.2/arm-crunch-compare.patch-z-eq
packages/gcc/gcc-4.2.2/arm-crunch-dominance.patch
packages/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754-div.patch
packages/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch
packages/gcc/gcc-4.2.2/arm-crunch-eabi.patch
packages/gcc/gcc-4.2.2/arm-crunch-floatsi-disable-single.patch
packages/gcc/gcc-4.2.2/arm-crunch-floatsi-disable.patch
packages/gcc/gcc-4.2.2/arm-crunch-floatunsidf.patch
packages/gcc/gcc-4.2.2/arm-crunch-fp_consts.patch
packages/gcc/gcc-4.2.2/arm-crunch-neg.patch
packages/gcc/gcc-4.2.2/arm-crunch-neg2.patch
packages/gcc/gcc-4.2.2/arm-crunch-offset.patch
packages/gcc/gcc-4.2.2/arm-crunch-predicates.patch
packages/gcc/gcc-4.2.2/arm-crunch-predicates2.patch
packages/gcc/gcc-4.2.2/arm-crunch-predicates3.patch
packages/gcc/gcc-4.2.2/arm-crunch-saveregs.patch
packages/gcc/gcc-4.2.2/arm-crunch-scc.patch
packages/gcc/gcc-4.2.2/arm-crunch-truncsi-disable-new.patch
packages/gcc/gcc-4.2.2/arm-crunch-truncsi-disable.patch
packages/gcc/gcc-4.2.2/arm-nolibfloat.patch
packages/gcc/gcc-4.2.2/arm-softfloat.patch
packages/gcc/gcc-4.2.2/arm-thumb-cache.patch
packages/gcc/gcc-4.2.2/arm-thumb.patch
packages/gcc/gcc-4.2.2/cache-amnesia.patch
packages/gcc/gcc-4.2.2/fix-ICE-in-arm_unwind_emit_set.diff
packages/gcc/gcc-4.2.2/gcc41-configure.in.patch
packages/gcc/gcc-4.2.2/ldflags.patch
packages/gcc/gcc-4.2.2/sdk-libstdc++-includes.patch
packages/gcc/gcc-4.2.2/sh3-installfix-fixheaders.patch
packages/gcc/gcc-4.2.2/unbreak-armv4t.patch
packages/gcc/gcc-4.2.2/zecke-no-host-includes.patch
packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
packages/gcc/gcc-cross-initial_4.2.2.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
conf/bitbake.conf
conf/distro/include/moko-autorev.inc
conf/machine/alix.conf
conf/machine/at91sam9260ek.conf
conf/machine/at91sam9261ek.conf
conf/machine/bd-neon.conf
conf/machine/fic-gta02.conf
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/linux/linux.inc
packages/linux/linux_2.6.22.bb
packages/mtd/mtd-utils-native.inc
packages/python/python-pygobject-native_2.12.3.bb
mtn:execute
true
packages/angstrom/angstrom-altboot-console-image.bb
packages/angstrom/altboot-console-image.bb
packages/angstrom/angstrom-altboot-x11-image.bb
packages/angstrom/altboot-x11-image.bb
packages/angstrom/angstrom-bootmanager-image.bb
packages/angstrom/bootmanager-image.bb
packages/angstrom/angstrom-console-image.bb
packages/angstrom/console-image.bb
packages/angstrom/angstrom-gateway-image.bb
packages/angstrom/gateway-image.bb
packages/angstrom/angstrom-mokogateway-image.bb
packages/angstrom/mokogateway-image.bb
packages/angstrom/angstrom-x11-gpe-image.bb
packages/angstrom/x11-gpe-image.bb
packages/angstrom/angstrom-x11-image.bb
packages/angstrom/x11-image.bb
packages/angstrom/angstrom-x11-office-image.bb
packages/angstrom/x11-office-image.bb
packages/angstrom/angstrom-x11-pimlico-image.bb
packages/angstrom/x11-pimlico-image.bb
packages/images/angstrom-minimal-image-with-mtd-utils.bb
packages/images/minimal-image-with-mtd-utils.bb
packages/images/angstrom-minimal-image.bb
packages/images/minimal-image.bb
Diffs:
#
# mt diff -r313f55e5f9f09b07e1ed5f50011e51c1c6acb73c -r260b42dfb1d6585e2d36a2b8ad2b20c165cb344c
#
#
#
# delete "packages/python/python-pygobject-native_2.12.2.bb"
#
# delete "packages/python/python-pygobject_2.12.2.bb"
#
# add_dir "contrib/armmon_xfer"
#
# add_dir "contrib/mtn2git/mtn"
#
# add_dir "packages/gcc/gcc-4.2.2"
#
# add_file "contrib/armmon_xfer/armmon_xfer.py"
# content [92a8b202efc3a1fd444effb72f40176212ee947e]
#
# add_file "contrib/mtn2git/git2mtn.py"
# content [052dc79ba2fb8ef0ea324e55549ae13233d144f4]
#
# add_file "contrib/mtn2git/mtn/__init__.py"
# content [512093425c7be8fc6da16e10a7cffcda07e45254]
#
# add_file "contrib/mtn2git/mtn/authors.py"
# content [0ed0661cf3ddf1b402a73dfc1ff0fccc64ad05f1]
#
# add_file "contrib/mtn2git/mtn/common.py"
# content [a071eb4d76e1a83824dacd8188199e00ad87fff1]
#
# add_file "contrib/mtn2git/mtn/genproxy.py"
# content [408f46a3f5fe0d792eb62e92a8faaf5c28c67a54]
#
# add_file "contrib/mtn2git/mtn/mtn.py"
# content [b7992918c918fb72a18396be361fc5eba1784e57]
#
# add_file "contrib/mtn2git/mtn/utility.py"
# content [78cd2c53af05e63bb76c097dc832b6f75394e40d]
#
# add_file "contrib/mtn2git/mtn2git.py"
# content [f336e19760df662e35b161bf5791041c5a6e1824]
#
# add_file "contrib/mtn2git/status.py"
# content [d3682877d9debb3e8439b6a0558bb11e6e2262b0]
#
# add_file "packages/gcc/gcc-4.2.2/100-uclibc-conf.patch"
# content [7864e7e76567d72bd6339ccea248ae75c24a6074]
#
# add_file "packages/gcc/gcc-4.2.2/103-uclibc-conf-noupstream.patch"
# content [b581c03296f5366b4537f115f0f15b882e4642d9]
#
# add_file "packages/gcc/gcc-4.2.2/110-arm-eabi.patch"
# content [d948eed1dd804417ae062af1e38e7d55f8f47ae1]
#
# add_file "packages/gcc/gcc-4.2.2/200-uclibc-locale.patch"
# content [28c039b24a03a717740c6985e40b5ea01e869378]
#
# add_file "packages/gcc/gcc-4.2.2/203-uclibc-locale-no__x.patch"
# content [64a0003447e854b6c8205b5b87d3cdc8ca7caa1d]
#
# add_file "packages/gcc/gcc-4.2.2/204-uclibc-locale-wchar_fix.patch"
# content [9ae599ff2c2039f1a0eaff5298fbc2aa47d4b016]
#
# add_file "packages/gcc/gcc-4.2.2/205-uclibc-locale-update.patch"
# content [129ab676c2787de37f94bf3c802616e8b21b7ab9]
#
# add_file "packages/gcc/gcc-4.2.2/300-libstdc++-pic.patch"
# content [aa362fbe2354d64dc46bf042a84093fd4308db2a]
#
# add_file "packages/gcc/gcc-4.2.2/301-missing-execinfo_h.patch"
# content [6500043e6f4e77464f8f277903e0f8c16b29f7d8]
#
# add_file "packages/gcc/gcc-4.2.2/302-c99-snprintf.patch"
# content [5837922659dae60d1753d6257befc3472b9180df]
#
# add_file "packages/gcc/gcc-4.2.2/303-c99-complex-ugly-hack.patch"
# content [3e656fffeed3399240557279dae21981db135fe9]
#
# add_file "packages/gcc/gcc-4.2.2/304-index_macro.patch"
# content [a7d898eb147d9aa339ebf187c236009f205dc377]
#
# add_file "packages/gcc/gcc-4.2.2/305-libmudflap-susv3-legacy.patch"
# content [18ed95506560584fd1d043968fbd4b0815788660]
#
# add_file "packages/gcc/gcc-4.2.2/306-libstdc++-namespace.patch"
# content [65b2d89ea79630ced487f720de9e5a517e54c408]
#
# add_file "packages/gcc/gcc-4.2.2/307-locale_facets.patch"
# content [5dd86533b193ad688496b19e73f8e0395bb18761]
#
# add_file "packages/gcc/gcc-4.2.2/402-libbackend_dep_gcov-iov.h.patch"
# content [1f1916106df0ca5ef09c7ab3bb7f1323de3574e6]
#
# add_file "packages/gcc/gcc-4.2.2/602-sdk-libstdc++-includes.patch"
# content [e6765af92cbc18a1e910def377a8816bcd460df7]
#
# add_file "packages/gcc/gcc-4.2.2/740-sh-pr24836.patch"
# content [fe889fc46b34d5f56e38e156dd622208800960ad]
#
# add_file "packages/gcc/gcc-4.2.2/800-arm-bigendian.patch"
# content [2d4e80657a01bd6e96984ef518f9cc80e20202e4]
#
# add_file "packages/gcc/gcc-4.2.2/801-arm-bigendian-eabi.patch"
# content [9455ecffe81517322f538077a9976916cab94760]
#
# add_file "packages/gcc/gcc-4.2.2/904-flatten-switch-stmt-00.patch"
# content [458b974137747252d061fa68a4f9f8ab42b287b3]
#
# add_file "packages/gcc/gcc-4.2.2/README"
# content [d3da08995423ef301b1feac948fc2f5310bd4ea1]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-20000320.patch"
# content [e97270c4d5ad4cc5b6e9df24a1006a46e117b3c9]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-32bit-disable.patch"
# content [f46cf21c24bc42893937104af8d69ec7e0a0de5c]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-64bit-disable-4.2.0.patch"
# content [945f41c575544d95b695fd9380bcf6b68635ca14]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-64bit-disable0.patch"
# content [a8060fa9b12c0adea192fd04e26ef15f23153f7b]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-and-or.patch"
# content [7825dc9c8f504e7e74f7a02679438b03efdce970]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-cfcvt64-disable.patch"
# content [e3c5f109784cf6461831e0a71c606b54b2ac2029]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-cfcvtds-disable.patch"
# content [4f63e685efafcede9c1c44d89172473b88f49e4f]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-cirrus-bugfixes.patch"
# content [ba4a234344e24b0abade3d2100712328284a6b0a]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-compare-geu.patch"
# content [e5a56198f5afe794dc8a79032b10e4e194bf2f90]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-compare-unordered.patch"
# content [ca7217de7a57efe5f6c389943c2401d735f66716]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-compare-unordered.patch-z-eq"
# content [7cff05e4ecdc53f7cb330c2d946df6b55f721a4e]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-compare.patch"
# content [e97337918fbac7ee2599a05339d560f11b7f06cf]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-compare.patch-z-eq"
# content [b5aee9e3b126fcf68e15f3ca8b40a2bafd131b72]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-dominance.patch"
# content [838ff7b4de2f927203ae8e593951c9593840a451]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754-div.patch"
# content [1b90d344245d68f85b4407721b5ddc5c5addd6ed]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-eabi-ieee754.patch"
# content [faa1fb831bd0ddd1da1ebcc43a854de31b4b0689]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-eabi.patch"
# content [7326ebb1d6dd4366b5501b75457a47c42e73d70a]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-floatsi-disable-single.patch"
# content [0d14e006afec5460e34a86845222e6df2003f41f]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-floatsi-disable.patch"
# content [c4708189becc0e5cbf1a051ef328331d63d1040d]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-floatunsidf.patch"
# content [4ca5a2b928e94d63a25afac12fc650e9ec5dc0eb]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-fp_consts.patch"
# content [2eeb17adaf6ba7f92e93b887d038f585d1df071b]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-neg.patch"
# content [314b93b4aaa9726dd8f7d4b32398abcd58d5d38d]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-neg2.patch"
# content [fd342c486b11b3acd2b2ee54cbc39168a748cc0a]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-offset.patch"
# content [93326077ecffecd0beccc63c91cb2b5b8507c65c]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-predicates.patch"
# content [f7d1aab2318253d792612b7948a284512c27dd56]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-predicates2.patch"
# content [5ad7fcb717116c225cd830adfefb4ae3809a6fd2]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-predicates3.patch"
# content [6f793a2455e99388abcc685e02bab489cbf57415]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-saveregs.patch"
# content [c1e8833d7155fd919a3cba104d470e7f424ccd2a]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-scc.patch"
# content [c5df894e22c562557ac25913df8a08d70b1f76d0]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-truncsi-disable-new.patch"
# content [7128d66987169d982ff85640c4254cc077cb9cb5]
#
# add_file "packages/gcc/gcc-4.2.2/arm-crunch-truncsi-disable.patch"
# content [f40077e709b33778f2a117af64f8c0e01d891cf6]
#
# add_file "packages/gcc/gcc-4.2.2/arm-nolibfloat.patch"
# content [7e4d52b09f70abec87ee5c8bf94474db31ce9330]
#
# add_file "packages/gcc/gcc-4.2.2/arm-softfloat.patch"
# content [c2fcfd20cc1076a976149055efa9d3d47ccc9961]
#
# add_file "packages/gcc/gcc-4.2.2/arm-thumb-cache.patch"
# content [43c66e2b218e047519dfcb193d3e8221c5bcb099]
#
# add_file "packages/gcc/gcc-4.2.2/arm-thumb.patch"
# content [c1ab94e8925134bf5b5cae5a2689f0c7127eb008]
#
# add_file "packages/gcc/gcc-4.2.2/cache-amnesia.patch"
# content [fc92668ad7f244bd08aa8c42ed9453ec619aa35c]
#
# add_file "packages/gcc/gcc-4.2.2/fix-ICE-in-arm_unwind_emit_set.diff"
# content [f0e4b252f1cb809a7708d82dad7317cb0a29f2ca]
#
# add_file "packages/gcc/gcc-4.2.2/gcc41-configure.in.patch"
# content [baa3cf740d1ea329fcdef9bc110461df8952fc02]
#
# add_file "packages/gcc/gcc-4.2.2/ldflags.patch"
# content [64f8908c9e364510562ad336363270389079e3ad]
#
# add_file "packages/gcc/gcc-4.2.2/sdk-libstdc++-includes.patch"
# content [167cc3a95e581e0035c8b4596f8de9606571619f]
#
# add_file "packages/gcc/gcc-4.2.2/sh3-installfix-fixheaders.patch"
# content [2fbb26e2564a28c5de1119a3312d8d14b533b99d]
#
# add_file "packages/gcc/gcc-4.2.2/unbreak-armv4t.patch"
# content [a184b2b1fd6771fe326d9ab9dd054cba5334513c]
#
# add_file "packages/gcc/gcc-4.2.2/zecke-no-host-includes.patch"
# content [6e9d8445c31e423d84214b7b5560ebd144b1fb51]
#
# add_file "packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch"
# content [6148ea439041ba0af321d2298fea9a6d602f585e]
#
# add_file "packages/gcc/gcc-cross-initial_4.2.2.bb"
# content [c9b958214de00fddf6a53c3627db2faca6c8c588]
#
# add_file "packages/gcc/gcc-cross_4.2.2.bb"
# content [320044acba5e9238f864668a392ad637e62641d5]
#
# add_file "packages/gcc/gcc_4.2.2.bb"
# content [34991f7744aeec6fcbf842874b7ce59dd802bae4]
#
# patch "conf/bitbake.conf"
# from [51abbfe5d5cdfa25444a755852f26e72fd9b6964]
# to [b85561e831e643a7d8abd91fd97e935e8b1285e6]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [2adf1e65425295ff0b2e60d7b25f0d0f3cddb224]
# to [976be890989c81017f4dcd62106b6a418e60b250]
#
# patch "conf/machine/alix.conf"
# from [53d221f82557e515e40af9234547d38664a2dff9]
# to [90e038b4d86ef5e8c9da5f1dd54113de80f39dee]
#
# patch "conf/machine/at91sam9260ek.conf"
# from [b2ddde0c3e0cef0cf1b8e532844b6ef3fe88dc8d]
# to [38a8c8ebda8664ef620ae8fafbb355c20430263e]
#
# patch "conf/machine/at91sam9261ek.conf"
# from [204547873976da00125a4cbc9c924be5401f0a02]
# to [5fe4817f77fa73006d1e4c63a597bcf912350daf]
#
# patch "conf/machine/bd-neon.conf"
# from [8163d0993343ccd839b0f5feeae78282aea520b0]
# to [56e19dd3d98c36386762f59131fe8f87fb92ee0d]
#
# patch "conf/machine/fic-gta02.conf"
# from [03635ef8706b0a62df25a7e8295733d57bbdf8e6]
# to [58d451ef05171ddd801a8f0b60c8a31bfd0c4b56]
#
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
# from [3c5317edbfb2de05bfdcc53497f5a76d49e833db]
# to [d45c132200ab0a148cc9c2d04e54ecf0bcf67549]
#
# patch "packages/linux/linux.inc"
# from [83d195d472ddda5713c305337cc8ff84620bb56c]
# to [5398595a8e49265af51d223f13af5a6a2de98ad3]
#
# patch "packages/linux/linux_2.6.22.bb"
# from [f0f0a50acdeacf4a36a583128b72dc7eb877f72c]
# to [1d40bb1274a99baf29a4739f7f3077e688168cb5]
#
# patch "packages/mtd/mtd-utils-native.inc"
# from [0309b110bda9ca2e08821d9b012301798020d40f]
# to [bb4d53a8d3252ecdb226d54e867ad04c6414b94c]
#
# patch "packages/python/python-pygobject-native_2.12.3.bb"
# from [b12c35aa95676b05bbac981e68101d677cf0edcf]
# to [e881bce25bd043f3122882e8e1b3b0605b632c1c]
#
# set "contrib/armmon_xfer/armmon_xfer.py"
# attr "mtn:execute"
# value "true"
#
# set "contrib/mtn2git/git2mtn.py"
# attr "mtn:execute"
# value "true"
#
# set "contrib/mtn2git/mtn/genproxy.py"
# attr "mtn:execute"
# value "true"
#
# set "contrib/mtn2git/mtn2git.py"
# attr "mtn:execute"
# value "true"
#
============================================================
--- contrib/armmon_xfer/armmon_xfer.py 92a8b202efc3a1fd444effb72f40176212ee947e
+++ contrib/armmon_xfer/armmon_xfer.py 92a8b202efc3a1fd444effb72f40176212ee947e
@@ -0,0 +1,150 @@
+#!/usr/bin/python
+
+# Small utility to upload kernel and/or ramdisk to
+# the compulab board through the ARMmon firmware.
+# Requires pyserial : http://pyserial.sourceforge.net
+# author: Tobias Pflug
+
+import sys, os, serial, getopt, atexit, re
+
+# regular expression to match valid IPv4 addresses
+ipv4_regex = r"\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b"
+
+def wait_flash_complete():
+ while 1:
+ data = s.readline()
+ if quiet != 1:
+ print data,
+ if data.split(" ")[0] == "Finished":
+ break
+
+def test_armmon():
+ # write some nonsense to the monitor and
+ # check if armmon replies accordingly
+ s.write("nonsense\n")
+ s.timeout=2
+ s.read(len("nonsense\n")+1)
+ data = s.read(len("Illegal"))
+ if data.split(" ")[0] != "Illegal":
+ sys.exit("Error: ARMmon not responding. Linux running maybe?")
+ s.timeout=None
+ s.flushInput()
+ s.flushOutput()
+
+
+def usage():
+ sys.stderr.write("""USAGE: %s [options] <server ip>
+ armmon_xfer - data upload tool for cmx270/ARMmon
+
+ options:
+ -p, --port=PORT: serial port, default='/dev/ttyUSB0'
+ -k, --kernel=KERNEL: upload and flash kernel image KERNEL
+ -r, --ramdisk=RAMDISK: upload and flash ramdisk image RAMDISK
+ -b, --bootos: boot Linux
+ -R, --reboot: reboot cmx270
+ -q, --quiet be quiet, little output
+ -h, --help: print this help screen
+
+""" % (sys.argv[0],))
+
+if __name__ == '__main__':
+
+ port = "/dev/ttyUSB0"
+ baud = 38400
+ kernel = None
+ ramdisk = None
+ boot = None
+ reboot = None
+ quiet = None
+ tftp_ip = None
+
+ if len(sys.argv) < 2:
+ usage()
+ sys.exit(0)
+
+ # parse command line
+
+ try:
+ opts, args = getopt.getopt(sys.argv[1:],
+ "p:k:r:bRhq",
+ ["port=", "kernel=","ramdisk=","bootos","reboot","help","quiet"]
+ )
+ except getopt.GetoptError:
+ usage()
+ sys.exit(2)
+
+ for o, a in opts:
+ if o in ("-h","--help"):
+ usage()
+ sys.exit()
+ elif o in ("-k","--kernel"):
+ kernel = a
+ elif o in ("-r","--ramdisk"):
+ ramdisk = a
+ elif o in ("-b","--bootos"):
+ boot = 1
+ elif o in ("-R","--reboot"):
+ reboot = 1
+ elif o in ("-p","--port"):
+ port = o
+ elif o in ("-q","--quiet"):
+ quiet = 1
+
+ # check for arguments and validate IP address
+ # when required by commands
+ if len(args)>0 and re.match(ipv4_regex,args[0]):
+ tftp_ip = args[0]
+ else:
+ if kernel or ramdisk:
+ sys.exit("Error: invalid IP address!")
+
+ try:
+ s = serial.Serial('/dev/ttyUSB0',38400)
+ except:
+ sys.stderr.write("Error: Could not open port: %s\n" % (port))
+ sys.exit(1)
+
+ # test if armmon is responding on bogus input
+ test_armmon()
+
+ # carry out commands
+
+ if reboot:
+ print "Rebooting compulab ..."
+ s.write("reboot\n")
+ s.write("y\n")
+ s.write("y\n")
+ s.close()
+ sys.exit(0)
+
+ if kernel:
+ print "Downloading kernel ..."
+ cmd = "download kernel tftp %s %s\n" % (kernel,tftp_ip)
+ s.write(cmd)
+ data = s.readline()
+ data = s.readline()
+
+ print "Flashing kernel ..."
+ cmd = "flash kernel\n"
+ s.write(cmd)
+ wait_flash_complete()
+
+
+ if ramdisk:
+ print "Downloading ramdisk ..."
+ cmd = "download ramdisk tftp %s %s\n" % (ramdisk,tftp_ip)
+ s.write(cmd)
+ s.readline()
+ s.readline()
+
+ print "Flashing ramdisk ..."
+ cmd = "flash ramdisk\n"
+ s.write(cmd)
+ wait_flash_complete()
+
+ if boot:
+ print "Booting Linux ..."
+ s.write("bootos\n")
+
+ s.close()
+ sys.exit(0)
============================================================
--- contrib/mtn2git/git2mtn.py 052dc79ba2fb8ef0ea324e55549ae13233d144f4
+++ contrib/mtn2git/git2mtn.py 052dc79ba2fb8ef0ea324e55549ae13233d144f4
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+"""
+ Copyright (C) 2006, 2007 Holger Hans Peter Freyther
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation file%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rdbb53fe45696a4f12d4e96c449c65f691e0e8346 -r260b42dfb1d6585e2d36a2b8ad2b20c165cb344c
#
#
#
# rename "packages/angstrom/angstrom-altboot-console-image.bb"
# to "packages/angstrom/altboot-console-image.bb"
#
# rename "packages/angstrom/angstrom-altboot-x11-image.bb"
# to "packages/angstrom/altboot-x11-image.bb"
#
# rename "packages/angstrom/angstrom-bootmanager-image.bb"
# to "packages/angstrom/bootmanager-image.bb"
#
# rename "packages/angstrom/angstrom-console-image.bb"
# to "packages/angstrom/console-image.bb"
#
# rename "packages/angstrom/angstrom-gateway-image.bb"
# to "packages/angstrom/gateway-image.bb"
#
# rename "packages/angstrom/angstrom-mokogateway-image.bb"
# to "packages/angstrom/mokogateway-image.bb"
#
# rename "packages/angstrom/angstrom-x11-gpe-image.bb"
# to "packages/angstrom/x11-gpe-image.bb"
#
# rename "packages/angstrom/angstrom-x11-image.bb"
# to "packages/angstrom/x11-image.bb"
#
# rename "packages/angstrom/angstrom-x11-office-image.bb"
# to "packages/angstrom/x11-office-image.bb"
#
# rename "packages/angstrom/angstrom-x11-pimlico-image.bb"
# to "packages/angstrom/x11-pimlico-image.bb"
#
# rename "packages/images/angstrom-minimal-image-with-mtd-utils.bb"
# to "packages/images/minimal-image-with-mtd-utils.bb"
#
# rename "packages/images/angstrom-minimal-image.bb"
# to "packages/images/minimal-image.bb"
#
# patch "packages/angstrom/x11-office-image.bb"
# from [c2e04567b6ea8b6ecf0ca75c4f86783ad9a9de19]
# to [2a123551bfda9c0a23e167c4de291f03c3a55c25]
#
============================================================
--- packages/angstrom/angstrom-x11-office-image.bb c2e04567b6ea8b6ecf0ca75c4f86783ad9a9de19
+++ packages/angstrom/x11-office-image.bb 2a123551bfda9c0a23e167c4de291f03c3a55c25
@@ -19,7 +19,7 @@ IMAGE_INSTALL = "\
abiword \
gnumeric \
cups \
- claws-mail claws-mail claws-plugin-maildir claws-plugin-mailmbox claws-plugin-rssyl \
+ claws-mail claws-mail claws-plugin-mailmbox claws-plugin-rssyl \
midori minimo \
gphoto2 \
${ANGSTROM_EXTRA_INSTALL}"
More information about the Openembedded-commits
mailing list