From 3bcd16909c945940017ded43f94652f1a7acf2f5 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 6 Apr 2006 17:37:08 +0000 Subject: asterisk: updated download path, added PR slugos-packages.conf: added asterisk to package list --- conf/distro/slugos-packages.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 0278789f0b..3ed8549418 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -1,6 +1,7 @@ BBFILES := "\ ${PKGDIR}/packages/alsa/*.bb \ ${PKGDIR}/packages/apr/*.bb \ +${PKGDIR}/packages/asterisk/*.bb \ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ ${PKGDIR}/packages/aumix/*.bb \ -- cgit v1.2.3 From ddf840bda3e98eff84c09083edf2706c65ec683f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 7 Apr 2006 15:32:51 +0000 Subject: keymaps handling moved from initscripts to keymaps package - loading keymap require loadkeys from console-tools (which takes 300K) - all Zaurus machines (except collie) will get this package installed - collie 2.4 keymap is the same as kernel one so it is not needed on device anyway users can install it if want to make some changes in mapping Zaurus machines conf: dropped console-tools from RDEPENDS, added keymaps instead - keymaps RDEPEND on console-tools --- conf/machine/include/poodle-2.6.conf | 2 +- conf/machine/include/tosa-2.4.conf | 2 +- conf/machine/include/zaurus-clamshell-2.4.conf | 2 +- conf/machine/include/zaurus-clamshell-2.6.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'conf') diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index b1dcd7fe3b..9076355522 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 88df07cddb..068d8c4677 100644 --- a/conf/machine/include/tosa-2.4.conf +++ b/conf/machine/include/tosa-2.4.conf @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ +BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \ kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ kernel-module-pxa-bi kernel-module-registers \ diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index af66c7294e..b2ca8370e7 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -10,7 +10,7 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ -pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ +pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" # Misc Modules diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index e73028d7ee..95f3c528e8 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -7,7 +7,7 @@ PREFERRED_VERSION_wpa_supplicant = "0.4.7" PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules -- cgit v1.2.3 From 8466b5e6bb299f260f41a4f9db6f7910e4ad5a09 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Apr 2006 21:16:04 +0000 Subject: angstrom-2006.9: insist a bit harder on using the right toolchain bits for EABI to reduce PEBKAC problems --- conf/distro/angstrom-2006.9.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4159d99962..18d942198a 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -49,14 +49,14 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" #use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.0" -PREFERRED_VERSION_gcc-cross ?= "4.1.0" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0" -PREFERRED_VERSION_binutils ?= "2.16.91.0.6" -PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" +PREFERRED_VERSION_gcc = "4.1.0" +PREFERRED_VERSION_gcc-cross = "4.1.0" +PREFERRED_VERSION_gcc-cross-initial = "4.1.0" +PREFERRED_VERSION_binutils = "2.16.91.0.6" +PREFERRED_VERSION_binutils-cross = "2.16.91.0.6" +PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" +PREFERRED_VERSION_glibc = "2.4" +PREFERRED_VERSION_glibc-intermediate = "2.4" -- cgit v1.2.3 From 2e5f3f0f8cbba0a438512c9ff5dab3a2d27df5f6 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 7 Apr 2006 21:22:26 +0000 Subject: conf/sanity.conf: Set BB_MIN_VERSION here classes/sanity.bbclass: -Run the sanitycheck exactly once (on BuildStart) -Check for common utilities/executables as well --- conf/sanity.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/sanity.conf b/conf/sanity.conf index df2ec3e82a..93700ef145 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,6 +3,6 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" - +BB_MIN_VERSION = "1.3.3" INHERIT += "sanity" -- cgit v1.2.3 From 52dcccdfd31b0b0c9ac4725dd52a20b88a6b7b7c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 8 Apr 2006 19:18:40 +0000 Subject: * Remove 2.4 machine support for c7x0, akita, spitz and borzoi. * Remove borzoi machine entirely as its now equal to spitz. * For remaining 2.4/2.6 split machines use ZKERNEL_VERSION instead of KERNEL_VERSION to fix a long standing bug - people will need to update local.conf. * Add dummy terrier MACHINE to point at spitz. --- conf/distro/angstrom-2006.9.conf | 2 -- conf/local.conf.sample | 4 ++-- conf/machine/akita.conf | 4 +--- conf/machine/borzoi.conf | 23 ++--------------------- conf/machine/c7x0.conf | 4 +--- conf/machine/include/zaurus-clamshell-2.6.conf | 1 - conf/machine/poodle.conf | 4 ++-- conf/machine/qemuarm.conf | 2 -- conf/machine/spitz.conf | 4 +--- conf/machine/terrier.conf | 2 ++ conf/machine/tosa.conf | 4 ++-- 11 files changed, 13 insertions(+), 41 deletions(-) create mode 100644 conf/machine/terrier.conf (limited to 'conf') diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 18d942198a..6ca56971ab 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -74,7 +74,6 @@ PREFERRED_PROVIDER_hostap-conf = "hostap-conf" PCMCIA_MANAGER_c7x0 = "pcmciautils" PCMCIA_MANAGER_akita = "pcmciautils" PCMCIA_MANAGER_spitz = "pcmciautils" -PCMCIA_MANAGER_borzoi = "pcmciautils" PCMCIA_MANAGER_nokia770 = "pcmciautils" PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" @@ -90,6 +89,5 @@ GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" #GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" #GPE_EXTRA_INSTALL_append_akita = " libgtkinput" #GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" -#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 9ea8897bff..4417b67862 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -89,8 +89,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # ASSUME_PROVIDED += "qemu-native" # Uncomment this to select a particular kernel version if supported by -# your MACHINE setting. Currently only supported on Zaurus Clamshells. -# KERNEL_VERSION = "2.6" +# your MACHINE setting. Currently only supported by poodle and tosa. +# ZKERNEL_VERSION = "2.6" # Uncomment one of these to build packages during the build process. # This is done automatically if you set DISTRO (see above) diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index da699e7258..89c0d031ee 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,9 +2,7 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf index 10ffb80c32..d037a1f779 100644 --- a/conf/machine/borzoi.conf +++ b/conf/machine/borzoi.conf @@ -1,21 +1,2 @@ -#@TYPE: Machine -#@NAME: Sharp Zaurus SL-C3100 -#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device - -KERNEL_VERSION ?= "2.6" - -include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf - -PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" -PIVOTBOOT_EXTRA_RRECOMMENDS += "" - -# Useful things for the built-in Harddisk -BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" - -IMAGE_FSTYPES = "jffs2 tar.gz" - -ROOT_FLASH_SIZE = "100" -# actually that should really read ROOTFS_SIZE = "100", because with modern kernels, -# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte - +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C3100,\n* because \ +its very similar to the SL-C3000. Use MACHINE = \"spitz\".\n*\n*\n')}" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index af1c9dad1c..0bd9623526 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,10 +2,8 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf ROOT_FLASH_SIZE = "25" # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index 95f3c528e8..97030e66a7 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -46,5 +46,4 @@ BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-mod BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " -BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index a1bf5fbec3..8c83416919 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -5,8 +5,8 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te poodle" -KERNEL_VERSION ?= "2.4" -include conf/machine/include/poodle-${KERNEL_VERSION}.conf +ZKERNEL_VERSION ?= "2.4" +include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index 7a558a731d..f3edef9890 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -2,8 +2,6 @@ #@NAME: qemu ARM Emulator setup #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation -KERNEL_VERSION ?= "2.6" - TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te qemuarm" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 212da52587..f78dd7a3b9 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,10 +2,8 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PIVOTBOOT_EXTRA_RRECOMMENDS += "" diff --git a/conf/machine/terrier.conf b/conf/machine/terrier.conf new file mode 100644 index 0000000000..ca6a20daf5 --- /dev/null +++ b/conf/machine/terrier.conf @@ -0,0 +1,2 @@ +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C3200,\n* because \ +its very similar to the SL-C3000/SL-C3100. Use MACHINE = \"spitz\".\n*\n*\n')}" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index b573f5721d..3485937186 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -5,8 +5,8 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te tosa" -KERNEL_VERSION ?= "2.4" -include conf/machine/include/tosa-${KERNEL_VERSION}.conf +ZKERNEL_VERSION ?= "2.4" +include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" -- cgit v1.2.3