summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/amsdelta-oe.conf4
-rw-r--r--conf/distro/angstrom-2007.1.conf4
-rw-r--r--conf/distro/debianslug.conf2
-rw-r--r--conf/distro/generic.conf2
-rw-r--r--conf/distro/include/angstrom.inc2
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.6.inc10
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.7.inc4
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.8.inc4
-rw-r--r--conf/distro/include/preferred-gpe-versions.inc4
-rw-r--r--conf/distro/include/sane-srcdates.inc1
-rw-r--r--conf/distro/include/slugos.inc7
-rw-r--r--conf/distro/jlime-shrek.conf2
-rw-r--r--conf/distro/openslug-native.conf2
-rw-r--r--conf/distro/openslug.conf2
-rw-r--r--conf/distro/openzaurus-unstable.conf2
15 files changed, 27 insertions, 25 deletions
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 66dc4fb0a6..362e6e5a30 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -21,8 +21,8 @@ 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"
-PREFERRED_PROVIDER_virtual/libiconv=glibc
-PREFERRED_PROVIDER_virtual/libintl=glibc
+PREFERRED_PROVIDER_virtual/libiconv="glibc"
+PREFERRED_PROVIDER_virtual/libintl="glibc"
# The CSL compiler is unusable because
# 1) certain programs stop to compile
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 738a0cef78..5e7ce0d40c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -19,7 +19,7 @@ DISTRO_TYPE = "debug"
#Set the right arch for the feeds
#Alphabetically sorted
-FEED_ARCH ?= ${TARGET_ARCH}
+FEED_ARCH ?= "${TARGET_ARCH}"
#armv4t machines
@@ -119,7 +119,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
# Virtuals:
PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
# Others:
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index e28fb85d88..e86ffa028c 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "debianslug"
SLUGOS_IMAGESEX = "little-endian"
# debianslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "yes"
+SLUGOS_FLASH_IMAGE = "nslu2"
# NOTE: to build new packages set DEBIANSLUG_EXTRA_BBFILES to the full path name to
# the .bb files for the packages to build - see debianslug-packages.conf in this
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 3bb5df5496..27c0437cf5 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -71,7 +71,7 @@ require conf/distro/include/sane-srcdates.inc
# Framebuffer & X
#
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_tslib ?= tslib
+PREFERRED_PROVIDER_tslib ?= "tslib"
require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
#
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index a3d9694295..3bf87abdb6 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -42,7 +42,7 @@ SLUGOS_IMAGESEX = "little-endian"
#Name the generated images in a sane way
IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
-DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE}
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
# Angstrom *always* has some form of release config, so error out if someone thinks he knows better
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')}"
diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc
index 256bc0103f..9eb5b90abb 100644
--- a/conf/distro/include/preferred-gpe-versions-2.6.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.6.inc
@@ -3,13 +3,13 @@
#
#work around some breakages
-SRCDATE_xserver-kdrive=20050207
-SRCDATE_minimo=20050401
-SRCDATE_cairo=20050330
-SRCDATE_xext=20050222
+SRCDATE_xserver-kdrive="20050207"
+SRCDATE_minimo="20050401"
+SRCDATE_cairo="20050330"
+SRCDATE_xext="20050222"
#set some preferred providers:
-PREFERRED_PROVIDER_gconf=gconf-dbus
+PREFERRED_PROVIDER_gconf="gconf-dbus"
#specify versions, as the header says :)
PREFERRED_VERSION_libmatchbox ?= "1.6"
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
index 56d9c5b059..662dfc386f 100644
--- a/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -6,8 +6,8 @@
#SRCDATE_minimo=20050401
#set some preferred providers:
-PREFERRED_PROVIDER_gconf=gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
+PREFERRED_PROVIDER_gconf="gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
#specify versions, as the header says :)
PREFERRED_VERSION_libmatchbox ?= "1.7"
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index 9c9be528df..bf00aa8d01 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -3,8 +3,8 @@
#
#set some preferred providers:
-PREFERRED_PROVIDER_gconf=gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
+PREFERRED_PROVIDER_gconf="gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
index e78888a02c..7d4efea06e 100644
--- a/conf/distro/include/preferred-gpe-versions.inc
+++ b/conf/distro/include/preferred-gpe-versions.inc
@@ -6,8 +6,8 @@
#SRCDATE_xext=20050222
#set some preferred providers:
-PREFERRED_PROVIDER_gconf=gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
+PREFERRED_PROVIDER_gconf="gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
#specify versions, as the header says :)
#PREFERRED_VERSION_libmatchbox ?= "1.6"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index d000bf4a92..2a6676db58 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -54,6 +54,7 @@ SRCDATE_dvbtraffic ?= "20060814"
SRCDATE_dvbtune ?= "20060814"
SRCDATE_fdclock ?= "20060814"
SRCDATE_fltk ?= "20060814"
+SRCDATE_ipatience ?= "20061112"
SRCDATE_ipkg-link ?= "20050930"
SRCDATE_ipkg-link-1 ?= "20050930"
SRCDATE_ipkg-utils ?= "20050930"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index e015314d92..299944ee29 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -113,8 +113,9 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}"
# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
CMDLINE_DEBUG = "noirqdebug"
-# Building a full image. If you set SLUGOS_FLASH_IMAGE to "yes" a complete
-# 8MByte flash image will be built after the rootfs JFFS2 image.
+# Building a full image. If you set SLUGOS_FLASH_IMAGE to "nslu2" a complete
+# 8MByte flash image will be built after the rootfs JFFS2 image. Other options
+# may later be defined for other vendor-flashable image types.
#
# If you do this you will need to find a source for the LinkSys software to be
# placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch
@@ -170,7 +171,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.18"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19-rc5"
# Select the smallest provider of x11 libraries
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf
index b4875dc37b..19379862ae 100644
--- a/conf/distro/jlime-shrek.conf
+++ b/conf/distro/jlime-shrek.conf
@@ -36,7 +36,7 @@ BBINCLUDELOGS = "yes"
MODUTILS = "26"
IMAGE_FSTYPES = "tar.bz2"
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \
+BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \
kernel-module-3c574-cs kernel-module-3c589-cs kernel-module-8390 \
kernel-module-airo-cs kernel-module-airo console-tools \
kernel-module-arlan \
diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf
index 0366998e79..7452c26eaa 100644
--- a/conf/distro/openslug-native.conf
+++ b/conf/distro/openslug-native.conf
@@ -16,5 +16,5 @@ ASSUME_PROVIDED = "libtool-cross \
"
# Our build host is armeb, not armv5eb that the kernel reports
-BUILD_ARCH = armeb
+BUILD_ARCH = "armeb"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index d5ceeee105..c24001f3f4 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -13,7 +13,7 @@ SLUGOS_IMAGENAME = "openslug"
SLUGOS_IMAGESEX = "big-endian"
# openslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "yes"
+SLUGOS_FLASH_IMAGE = "nslu2"
# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
# the .bb files for the packages to build - see ucslugc-packages.conf in this
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index b1080d1fea..10f00b7604 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -33,7 +33,7 @@ SRCDATE ?= "20060701"
ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_tslib ?= tslib
+PREFERRED_PROVIDER_tslib ?= "tslib"
KERNEL_CONSOLE = "ttyS0"
#DEBUG_OPTIMIZATION = "-O -g3"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 16:07:53 +0000