diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 25 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 8 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 2 | ||||
| -rw-r--r-- | conf/machine/native.conf | 1 | ||||
| -rw-r--r-- | conf/machine/progear.conf | 15 |
5 files changed, 45 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 8c84ad282c..f49f26b7da 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -425,3 +425,28 @@ IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" # Magic Cookie for SANITY CHECK ################################################################## OES_BITBAKE_CONF = "1" + +################################################################## +# Task-base stuff +################################################################## + +MACHINE_FEATURES ?= "kernel26" +DISTRO_FEATURES ?= "" + +DISTRO_EXTRA_RDEPENDS ?= "" +DISTRO_EXTRA_RRECOMMENDS ?= "" +MACHINE_EXTRA_RDEPENDS ?= "" +MACHINE_EXTRA_RRECOMMENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +COMBINED_FEATURES = "\ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}" + diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 3243c951dc..91708aba37 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -48,6 +48,7 @@ FEED_ARCH_tosa = "armv5te" #i686 machines FEED_ARCH_guinness = "i686" +FEED_ARCH_progear = "i686" FEED_URIS += " \ no-arch##${ANGSTROM_URI}/unstable/feed/all \ @@ -153,12 +154,12 @@ PREFERRED_VERSION_binutils ?= "2.17.50.0.5" PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5" -PREFERRED_VERSION_linux-libc-headers_guinness ?= "2.6.18" +PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18" PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" PREFERRED_VERSION_glibc ?= "2.5" -PREFERRED_VERSION_glibc-intermediate_guinness ?= "2.4" +PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.5" # To use an EABI compatible version 3 series gcc, either uncomment @@ -171,9 +172,6 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5" # Busybox <1.1.0 doesn't have EABI support PREFERRED_VERSION_busybox = "1.2.1" -PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" -PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" - PREFERRED_VERSION_dbus ?= "1.0.1" PREFERRED_VERSION_dbus-glib ?= "0.71" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 20f8be01c1..7f0546c271 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -49,4 +49,4 @@ 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')}" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" diff --git a/conf/machine/native.conf b/conf/machine/native.conf index d3c77bf9bd..04939da36e 100644 --- a/conf/machine/native.conf +++ b/conf/machine/native.conf @@ -11,3 +11,4 @@ ASSUME_PROVIDED += "virtual/gcc-initial virtual/gcc virtual/g++ virtual/libc vir ASSUME_PROVIDED += "binutils-cross" ASSUME_PROVIDED += "virtual/libiconv virtual/libintl virtual/libc" +IMAGE_FSTYPES ?= "tar.gz" diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf new file mode 100644 index 0000000000..fb316181d3 --- /dev/null +++ b/conf/machine/progear.conf @@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: Progear +#@DESCRIPTION: Machine configuration for Progear 1050HX+ webpad + +# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html +TARGET_ARCH = "i686" + +PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" +PREFERRED_PROVIDER_virtual/kernel = "linux" + +OLDEST_KERNEL = "2.6.17" +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia apm screen alsa irda" |