diff options
Diffstat (limited to 'conf/distro/include/slugos.inc')
| -rw-r--r-- | conf/distro/include/slugos.inc | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 0f88755f8d..10a2bc4a02 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "5.2" +SLUGOS_VERSION = "5.4" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -81,7 +81,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME} # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) -CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" CMDLINE_DEBUG = "noirqdebug" # EXTRA PACKAGES @@ -120,13 +120,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-interme PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-linux-gnueabi-libc-for-gcc = "glibc" - # Set the preferred provider for a few toolchain-related items, otherwise # these may be selected from the external-toolchain instead. PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" @@ -134,9 +127,11 @@ PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/armeb-linux-binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -# Select the smallest provider of x11 libraries -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" -SRCDATE_diet-x11 ?= "20060106" +# Select the appropriate x11 library provider. The diet-x11 libraries are +# much smaller, but may not be as current as the standard x11 libraries; by +# default we will select the standard libraries and permit the use of an +# override if the user wishes (and has the correct PREFERRED_VERSIONs set). +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" # Ensure consistency across all SlugOS builds for the provider of a relational # database - use the latest version of the SleepyCat Berkeley database @@ -148,6 +143,9 @@ SRCDATE_ipkg-utils-native ?= "20060106" SRCDATE_ipkg-link ?= "20060106" SRCDATE_irssi ?= "20050930" +# We want the newer util-linux package +PREFERRED_PROVIDER_util-linux ?= "util-linux-ng" + # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" @@ -166,6 +164,13 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" PREFERRED_PROVIDER_avahi ?= "avahi" PREFERRED_PROVIDER_gconf ?= "gconf" +PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" + +# we use bluez4 instead of the older bluez3 +DISTRO_BLUETOOTH_MANAGER = "bluez4" +PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" +PREFERRED_PROVIDER_bluez-libs = "bluez4" +PREFERRED_PROVIDER_bluez-utils = "bluez4" # Include any package preferred versions and srcrevs: |