summaryrefslogtreecommitdiffstats
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2008.1.conf3
-rw-r--r--conf/distro/angstrom-2010.x.conf3
-rw-r--r--conf/distro/include/angstrom-2010-preferred-versions.inc4
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--conf/distro/jlime-2010.1.conf30
-rw-r--r--conf/distro/kaeilos-2010.conf3
-rw-r--r--conf/distro/kaeilos.conf3
-rw-r--r--conf/distro/minimal.conf6
-rw-r--r--conf/distro/shr.conf6
9 files changed, 15 insertions, 45 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 8f66ae929b..ec4f21e864 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -20,9 +20,6 @@ DISTRO_PR = ".6"
OLDEST_KERNEL ?= "2.6.16"
-#build staging from packages
-INHERIT += "packaged-staging"
-
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/angstrom-2008-preferred-versions.inc
diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index 8260647517..b8724503e8 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-2010.x.conf
@@ -25,9 +25,6 @@ DISTRO_PR = ".7"
OLDEST_KERNEL ?= "2.6.16"
-#build staging from packages
-INHERIT += "packaged-staging"
-
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/angstrom-2010-preferred-versions.inc
diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc
index 8212c2f45e..2c6c7ba27c 100644
--- a/conf/distro/include/angstrom-2010-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -9,8 +9,8 @@ PREFERRED_VERSION_autoconf = "2.65"
PREFERRED_VERSION_autoconf-native = "2.65"
PREFERRED_VERSION_automake = "1.11.1"
PREFERRED_VERSION_automake-native = "1.11.1"
-PREFERRED_VERSION_busybox = "1.13.2"
-PREFERRED_VERSION_cairo = "1.8.10"
+PREFERRED_VERSION_busybox = "1.17.1"
+PREFERRED_VERSION_cairo = "1.10.0"
PREFERRED_VERSION_dbus = "1.2.24"
PREFERRED_VERSION_dropbear = "0.51"
PREFERRED_VERSION_fontconfig = "2.8.0"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 430e85904d..4c509c6aef 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -53,7 +53,7 @@ USE_NLS_glib-2.0 = "yes"
USE_NLS_glib-2.0-native = "yes"
USE_NLS_gcc-cross = "no"
-INHERIT += "package_ipk debian testlab packaged-staging siteinfo"
+INHERIT += "package_ipk debian testlab siteinfo"
# FULL_OPTIMIZATION
# Optimization settings. Os works fine and is significantly better than O2.
diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf
index f62ca9970e..37e71d35b1 100644
--- a/conf/distro/jlime-2010.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -67,18 +67,10 @@ PREFERRED_PROVIDER_gtk+ = "gtk+"
PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static"
PREFERRED_PROVIDER_bluez-libs = "bluez-libs"
-PREFERRED_VERSION_gcc = "4.4.2"
-PREFERRED_VERSION_gcc-cross = "4.4.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.4.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2"
-PREFERRED_VERSION_binutils = "2.20"
-PREFERRED_VERSION_binutils-cross = "2.20"
-PREFERRED_VERSION_coreutils-native = "7.2"
-
#
# Target OS & FPU system
#
-TARGET_OS = "linux"
+TARGET_OS = "linux-gnueabi"
TARGET_FPU_sh = "soft"
TARGET_FPU_arm = "soft"
@@ -86,12 +78,18 @@ TARGET_FPU_armeb = "soft"
TARGET_FPU_mipsel = "soft"
TARGET_FPU_mips = "soft"
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
+DISTRO_FEATURES += " eabi "
+
+LIBC ?= "eglibc"
+require conf/distro/include/sane-toolchain.inc
+require conf/distro/include/arm-thumb.inc
+
+
-PREFERRED_VERSION_linux-libc-headers = "2.6.31"
-PREFERRED_VERSION_glibc-initial = "2.9"
-PREFERRED_VERSION_glibc = "2.9"
+PREFERRED_PROVIDER_virtual/libc = "${LIBC}"
+PREFERRED_VERSION_eglibc ?= "2.11"
+PREFERRED_VERSION_eglibc-initial ?= "2.11"
+PREFERRED_VERSION_linux-libc-headers = "2.6.34"
#
# Bootstrap & Init
@@ -109,13 +107,9 @@ PREFERRED_PROVIDER_virtual/libx11-native = "libx11-native"
PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib"
PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_VERSION_mesa = "7.6"
-PREFERRED_VERSION_mesa-dri = "7.6"
-PREFERRED_VERSION_mesa-xlib = "7.6"
SERVER ?= " xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mousexf86-video-fbdev "
#
# General Userspace
#
require conf/distro/include/preferred-opie-versions-1.2.4.inc
-PREFERRED_VERSION_cdparanoia = "10.2"
diff --git a/conf/distro/kaeilos-2010.conf b/conf/distro/kaeilos-2010.conf
index 4828dce873..0101705dc7 100644
--- a/conf/distro/kaeilos-2010.conf
+++ b/conf/distro/kaeilos-2010.conf
@@ -18,9 +18,6 @@ DISTRO_PR = ".1"
OLDEST_KERNEL ?= "2.6.28"
-#build staging from packages
-INHERIT += "packaged-staging"
-
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/kaeilos-2009-preferred-versions.inc
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 78a69f110f..1287ea1dac 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -20,9 +20,6 @@ DISTRO_PR = ".5"
OLDEST_KERNEL ?= "2.6.16"
-#build staging from packages
-INHERIT += "packaged-staging"
-
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/kaeilos-2009-preferred-versions.inc
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 2f3a8217a8..376ffdee02 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -46,12 +46,6 @@ DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK'
INHERIT += "debian"
#############################################################################
-# STAGING AREA
-#############################################################################
-# Controlled by packaging system
-INHERIT += "packaged-staging"
-
-#############################################################################
# PACKAGING & FEEDS
#############################################################################
# Chose the packaging system
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 1191d8c88c..9dd1c3e30d 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -122,12 +122,6 @@ DISTRO_FEATURES += " tk "
INHERIT += "debian"
#############################################################################
-# STAGING AREA
-#############################################################################
-# Controlled by packaging system
-INHERIT += "packaged-staging"
-
-#############################################################################
# PACKAGING & FEEDS
#############################################################################
# Chose the packaging system
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-05 14:58:10 +0000