diff options
Diffstat (limited to 'conf/distro/include/slugos.inc')
| -rw-r--r-- | conf/distro/include/slugos.inc | 158 |
1 files changed, 75 insertions, 83 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 3f92a91a3d..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.0" +SLUGOS_VERSION = "5.4" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -42,6 +42,7 @@ TARGET_FPU = "soft" # glib-2.0 builds require USE_NLS to be overridden 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" @@ -49,6 +50,18 @@ INHERIT += "package_ipk debian testlab packaged-staging" # Optimization settings. Os works fine and is significantly better than O2. FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +# We need to keep OABI compat for things like madwifi-ng. +ARM_KEEP_OABI = "1" + +TARGET_LINK_HASH_STYLE = "-Wl,--hash-style=gnu" + +CXXFLAGS += "-fvisibility-inlines-hidden" + +# There is a problem of sorts with Perl. This needs a better home eventually, +# but for now put it in this file. +FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" +BUILD_OPTIMIZATION_pn-perl = "-O1" + #---------------------------------------------------------------------------------- # FEEDS # The FEED_URIS lines define where on the internet SlugOS looks for packages @@ -68,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 @@ -87,6 +100,12 @@ DISTRO_EXTRA_DEPENDS ?= "" DISTRO_EXTRA_RDEPENDS ?= "" DISTRO_EXTRA_RRECOMMENDS ?= "" +CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" +INHERIT += "nslu2-mirrors" + +#FIXME: HACK: REMOVE THIS +IGNORE_STRIP_ERRORS = "" + #---------------------------------------------------------------------------------- # PACKAGE VERSION CONTROL #---------------------------------------------------------------------------------- @@ -96,92 +115,65 @@ DISTRO_EXTRA_RRECOMMENDS ?= "" # kernel, so there has to be a non-libc gcc to build the kernel!) # Virtuals: -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" -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/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" # Set the preferred provider for a few toolchain-related items, otherwise # these may be selected from the external-toolchain instead. -PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" -PREFERRED_PROVIDER_virtual/armeb-linux-binutils = "binutils-cross" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" - -# compiler/binary/library versions -PREFERRED_VERSION_binutils ?= "2.18" -PREFERRED_VERSION_binutils-cross ?= "2.18" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" -PREFERRED_VERSION_gcc ?= "4.1.2" -PREFERRED_VERSION_gcc-cross ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2" -PREFERRED_VERSION_glibc ?= "2.5" -PREFERRED_VERSION_glibc-initial ?= "2.5" - -# Select the smallest provider of x11 libraries -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -SRCDATE_diet-x11 ?= "20060106" - -# Ensure consistency across all SlugOS builds for the provider of a -# relational database - use the latest version of the SleepyCat -# Berkeley database -PREFERRED_PROVIDER_virtual/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" - -SRCDATE_ipkg-utils ?= "20060106" -SRCDATE_ipkg-utils-native ?= "20060106" -SRCDATE_ipkg-link ?= "20060106" -SRCDATE_irssi ?= "20050930" - -CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" -INHERIT += "nslu2-mirrors" - -PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" - -PREFERRED_VERSION_ipkg ?= "0.99.163" -PREFERRED_VERSION_ipkg-native ?= "0.99.163" - -#FIXME: HACK: REMOVE THIS -IGNORE_STRIP_ERRORS = "" - -PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" - -# New pango and older glib-2.0 versions don't mix, -# so specify exactly what we would like to build. -PREFERRED_VERSION_pango ?= 1.20.5 -PREFERRED_VERSION_glib-2.0 ?= 2.16.1 - -# Stick with an older gettext and e2fsprogs stuff -PREFERRED_VERSION_gettext ?= "0.14.1" -PREFERRED_VERSION_gettext-native ?= "0.14.1" -PREFERRED_VERSION_e2fsprogs-libs ?= "1.39" -PREFERRED_VERSION_e2fsprogs ?= "1.38" -PREFERRED_VERSION_e2fsprogs-native ?= "1.38" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +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 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 +PREFERRED_PROVIDER_virtual/db = "db" +PREFERRED_PROVIDER_virtual/db-native = "db-native" + +SRCDATE_ipkg-utils ?= "20060106" +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+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - -PREFERRED_PROVIDER_avahi ?= "avahi" -PREFERRED_PROVIDER_gconf ?= "gconf" - +PREFERRED_PROVIDER_gtk+ ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" +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: + +require conf/distro/include/preferred-slugos-versions.inc require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc |