diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-08-14 11:52:15 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-08-14 11:52:15 -0700 |
| commit | dc0604b297a6d3bf66baff8cd657ad0b677b1bea (patch) | |
| tree | 70542b8de6aee550c0682bc4e21c715b19ce6f97 /conf | |
| parent | 786619e5a2cb4058f1e6bebb401f1bb8af7efe12 (diff) | |
| parent | 3e633b49e2c54124cf8b2ecdbb2ed3d98d307ef9 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 16 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 10 |
2 files changed, 16 insertions, 10 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index bc214eb1ab..1d48ffa560 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -13050,6 +13050,10 @@ sha256=2dd02787e5bad91e1efbfe2fe041eefe8cf13ebce9607d6dd9764c69f37233a8 md5=22bd67a0a8b7f156c02c5fc08fb1fa24 sha256=2963b3f0f348faa43eb84083ce93070ec82844205744219dec2df46ed2305775 +[http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.24/libbonoboui-2.24.1.tar.bz2] +md5=9ff3ec1c7aefd0b1a15a5b21ecc7b4e4 +sha256=322536bdc23a70287f229168af2538a7b36c1b5041626ba15e22902228750c29 + [http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.6/libbonoboui-2.6.1.tar.bz2] md5=ee26630368b541dc101a65e46e67f5c4 sha256=9a7596434959dbecc975c5c90021da2990189016f3fc65d7362362162a4156aa @@ -13710,6 +13714,10 @@ sha256=1f112ea46c51e063f4085e27b97c88d4e23164eb07056edbbee1a190abe713ec md5=7d50e1fc4c1ee3c268b26e8dfe7e677b sha256=9ecf81d3ad2e1ec0b371d720b37154e8b716af1cd464dbeb06232f8fa4c5e07d +[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.24/libgnomeui-2.24.1.tar.bz2] +md5=8e7d36dd1decfcf5cc4d5cb93bc4d217 +sha256=a2ed289b7b35956eff7ddd4d9f4e2507260a7fcb5d7d01969f2e3bb8278e8dc1 + [http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.6/libgnomeui-2.6.1.1.tar.bz2] md5=16e6717b5d7da982db00fea6167188ef sha256=0c6c91a59e411d196fe56c814bd368224b04e11a341a8ad552398035e8f19d93 @@ -13946,6 +13954,10 @@ sha256=0abae1eef7210e4decab7f89ea5b3a012c06859e91923a7212ca50856bffd500 md5=b96016d7b35c66cf251189e9851ee252 sha256=c1efdeb59fe87145d13d99b7bb6f51b56505081fb2ebc2f7fe7dc3f7699da45e +[http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.26/libgweather-2.26.2.1.tar.bz2] +md5=cef0447b62235c4662aa9691dd9a6c92 +sha256=70cf977060a5e71ade98346070856f09fbf33f6d88f4d49632d7ae0f6b314834 + [http://www.handhelds.org/~mmp/files/libhal-nm-0.0.2.tar.gz] md5=2f0882a711759113b2388a790abe8fd8 sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981 @@ -21898,10 +21910,6 @@ sha256=e8890518a8818e72d44daa1448246df8a6b5958215835f4c72abc833077d1f68 md5=86a847f3128a43a9cf23b7029a656f50 sha256=0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732 -[http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2] -md5=ceef10579a75c92483171f3bd7f77df2 -sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7 - [http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2] md5=ceef10579a75c92483171f3bd7f77df2 sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7 diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index ba923f9515..cd83a7b5a6 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -31,22 +31,20 @@ MACHINE_FEATURES_append_spitz = " usbhost " MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" -MACHINE_EXTRA_RDEPENDS_collie = "" +MACHINE_EXTRA_RDEPENDS_collie = "zaurusd" -# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel # Here we just need snd modules +# Fixme ? pcmcia and pxa2xx-cs are now compiled in kernel +# Fixme ? module-snd for collie +MACHINE_EXTRA_RRECOMMENDS_collie = "" MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" - # For tosa: OHCI suspend/resume fixup # wlan-ng is now in kernel (2.6.29) # Fixme ? module-snd for tosa MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" -# Fixme ? module-snd for collie -MACHINE_EXTRA_RRECOMMENDS_collie = "" - require conf/machine/include/zaurus-kernel.inc require conf/machine/include/initramfs-kexecboot.inc |