From 59c2248607178a79f1d96a4b906893931a2b0605 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 20 Feb 2006 17:43:53 +0000 Subject: ep93xx: use correct serial device --- conf/machine/ep93xx.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index f68e3dd36c..1289fb4505 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -18,9 +18,12 @@ BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" # used by sysvinit_2 -SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE = "57600 ttyAM0" # used by some images ROOT_FLASH_SIZE = "8" +#tune for ep93xx cpus +#can be used for crunch support later on +#include conf/machine/tune-ep9312.conf -- cgit v1.2.3 From e1a2d999dae61534f9d3fb45dd9c6e58f36403bb Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Mon, 20 Feb 2006 21:03:49 +0000 Subject: various packages and bitbake.conf: introduce FREEDESKTOP_CVS and make use of it. --- conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c28e3a7e22..98c2002689 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -304,6 +304,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" +FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" # You can use the mirror of your country to get faster downloads by putting -- cgit v1.2.3 From 1631741f4c1341302418ea54edcfefbdf79c56c7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 21 Feb 2006 21:14:48 +0000 Subject: bitbake.conf: Add some new ASSUME_PROVIDED targets --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 98c2002689..2b5856eb29 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}" # python-native should be here but python relies on building # its own in staging -ASSUME_PROVIDED = "cvs-native svn-native" +ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native" ################################################################## # Package default variables. -- cgit v1.2.3 From bc9fa77e7ecf1c84496e90eb3b02e7d01341cda6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 22 Feb 2006 14:09:20 +0000 Subject: angstrom: use multimachine and splitout images per machine in deploy/images --- conf/distro/angstrom.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index eaf3fb61e7..3ea5e4553d 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -14,6 +14,9 @@ MAINTAINER ?= "Angstrom Developers " #use ipkg package format with debian style naming INHERIT += "package_ipk debian" +#use multimachine buildrules +include conf/distro/include/multimachine.conf + #EABI isn't working yet, so we'll use TARGET_OS = linux in the meantime #TARGET_OS = "none-linux-gnueabi" TARGET_OS = "linux" @@ -25,6 +28,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version" #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" - +DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" -- cgit v1.2.3 From 2dd47dc6ea6c6bdf86d85aeea548debba6b4a405 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 22 Feb 2006 23:18:48 +0000 Subject: conf/bitbake.conf: -Add perl-native-runtime and python-native-runtime to the ASSUMED_PROVIDED packages. We expect to be able to run bitbake a suitable python version is installed. Same applies for running autoreconf to perl. -But to cross compile python and perl, we need special native versions. This is why automake is now depending on the 'installed' perl of the system. --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 2b5856eb29..71dc101f0f 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}" # python-native should be here but python relies on building # its own in staging -ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native" +ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime" ################################################################## # Package default variables. -- cgit v1.2.3 From 932b045df7054fa7796910e4683575e8d54b87dd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 23 Feb 2006 13:01:55 +0000 Subject: angstrom: add some more PREFERRED_VERSIONS --- conf/distro/angstrom-2006.9.conf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf') diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index cb4ba04876..0f8fe4e913 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -37,6 +37,10 @@ PREFERRED_PROVIDER_x11=diet-x11 #PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214" #PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214" + +PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" +PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" + # # Opie # -- cgit v1.2.3 From f0f6e539260a043ab863e1ed89b292cd268425a4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 23 Feb 2006 19:12:06 +0000 Subject: ipaq-pxa270.conf: start making it more ipaq hx2xxx friendly --- conf/machine/ipaq-pxa270.conf | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 0c432ad674..11ef098b8c 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -4,14 +4,20 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700" +#use this for a hx47xx ipaq PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" + +#use this for a hx2xxx ipaq +#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" + PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3" PREFERRED_VERSION_orinoco-modules = "0.15rc1" ROOT_FLASH_SIZE = "80" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " +BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ @@ -29,10 +35,12 @@ GPE_EXTRA_INSTALL += "gaim" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-xscale.conf -BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" + + module_autoload_hx4700_power = "hx4700_power" module_autoload_pcmcia = "pcmcia" module_autoload_hx4700_pcmcia = "hx4700_pcmcia" -- cgit v1.2.3 From cf7366fc9ff28e217cf7af73f089b3e68b53bc5a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 23 Feb 2006 20:26:45 +0000 Subject: ipaq-pxa270.conf: fix a typo and add af_key to modules --- conf/machine/ipaq-pxa270.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 11ef098b8c..71c1894353 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -16,13 +16,14 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1" ROOT_FLASH_SIZE = "80" +MODUTILS = "26" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)" +BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ - nls_cp437 nls_iso8859-1 nls_utf8" + nls_cp437 nls_iso8859-1 nls_utf8 af_key" SERIAL_CONSOLE = "115200 ttyS0" -- cgit v1.2.3 From d39e4f40fa8656cf4f83d5d2b5cdac2eacd487ea Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 23 Feb 2006 20:29:31 +0000 Subject: ipaq-pxa270.conf: use sumtool after jffs2 image creation --- conf/machine/ipaq-pxa270.conf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf') diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 71c1894353..f37d7fa642 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -16,6 +16,10 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1" ROOT_FLASH_SIZE = "80" +EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 256KiB -p" + MODUTILS = "26" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" -- cgit v1.2.3 From 76945f6290afc35fbb8f23ba907947396e7dd632 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 24 Feb 2006 22:41:46 +0000 Subject: ixp4xx-kernel: Added support for DSM-G600, and updated to 2.6.16-rc4-git5 --- conf/distro/slugos.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 3b094d769d..2273aca31a 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -170,7 +170,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15.2" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.16-rc4-git5" # Built-in ethernet modules PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth" -- cgit v1.2.3 From 9f6f2893d7e3e56f4e15e4fcd02e4e91b8c39d12 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 26 Feb 2006 06:28:11 +0000 Subject: unslung.conf: update 6.6-alpha now --- conf/distro/unslung.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 11445846b2..24adaed1e8 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.5-alpha" +DISTRO_VERSION = "6.6-alpha" DISTRO_TYPE = "beta" FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" -- cgit v1.2.3 From 86ce70498fe49f9203417553a449eebab2ea3817 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 27 Feb 2006 02:27:23 +0000 Subject: ixp4xx-kernel: updated to 2.6.16-rc4-git9 --- conf/distro/slugos.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 2273aca31a..cf2cb078c5 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -170,7 +170,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.16-rc4-git5" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.16-rc4-git9" # Built-in ethernet modules PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth" -- cgit v1.2.3 From 0dff243b4319411d5b2f3598aef3a805d8420c8f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 27 Feb 2006 13:37:01 +0000 Subject: Add new machine qemuarm (builds images and a kernel compatible with qemu's arm system emulation) --- conf/machine/qemuarm.conf | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 conf/machine/qemuarm.conf (limited to 'conf') diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf new file mode 100644 index 0000000000..2238f6673e --- /dev/null +++ b/conf/machine/qemuarm.conf @@ -0,0 +1,46 @@ +#@TYPE: Machine +#@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" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +GUI_MACHINE_CLASS = "bigscreen" +GPE_EXTRA_INSTALL += "gaim sylpheed" + +include conf/machine/include/handheld-common.conf + +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" + +BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ +pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" + +# Ethernet modules +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" +# NFS Modules +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" +# Crypto Modules +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5" +# SMB and CRAMFS +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs" +# Serial Modules +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs" +# Bluetooth Modules +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ +# kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ +# kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" +# Infrared Modules +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm \ +# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" + +IMAGE_FSTYPES = "ext2" + +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 -- cgit v1.2.3 From 14aa5b2466e9b6bd5642f76c87c1a73deead9994 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 27 Feb 2006 20:33:47 +0000 Subject: slugos packages: added spca5xx and btsco --- conf/distro/slugos-packages.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index b9ac309a60..f05dd23e81 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -16,6 +16,7 @@ ${PKGDIR}/packages/bluez/*.bb \ ${PKGDIR}/packages/bogofilter/*.bb \ ${PKGDIR}/packages/boost/*.bb \ ${PKGDIR}/packages/bridge-utils/*.bb \ +${PKGDIR}/packages/btsco/*.bb \ ${PKGDIR}/packages/busybox/*.bb \ ${PKGDIR}/packages/bwmon/*.bb \ ${PKGDIR}/packages/bzip2/*.bb \ @@ -198,6 +199,7 @@ ${PKGDIR}/packages/setserial/*.bb \ ${PKGDIR}/packages/sgml-common/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ ${PKGDIR}/packages/slugos-init/*.bb \ +${PKGDIR}/packages/spca5xx/*.bb \ ${PKGDIR}/packages/ssmtp/*.bb \ ${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ -- cgit v1.2.3 From 433b85a4d262d30969ec14cf14aee1323da9c0a5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 28 Feb 2006 15:15:30 +0000 Subject: angstrom.conf: use -Os by default, see the comments in the file for more info --- conf/distro/angstrom.conf | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'conf') diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index 3ea5e4553d..6503e142da 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -21,6 +21,11 @@ include conf/distro/include/multimachine.conf #TARGET_OS = "none-linux-gnueabi" TARGET_OS = "linux" +#mess with compiler flags to use -Os instead of -O2 +#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +BUILD_OPTIMIZATION = "-Os" + PARALLEL_INSTALL_MODULES = "1" BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version" -- cgit v1.2.3 From 5de458471ab83a393738bcbded881a1b0fe1c317 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 28 Feb 2006 16:17:17 +0000 Subject: ipaq-pxa270.conf: add an option to use iwmmxt optimizations --- conf/machine/ipaq-pxa270.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf') diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index f37d7fa642..c6f4804d5f 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -40,6 +40,9 @@ GPE_EXTRA_INSTALL += "gaim" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-xscale.conf +# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first +#include conf/machine/include/tune-iwmmxt.conf + BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" -- cgit v1.2.3 From f3c738f66b66c663f682f9154b200ffeae89902d Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Wed, 1 Mar 2006 02:23:55 +0000 Subject: unslung-rootfs: unsling fix, empty pcmcia dir fix - unsling script fixed for no-automatic mount, updated README and NOTES, change to remove empty pcmcia dir --- conf/distro/unslung.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 24adaed1e8..e130ae09cf 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.6-alpha" +DISTRO_VERSION = "6.7-alpha" DISTRO_TYPE = "beta" FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" -- cgit v1.2.3 From d22b7761d665052ffaee6a5b8194683e45e2c43e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 1 Mar 2006 22:16:45 +0000 Subject: angstrom: prefer softfloat till we get proper eabi --- conf/distro/angstrom.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf') diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index 6503e142da..a68adaae42 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -26,6 +26,9 @@ TARGET_OS = "linux" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" BUILD_OPTIMIZATION = "-Os" +#eabi is softfloat by default, but let's make sure :) +TARGET_FPU = "soft" + PARALLEL_INSTALL_MODULES = "1" BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version" -- cgit v1.2.3 From 5cd2591678a3265b4a29af3d8764cec060f4afbf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 2 Mar 2006 10:30:04 +0000 Subject: angstrom-2006.9: move some preferred providers around so angstrom can override stuff in includes like e17 defining a gcc version (WTF?) --- conf/distro/angstrom-2006.9.conf | 49 +++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 26 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 0f8fe4e913..338e0ff17e 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -16,6 +16,25 @@ FEED_URIS += " \ #CVSDATE = 20050331 + +# Opie +include conf/distro/preferred-opie-versions.inc + +# GPE +include conf/distro/preferred-gpe-versions-2.8.inc + +# E +include conf/distro/preferred-e-versions.inc + +PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" +PREFERRED_VERSION_qte = "2.3.10" + + +PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" +PREFERRED_PROVIDER_libx11 = "diet-x11" + + PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" @@ -25,8 +44,11 @@ PREFERRED_PROVIDER_virtual/libintl = "glibc" #EABI stuff #PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_gcc ?= "4.0.2" +PREFERRED_VERSION_gcc-cross ?= "4.0.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.0.2" + -PREFERRED_PROVIDER_x11=diet-x11 #use EABI toolchain #PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214" @@ -41,29 +63,4 @@ PREFERRED_PROVIDER_x11=diet-x11 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" -# -# Opie -# - -PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" -PREFERRED_VERSION_qte = "2.3.10" - -OPIE_VERSION = "1.2.1" -include conf/distro/preferred-opie-versions.inc - -# -# GPE -# - -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_x11 = "diet-x11" - -include conf/distro/preferred-gpe-versions-2.8.inc - -# -# E -# - -include conf/distro/preferred-e-versions.inc -- cgit v1.2.3 From 3326b01658a2c98c72e455e53167ba7f252c3209 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 2 Mar 2006 15:47:25 +0000 Subject: angstrom-2006.9: fix stupid error in feed uris --- conf/distro/angstrom-2006.9.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 338e0ff17e..4bb27afa51 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -10,9 +10,9 @@ DISTRO_TYPE = "debug" FEED_URIS += " \ - base##http:///${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ - ${MACHINE}##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ - updates##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" + base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ + ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ + updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" #CVSDATE = 20050331 @@ -32,7 +32,7 @@ PREFERRED_VERSION_qte = "2.3.10" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_libx11 = "diet-x11" +#PREFERRED_PROVIDER_libx11 = "diet-x11" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -- cgit v1.2.3