[oe-commits] org.oe.dev merge of 'c1fd09a0b09739640d55402e3a267d14a39bfd80'

hrw commit openembedded-commits at lists.openembedded.org
Tue Dec 18 17:34:59 UTC 2007 

merge of 'c1fd09a0b09739640d55402e3a267d14a39bfd80'
     and 'f32bd285f81d67ffe77c826a1f15be44ccefdc3b'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 3e45abc3496f0c38be9a9e7e4b949a1ac1984e02
ViewMTN: http://monotone.openembedded.org/revision/info/3e45abc3496f0c38be9a9e7e4b949a1ac1984e02
Files:
1
packages/libxml/files/no-testapi.patch
packages/linux/linux-2.6.23+2.6.24-rc5
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270
packages/matchbox-desktop-sato
packages/matchbox-sato
packages/matchbox-sato/matchbox-sato
packages/matchbox-sato/matchbox-sato/etc
packages/matchbox-sato/matchbox-sato/etc/matchbox
packages/gcc/files/gcc4-mtune-compat.patch
packages/gtk-webcore/midori_0.0.15.bb
packages/images/poky-base-image.bb
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
packages/matchbox-sato/matchbox-sato/etc/matchbox/session
packages/matchbox-sato/matchbox-sato/matchbox-session
packages/matchbox-sato/matchbox-sato_0.1.bb
conf/bitbake.conf
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/angstrom.inc
conf/machine/cm-x270.conf
conf/machine/h1910.conf
conf/machine/h1940.conf
conf/machine/h2200.conf
conf/machine/h3600.conf
conf/machine/h3800.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/collie-2.6.inc
conf/machine/include/palm.inc
conf/machine/include/zaurus-2.6.inc
conf/machine/jornada6xx.conf
conf/machine/jornada7xx.conf
conf/machine/looxc550.conf
conf/machine/magician.conf
conf/machine/netbook-pro.conf
conf/machine/nokia770.conf
conf/machine/nokia800.conf
conf/machine/rx1950.conf
conf/machine/rx3000.conf
conf/machine/simpad.conf
contrib/angstrom/build-release.sh
packages/curl/curl_7.16.4.bb
packages/gcc/gcc-cross-sdk_3.4.4.bb
packages/gcc/gcc-cross_3.4.4.bb
packages/gcc/gcc_3.4.4.bb
packages/linux/linux-linkstationarm_2.6.12.bb
packages/linux/linux-linkstationppc_2.6.21-rc5.bb
packages/linux/linux-rp-2.6.22/defconfig-qemux86
packages/linux/linux-rp_2.6.22.bb
packages/linux/linux.inc
packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
packages/ncurses/ncurses/visibility.patch
packages/ncurses/ncurses_5.4.bb
packages/tasks/task-base.bb
packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
packages/uboot/u-boot-utils-native_1.2.0.bb
packages/uboot/u-boot-utils_1.2.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
mtn:execute
true
packages/avahi/avahi_0.6.22.bb
conf/distro/angstrom-2008.1.conf
packages/avahi/avahi.inc
Diffs:

#
# mt diff -rc1fd09a0b09739640d55402e3a267d14a39bfd80 -r3e45abc3496f0c38be9a9e7e4b949a1ac1984e02
#
# 
# 
# delete "packages/libxml/files/no-testapi.patch"
# 
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc5"
# 
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270"
# 
# add_dir "packages/matchbox-desktop-sato"
# 
# add_dir "packages/matchbox-sato"
# 
# add_dir "packages/matchbox-sato/matchbox-sato"
# 
# add_dir "packages/matchbox-sato/matchbox-sato/etc"
# 
# add_dir "packages/matchbox-sato/matchbox-sato/etc/matchbox"
# 
# add_file "packages/gcc/files/gcc4-mtune-compat.patch"
#  content [7f1c7b590473405ac775e30f798822df399124bb]
# 
# add_file "packages/gtk-webcore/midori_0.0.15.bb"
#  content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
# 
# add_file "packages/images/poky-base-image.bb"
#  content [66c0c8137141d9eba661ea645f864e06f05e045c]
# 
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch"
#  content [594f8119fb7412cc3a58789192ef4fe1225dfe1d]
# 
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch"
#  content [3a0164b7721c3e46446104e684de419a61362a5c]
# 
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch"
#  content [8d657a0c60045ee9ebb5121583f0b5d6a1dad97a]
# 
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch"
#  content [7be809ca5d666e613ca1e1215552fda23819dd11]
# 
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch"
#  content [178d843edcdae70a42a99ee4b3a55de4734a7c1d]
# 
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig"
#  content [8483c6f77370ab189aeb3d4f9246d1b2563fc301]
# 
# add_file "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
#  content [ea7f634ff11fe3d829b90eacf2f7e442fda2de65]
# 
# add_file "packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb"
#  content [d2039393304243c5b1fc3bd6c8d7827bb9c137b6]
# 
# add_file "packages/matchbox-sato/matchbox-sato/etc/matchbox/session"
#  content [7c060152ca65e683966e2376067c55b8e71582e2]
# 
# add_file "packages/matchbox-sato/matchbox-sato/matchbox-session"
#  content [c32dbae334b8f44e316abb4125fc51398d09f80e]
# 
# add_file "packages/matchbox-sato/matchbox-sato_0.1.bb"
#  content [0408c12a10eb5270db838eaa7093e5ce16b1679e]
# 
# patch "conf/bitbake.conf"
#  from [a1f6c5d6d3d4d66c93aa695c408f6bd53a242eb4]
#    to [5044eed5572b1c9c12c31cf7952ccedc1648524c]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [7329acd7d0b92e08e302dab3b873ff71a3a5e0da]
#    to [27fb03e6e272d6cbc1b97489f33e1e076ac5625b]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [2ee34e9004f488e328231f5a1f139e5225d0e2cf]
#    to [9bb6cf26f7a7451d99dda12e51b6584c26194aa5]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [52dbd93aadf5979fc5b657ed07068f613d323a74]
#    to [b2fcc97fd9d2dd36be72566d73b0c456e0bc36da]
# 
# patch "conf/machine/cm-x270.conf"
#  from [01e554b1475f1f31f329a84fefd8199e5290fbcc]
#    to [2a8d6b9ac864b5f94ce6689ef7814ec193676166]
# 
# patch "conf/machine/h1910.conf"
#  from [8c804116d1d1ba9168798328770d1e5de28235f4]
#    to [5d0e6102d9262ec21df09d0780240368654de730]
# 
# patch "conf/machine/h1940.conf"
#  from [049b100411c0eb5e07e8aa959eb355443ebc8e62]
#    to [5d5ed7d3174c8626b826213337b0e2943ebd402b]
# 
# patch "conf/machine/h2200.conf"
#  from [dbbf175b117be5072305298eb83c9da4db932774]
#    to [517c64f5b7a22dd1f67791d8534910358ca7b6e1]
# 
# patch "conf/machine/h3600.conf"
#  from [99592d7e77fd317519f43f5db57cf5da1814b1a0]
#    to [baccbbb3fd46dea023ff7dc49ac173b169688428]
# 
# patch "conf/machine/h3800.conf"
#  from [770f223d05006e764028a3ae322091d63a5a15ba]
#    to [fc56ab4ab42e6f66cc6f6209f0dd114355b91000]
# 
# patch "conf/machine/h3900.conf"
#  from [ba6e4bdcb26b319daae0835f4eef2c47a841fa3e]
#    to [849df89a61a34c3f1c79560dccd714393cceb3c0]
# 
# patch "conf/machine/h4000.conf"
#  from [6c7b95aedd50d9f49088b0f0d050dba11b72af1a]
#    to [2f23045424e0dc12c7ee9c1d485ba6c477117ed9]
# 
# patch "conf/machine/h5000.conf"
#  from [bb77d647234a173113a7e97b543d1059381c7257]
#    to [e3be93bf378f53331316ca75535d32465f86f9b0]
# 
# patch "conf/machine/h6300.conf"
#  from [e1a2c9d17fb731040d2e84bc13ba955232d0f5c9]
#    to [4c6c8fdebd9d8dc8eb6354ae169862cc5662c63a]
# 
# patch "conf/machine/htcalpine.conf"
#  from [f98db98a7f6a213ef95099564d36eb534dcf7e1e]
#    to [802992dbe7902b4d3b3dc7d58c62c2fce6db5692]
# 
# patch "conf/machine/htcapache.conf"
#  from [85b3799dbf21a7bc89bc888892fb26f330a3b213]
#    to [e42671ae241f36191c65cf0e671acc0be0ba3d34]
# 
# patch "conf/machine/htcblueangel.conf"
#  from [0c19233d7062948ae1fec57ba52f8627716d1dd2]
#    to [bd67f8166ed61397dc7eacf52aa56206eec3dcf1]
# 
# patch "conf/machine/htchimalaya.conf"
#  from [e402ae7923faf0ef767e500842820754adf95d26]
#    to [5b5a7a0c10307d5ac09035f291fcd391ad86c991]
# 
# patch "conf/machine/htcsable.conf"
#  from [e839db7ced3fc8ad5fa110b108879d7deb946433]
#    to [1c17d91980d832248cff034b882d033d426d3adf]
# 
# patch "conf/machine/htctornado.conf"
#  from [92930583820f744123783398b9289029467426bb]
#    to [979eaba253df13d5af8e9713eaf8db9ed45856b6]
# 
# patch "conf/machine/htcuniversal.conf"
#  from [ed21482af85e14b44ba36c3a1957e387fb4f0299]
#    to [c3c6fb34551bb7ce746a908db22f450adcb9cfa4]
# 
# patch "conf/machine/htcwallaby.conf"
#  from [6197c7cff0cafc821c99e4e46921fb8cf0e4e1b4]
#    to [f536aa7626c709ec12492ce50cec7af6c4062a8c]
# 
# patch "conf/machine/hx2000.conf"
#  from [4c388078f8a393457e2d370a6d0b8321e53a27dc]
#    to [a3ae9da47e9dea078b01d3e9dee957af54dd6d78]
# 
# patch "conf/machine/hx4700.conf"
#  from [7073f22f2c781c6ef6eaf11fac2de5ae77d66f5b]
#    to [8a9b68dd63f3be8457ae064682536c7c1912b241]
# 
# patch "conf/machine/include/collie-2.6.inc"
#  from [4c2267c98964a40d4dd4216de14ec06eb578694d]
#    to [a71f2479ea4e652346eccf4594034af29bb74651]
# 
# patch "conf/machine/include/palm.inc"
#  from [166ae8b4b06d4c97637ae03d01c773ace2a78f09]
#    to [b8d88830d5077ec934ae7c71d2461970284d99dc]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [6cb1d601b80af4a29b59dd760b6939447fa49736]
#    to [7ecb352669b5b71228489192cdeb5826dc02b46a]
# 
# patch "conf/machine/jornada6xx.conf"
#  from [b17e1ecf2b7a98288b82648ad9c4723b9124a0bf]
#    to [f17b9e945c5c317eb883c46e5a75675f5a073868]
# 
# patch "conf/machine/jornada7xx.conf"
#  from [c41cc23268b4ae13d751e61be124cbce148e220b]
#    to [931f12408f78e84eaafc92103fd2590493bcd246]
# 
# patch "conf/machine/looxc550.conf"
#  from [529a76fa9a251dc8860a581573be21b93a713c79]
#    to [9d267cfb7bddcaa7a780909f13b9893ef5e6827a]
# 
# patch "conf/machine/magician.conf"
#  from [4260af3d8d3a880db6afad5b346400cd59e1fd77]
#    to [c0fd9446610a60ab643595383d5a99b2b23fb6c7]
# 
# patch "conf/machine/netbook-pro.conf"
#  from [22005b0157cbf484254316335c81a9636fbd7882]
#    to [16b274a8c05b0e05cc1944b21b0cdf2fe27df5e0]
# 
# patch "conf/machine/nokia770.conf"
#  from [a2763946febc14b318477d62f3ed1eecfa6c3a6c]
#    to [828d8946d7940a421a16941b49f4c1c5740fd755]
# 
# patch "conf/machine/nokia800.conf"
#  from [dbee9c0aad081a2c82f8e99644e2d2967508913f]
#    to [ede2d35668185c917664bdbafa710c61e835ac69]
# 
# patch "conf/machine/rx1950.conf"
#  from [01b414b0e56e1cc981aa872ae90f09f174d6a2fa]
#    to [a0d7631022017fd94a035fa4b8e8085315b5f694]
# 
# patch "conf/machine/rx3000.conf"
#  from [2c7f1ff05ffdf2b1f2c2d2853d9b529d7c9372e5]
#    to [7a9518260fc59e1a013a84722a718477ed1f1daa]
# 
# patch "conf/machine/simpad.conf"
#  from [32f2aeca8055f0ccf3e78753f11723249b169136]
#    to [9987d298771d159fd85308e85bdb5a82fd16832d]
# 
# patch "contrib/angstrom/build-release.sh"
#  from [8d77a44ca4304a0ee848142edd6f3c86b6abc9ea]
#    to [fcbcc35a1bbbe58855952cff9065301b196efa1a]
# 
# patch "packages/curl/curl_7.16.4.bb"
#  from [9f422993011a8a54e5050ac333fe5e07a7112e3d]
#    to [e059af19afea35121903c9bfbda21700cbf38c07]
# 
# patch "packages/gcc/gcc-cross-sdk_3.4.4.bb"
#  from [ffaafb6a6ef931a5cd71c7623aba38189dc94161]
#    to [5f68404197e1e64b85ecc871a56c3b92bcf9f7aa]
# 
# patch "packages/gcc/gcc-cross_3.4.4.bb"
#  from [674605b2ebdca6409f1f687a9e7245c47464037d]
#    to [453cf98f7ad3555176dec060ff5490029d02f14b]
# 
# patch "packages/gcc/gcc_3.4.4.bb"
#  from [8218fda182662f3f4bcb0f5857619e901d8b6484]
#    to [cc912610fb5388443a043951f51dfe5831de626f]
# 
# patch "packages/linux/linux-linkstationarm_2.6.12.bb"
#  from [230d19e2e48f76e44f8caf816eef47910be90255]
#    to [5c531f3ff8db593954394d2cd7b0bbf6d5f3c034]
# 
# patch "packages/linux/linux-linkstationppc_2.6.21-rc5.bb"
#  from [d038fcab32af632acacf324702cc25ae2f298bb7]
#    to [679383825421e632b5d7cc7a4a1a719a3b8a403a]
# 
# patch "packages/linux/linux-rp-2.6.22/defconfig-qemux86"
#  from [13ba6932d390681dfa74465511435d21ed675514]
#    to [16b8d2c9fa793b6983ce17c0ad73916e3c892e8b]
# 
# patch "packages/linux/linux-rp_2.6.22.bb"
#  from [acbe4f75ccc973360308a4eb4bfc4071a439ddb4]
#    to [354129d3f7a203d9efebefa12179aacae093091c]
# 
# patch "packages/linux/linux.inc"
#  from [74d6d33befb5063d39401bc7a2c8b089ced7e97c]
#    to [c2377d7cc726218e3c29b1d34e48ddc5e3e5c482]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.18.bb"
#  from [62dcdcd2c929e0438841921e99fbfd336aa71d27]
#    to [1591ece17925b88a031d76f96246cad5d04d3424]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.20.bb"
#  from [d423e0a23731766a495f814c464864df869a77bd]
#    to [6ca5c4e670c6594210c1afa9d59511ab71dfe839]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.22.bb"
#  from [1793c1f183598c2d981b16023c4a14245807fc77]
#    to [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
#  from [1793c1f183598c2d981b16023c4a14245807fc77]
#    to [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
# 
# patch "packages/ncurses/ncurses/visibility.patch"
#  from [847022687599a039689754695c85fae33fa139c5]
#    to [28c01d83f1ec0a069a217abdc954a822126275ac]
# 
# patch "packages/ncurses/ncurses_5.4.bb"
#  from [72e763fb5ea691972f152eeaf0b2df386fa086d8]
#    to [a2950eea2cdd28c32834e38f248e4bae8471d9c1]
# 
# patch "packages/tasks/task-base.bb"
#  from [7a9b59f5510daa79b732e48d67445e1d5ebc4c81]
#    to [4872be5529c6ad0d60f8e5da1753a0fb845910a0]
# 
# patch "packages/uboot/u-boot-mkimage-openmoko-native_oe.bb"
#  from [c01c65b1498babb2fc3be4730cb705493ee6c823]
#    to [8f9f753bc2c5c49521344050b8d6c56e4ec93404]
# 
# patch "packages/uboot/u-boot-utils-native_1.2.0.bb"
#  from [a79cb700407a2e90e0c039014ac9e7ebb0f22219]
#    to [6a5c2e1750fa7ea68cbde9258d6e89c1aefb6528]
# 
# patch "packages/uboot/u-boot-utils_1.2.0.bb"
#  from [64396fa43c9fcef1ed1cd3ae82a49d140febbbd0]
#    to [a665ab3de0681644fca851349a5fd6339733fb46]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [82f390a2257420604caa01ac186221938ae505ce]
#    to [684d183b9b73eecbbdb15dc21ff863ae212a9e98]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [b4455938ec659767eadfbe50dd3227b157c2076d]
#    to [6578acd7668e306b7372e0e3aebfb95d49fa7961]
# 
#   set "packages/matchbox-sato/matchbox-sato/etc/matchbox/session"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- packages/gcc/files/gcc4-mtune-compat.patch	7f1c7b590473405ac775e30f798822df399124bb
+++ packages/gcc/files/gcc4-mtune-compat.patch	7f1c7b590473405ac775e30f798822df399124bb
@@ -0,0 +1,14 @@
+Patch for gcc3 to support gcc4-compatible (and consistent) values for -mtune= option.
+
+--- gcc-3.4.4/gcc/config/arm/arm.c.org	2007-12-15 23:58:35.000000000 +0200
++++ gcc-3.4.4/gcc/config/arm/arm.c	2007-12-16 00:20:39.000000000 +0200
+@@ -432,7 +432,9 @@
+   {"arm10tdmi",	                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED             | FL_ARCH5 },
+   {"arm1020t",	                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED             | FL_ARCH5 },
+   {"arm926ejs",                          FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
++  {"arm926ej-s",                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
+   {"arm1026ejs",                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
++  {"arm1026ej-s",                        FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
+   {"xscale",                             FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE },
+   {"iwmmxt",                             FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE | FL_IWMMXT },
+   /* V6 Architecture Processors */
============================================================
--- packages/gtk-webcore/midori_0.0.15.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.15.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
============================================================
--- packages/images/poky-base-image.bb	66c0c8137141d9eba661ea645f864e06f05e045c
+++ packages/images/poky-base-image.bb	66c0c8137141d9eba661ea645f864e06f05e045c
@@ -0,0 +1,29 @@
+DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+IMAGE_INSTALL = "\
+	task-base-extended \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	pointercal \
+	matchbox-wm \
+	matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im \
+	matchbox-desktop \
+	${XSERVER} \
+	xserver-kdrive-common xserver-nodm-init \
+	ttf-liberation \
+	xauth xhost xset xrandr \
+	matchbox-sato \
+	matchbox-config-gtk \
+	matchbox-themes-gtk \
+	matchbox-applet-startup-monitor \
+	xcursor-transparent-theme \
+	sato-icon-theme \
+	settings-daemon \
+"
+
+export IMAGE_BASENAME = "poky-base-image"
+IMAGE_LINGUAS = ""
+
+inherit image
+
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch	594f8119fb7412cc3a58789192ef4fe1225dfe1d
+++ packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch	594f8119fb7412cc3a58789192ef4fe1225dfe1d
@@ -0,0 +1,25 @@
+From 2a3b2dd055b235eb14f7654eeef217222cdb8e00 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 18:58:27 -0400
+Subject: [PATCH] cm-x270-match-type
+
+---
+ arch/arm/boot/compressed/head-xscale.S |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S
+index 67ea99e..2e63ba2 100644
+--- a/arch/arm/boot/compressed/head-xscale.S
++++ b/arch/arm/boot/compressed/head-xscale.S
+@@ -44,3 +44,8 @@ __XScale_start:
+ 		str	r1, [r0, #0x18]
+ #endif
+ 
++#if defined(CONFIG_MACH_ARMCORE)
++		mov r7, #(MACH_TYPE_ARMCORE & 0xFF00)
++		add r7, r7, #(MACH_TYPE_ARMCORE & 0xFF)
++#endif
++
+-- 
+1.5.2.5
+
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch	3a0164b7721c3e46446104e684de419a61362a5c
+++ packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch	3a0164b7721c3e46446104e684de419a61362a5c
@@ -0,0 +1,81 @@
+From 7d874d6bb1c1210402938a21ab51a4b64e2d68e5 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 19:01:50 -0400
+Subject: [PATCH] ramdisk_load
+
+---
+ arch/arm/mach-pxa/cm-x270.c        |    6 ++++++
+ include/asm-arm/arch-pxa/cm-x270.h |    4 ++++
+ init/initramfs.c                   |   16 ++++++++++++++++
+ 3 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
+index 177664c..fb607e9 100644
+--- a/arch/arm/mach-pxa/cm-x270.c
++++ b/arch/arm/mach-pxa/cm-x270.c
+@@ -239,6 +239,12 @@ static struct map_desc cmx270_io_desc[] __initdata = {
+ 		.length		= SZ_64M,
+ 		.type		= MT_DEVICE
+ 	},
++	[2] = { /* NOR flash */
++		.virtual	= CMX270_FLASH_VIRT,
++		.pfn		= __phys_to_pfn(PXA_CS0_P%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rf32bd285f81d67ffe77c826a1f15be44ccefdc3b -r3e45abc3496f0c38be9a9e7e4b949a1ac1984e02
#
# 
# 
# add_file "packages/avahi/avahi_0.6.22.bb"
#  content [f286a6ffada3390d2b72ee15d958159d8547d3b1]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [48eeeef2da4e7f0a0dd6bb78271647732c326f66]
#    to [71653d68abac9cadecd9c4f46a1cfadaff2d3f11]
# 
# patch "packages/avahi/avahi.inc"
#  from [caffb4223742bd86a6d49f717b86d9172d22e5e6]
#    to [301235b5768fb7ab4d745a6a87896f738baadc10]
# 
============================================================
--- packages/avahi/avahi_0.6.22.bb	f286a6ffada3390d2b72ee15d958159d8547d3b1
+++ packages/avahi/avahi_0.6.22.bb	f286a6ffada3390d2b72ee15d958159d8547d3b1
@@ -0,0 +1,5 @@
+require avahi.inc
+
+DEPENDS += "intltool-native"
+
+PACKAGES =+ "libavahi-gobject"
============================================================
--- conf/distro/angstrom-2008.1.conf	48eeeef2da4e7f0a0dd6bb78271647732c326f66
+++ conf/distro/angstrom-2008.1.conf	71653d68abac9cadecd9c4f46a1cfadaff2d3f11
@@ -35,14 +35,6 @@ IMAGE_LINGUAS = '${@base_less_or_equal("
 # Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
 IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
 
-FEED_URIS += " \
-		no-arch##${ANGSTROM_URI}/unstable/feed/all \
-		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
-		perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
-		python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
-		debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
-		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
-		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
 
 # set feed path variables
 FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/"
@@ -61,7 +53,7 @@ PCMCIA_MANAGER = "pcmciautils"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
@@ -182,7 +174,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
-    ipkg ipkg-collateral \
+    ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \
     util-linux-mount util-linux-umount \
     ${DEBUG_APPS} \
     "
============================================================
--- packages/avahi/avahi.inc	caffb4223742bd86a6d49f717b86d9172d22e5e6
+++ packages/avahi/avahi.inc	301235b5768fb7ab4d745a6a87896f738baadc10
@@ -45,10 +45,11 @@ FILES_libavahi-glib = "${libdir}/libavah
                         ${sysconfdir}/avahi/avahi-dnsconfd.action \
                         ${sysconfdir}/init.d/avahi-dnsconfd"
 FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
 FILES_avahi-utils = "${bindir}/avahi-*"
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
-		       ${sysconfdir}/udhcpc.d/*avahi-autoipd"
+                       ${sysconfdir}/udhcpc.d/*avahi-autoipd"
 FILES_python-avahi = "${libdir}/python*/site-packages/avahi/*"
 FILES_avahi-discover = "${bindir}/avahi-discover \
                         ${datadir}/applications/avahi-discover.desktop \

More information about the Openembedded-commits mailing list