diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/preferred-slugos-versions.inc | 95 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 201 |
2 files changed, 144 insertions, 152 deletions
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc new file mode 100644 index 0000000000..1c69b14fa6 --- /dev/null +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -0,0 +1,95 @@ +#===============================================================================# +#===============================================================================# +# NOTE NOTE NOTE +# +# This *forces* the preferred kernel version; making it unable to be overridden +# in the local.conf file. This is a Very Bad Thing. This is temporary, and +# is intended to facilitate some SlugOS-specific testing without disturbing +# other distros that use the ixp4xx machine type (which is currently where the +# preferred kernel version is set). +# +# This *must* be removed after initial testing is completed. MJW 08-Dec-2008 +# +PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV}" +# +#===============================================================================# +#===============================================================================# +# NOTE NOTE NOTE +# +# Override the sane-srcrev file with regard to the opkg versions - this should +# be removed as soon as opkg starts to work correctly again as newer opkg +# versions fix a number of bugs and add some desireable features. +# +SRCREV_pn-opkg = "160" +SRCREV_pn-opkg-native = "160" +SRCREV_pn-opkg-sdk = "160" +# +#===============================================================================# +#===============================================================================# + +### Standard package preferred versions go here, sorted +### alphabetically. Note that the main slugos.inc file +### may include preferred versions for toolchain components. + +PREFERRED_VERSION_automake-native ?= "1.10" +PREFERRED_VERSION_binutils ?= "2.18.50.0.7" +PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" +PREFERRED_VERSION_busybox ?= "1.13.2" +PREFERRED_VERSION_dbus ?= "1.2.1" +PREFERRED_VERSION_gcc ?= "4.2.4" +PREFERRED_VERSION_gcc-cross ?= "4.2.4" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.4" +PREFERRED_VERSION_gcc-cross-initial ?= "4.2.4" +PREFERRED_VERSION_gcc-cross-intermediate ?= "4.2.4" +PREFERRED_VERSION_glib-2.0 ?= "2.18.3" +PREFERRED_VERSION_glib-2.0-native ?= "2.18.0" +PREFERRED_VERSION_glibc ?= "2.6.1" +PREFERRED_VERSION_glibc-initial ?= "2.6.1" +PREFERRED_VERSION_ipkg ?= "0.99.163" +PREFERRED_VERSION_ipkg-native ?= "0.99.163" +PREFERRED_VERSION_libtool ?= "1.5.10" +PREFERRED_VERSION_libtool-native ?= "1.5.10" +PREFERRED_VERSION_libtool-cross ?= "1.5.10" +PREFERRED_VERSION_libtool-sdk ?= "1.5.10" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" +PREFERRED_VERSION_m4 ?= "1.4.8" +PREFERRED_VERSION_m4-native ?= "1.4.8" +PREFERRED_VERSION_netatalk ?= "2.0.3" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" +PREFERRED_VERSION_pkgconfig ?= "0.23" +PREFERRED_VERSION_pkgconfig-native ?= "0.23" +PREFERRED_VERSION_udev ?= "118" + +##################### Stuff with special notes, and broken stuff: + +# Hack alert - selecting this version of libusb effectively selects +# the use of libusb1 and libusb-compat in the case that something +# still depends on libusb. This is required because otherwise +# libusb will overwrite libusb-compat in staging. +PREFERRED_VERSION_libusb ?= "0.0.0" + +# mtd-utils 1.2.0+git cannot be fetched, so SlugOS will stick +# with 1.1.0 for now: +PREFERRED_VERSION_mtd-utils ?= "1.1.0" + +# boost 1.36 won't build +PREFERRED_VERSION_boost ?= "1.33.1" + +####################### Obsolete stuff, not sure why we keep this: + +# 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" +#PREFERRED_VERSION_cairo ?= "1.4.8" +# +# Stick with an older gettext and e2fsprogs stuff +# and gnutls... (our autotools is too old at the moment) +#PREFERRED_VERSION_gnutls ?= "1.6.3" +#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" + diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index de18291f88..0f88755f8d 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -5,45 +5,6 @@ # WARNING: this file should not be used directly, use one of # the supported slugos-derived distributions instead. -#===============================================================================# -#===============================================================================# -#===============================================================================# -# NOTE NOTE NOTE -# -# This *forces* the preferred kernel version; making it unable to be overridden -# in the local.conf file. This is a Very Bad Thing. This is temporary, and -# is intended to facilitate some SlugOS-specific testing without disturbing -# other distros that use the ixp4xx machine type (which is currently where the -# preferred kernel version is set). -# -# This *must* be removed after initial testing is completed. MJW 08-Dec-2008 -# -PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV}" -# -#===============================================================================# -#===============================================================================# -#===============================================================================# - - - -#===============================================================================# -#===============================================================================# -#===============================================================================# -# NOTE NOTE NOTE -# -# Override the sane-srcrev file with regard to the opkg versions - this should -# be removed as soon as opkg starts to work correctly again as newer opkg -# versions fix a number of bugs and add some desireable features. -# -SRCREV_pn-opkg = "160" -SRCREV_pn-opkg-native = "160" -SRCREV_pn-opkg-sdk = "160" -# -#===============================================================================# -#===============================================================================# -#===============================================================================# - - #---------------------------------------------------------------------------------- # STANDARD SLUGOS DEFINITIONS #---------------------------------------------------------------------------------- @@ -139,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 #---------------------------------------------------------------------------------- @@ -148,130 +115,60 @@ 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" +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" +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" -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.50.0.7" -PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" -PREFERRED_VERSION_gcc ?= "4.2.4" -PREFERRED_VERSION_gcc-cross ?= "4.2.4" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.4" -PREFERRED_VERSION_gcc-cross-initial ?= "4.2.4" -PREFERRED_VERSION_gcc-cross-intermediate ?= "4.2.4" -PREFERRED_VERSION_glibc ?= "2.6.1" -PREFERRED_VERSION_glibc-initial ?= "2.6.1" +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 smallest provider of x11 libraries -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -SRCDATE_diet-x11 ?= "20060106" +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" +# 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.23" - -# 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" -#PREFERRED_VERSION_cairo ?= "1.4.8" - -PREFERRED_VERSION_udev ?= "118" - -# Stick with an older gettext and e2fsprogs stuff -# and gnutls... (our autotools is too old at the moment) -#PREFERRED_VERSION_gnutls ?= "1.6.3" -#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" +SRCDATE_ipkg-utils ?= "20060106" +SRCDATE_ipkg-utils-native ?= "20060106" +SRCDATE_ipkg-link ?= "20060106" +SRCDATE_irssi ?= "20050930" # 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" - -# These shouldn't be here either -- these versions should -# be pulled from a separate include file. But they can -# go here for now. -PREFERRED_VERSION_automake-native ?= "1.10" -PREFERRED_VERSION_busybox ?= "1.13.2" -PREFERRED_VERSION_dbus ?= "1.2.1" -PREFERRED_VERSION_glib-2.0 ?= "2.18.3" -PREFERRED_VERSION_glib-2.0-native ?= "2.18.0" -PREFERRED_VERSION_libtool ?= "1.5.10" -PREFERRED_VERSION_libtool-native ?= "1.5.10" -PREFERRED_VERSION_libtool-cross ?= "1.5.10" -PREFERRED_VERSION_libtool-sdk ?= "1.5.10" -PREFERRED_VERSION_m4 ?= "1.4.8" -PREFERRED_VERSION_m4-native ?= "1.4.8" -PREFERRED_VERSION_pkgconfig ?= "0.23" -PREFERRED_VERSION_pkgconfig-native ?= "0.23" - -# Hack alert - selecting this version of libusb effectively selects -# the use of libusb1 and libusb-compat in the case that something -# still depends on libusb. This is required because otherwise -# libusb will overwrite libusb-compat in staging. -PREFERRED_VERSION_libusb ?= "0.0.0" - -# mtd-utils 1.2.0+git cannot be fetched, so SlugOS will stick -# with 1.1.0 for now: -PREFERRED_VERSION_mtd-utils ?= "1.1.0" - -# boost 1.36 won't build -PREFERRED_VERSION_boost ?= "1.33.1" - +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" + +# 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 |