diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-01-21 11:04:06 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-01-21 11:04:06 +0100 |
| commit | 6f5958334a00ab456cd1b46ad92161204c769ba1 (patch) | |
| tree | 8290ba07e85d4f9246f3b344529eebf85a2c144d /conf | |
| parent | 919c436148165382555251ec98dfa0c435f33cd4 (diff) | |
| parent | 591bc386af2d50c85da59825132704b35ecb9ab3 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/machine/include/lsppc.inc | 2 | ||||
| -rw-r--r-- | conf/machine/lsppchd.conf | 4 | ||||
| -rw-r--r-- | conf/machine/lsppchg.conf | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index da385997ab..384e6ef82c 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -2310,6 +2310,10 @@ sha256=eaa1a9746a4613a75a9fe9fc0c54a724758b899c5a898b8b50578066d8a82ead md5=f8b14e9d87dfe9fa56a7549b16e0cf3e sha256=ad1cbca751301b5b8c735509b905bf7642de6110ec3dda939153cbb9df6db8cb +[http://www.kernel.org/pub/linux/bluetooth/bluez-4.27.tar.gz] +md5=4f0bd19dd04a32eba6149b82b26c3f30 +sha256=9e042fcf2d29a58bd60fe3743130095992c62da4c865d01e6fea2d8d6d20583a + [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz] md5=2aa806940d2c841e57a9b2ab7302b750 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0 diff --git a/conf/machine/include/lsppc.inc b/conf/machine/include/lsppc.inc index 673ce4b447..8a868cbd05 100644 --- a/conf/machine/include/lsppc.inc +++ b/conf/machine/include/lsppc.inc @@ -5,7 +5,7 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" +MACHINE_FEATURES = "kernel26 usbhost ext2" USE_DEVFS = "0" diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf index 5d2ff2de41..171253bb96 100644 --- a/conf/machine/lsppchd.conf +++ b/conf/machine/lsppchd.conf @@ -1,7 +1,7 @@ #@TYPE: Machine #@NAME: HD Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD + UBOOT_MACHINE = "linkstation_HDLAN_config" -require conf/machine/include/lsppc.inc -INHERIT += "lsppchd-image" +require conf/machine/include/lsppc.inc diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf index 92e4ae4029..0a0d2fc1e1 100644 --- a/conf/machine/lsppchg.conf +++ b/conf/machine/lsppchg.conf @@ -1,7 +1,7 @@ #@TYPE: Machine #@NAME: HG Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG + UBOOT_MACHINE = "linkstation_HGLAN_config" -require conf/machine/include/lsppc.inc -INHERIT += "lsppchg-image" +require conf/machine/include/lsppc.inc |