diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 8 | ||||
| -rw-r--r-- | conf/distro/include/insane-srcrevs.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 17 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 48 | ||||
| -rw-r--r-- | conf/distro/slugos.conf | 1 | ||||
| -rw-r--r-- | conf/machine/include/ixp4xx.inc | 11 | ||||
| -rw-r--r-- | conf/machine/mpc8313e-rdb.conf | 1 |
8 files changed, 48 insertions, 40 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index d38974ba25..afa2a95e2b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5766,10 +5766,6 @@ sha256=494636571ae72af7524c3a7703324ef68dbf755f753054317489fe79ac895ae0 md5=bdcdb1b8ca13dba897c0a2138d1643f5 sha256=694ea8352edf845b0a7dc0c2e0e990bcb8507f64e405edc048ad115c6578e5f7 -[http://gpephone.linuxtogo.org/download/gpephone/libabenabler-0.1/libabenabler-0.1.tar.bz2] -md5=49fe67302fd76543a7574a73c01395ba -sha256=512674419ac2013d11eccf4f106d6cfc719c9c2b49215a8f0e89c5327d176a84 - [http://search.belnet.be/packages/lineox/4.0/updates/SRPMS/libaio-0.3.103-3.src.rpm] md5=3d6ca28cb7cf73ca1d9fe902924bdc84 sha256=9f578643db9fff6ae088a492e6a4aca3cac4c2cbc51afce551687f4f0d36465f @@ -6354,10 +6350,6 @@ sha256=383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c md5=2f0882a711759113b2388a790abe8fd8 sha256=68dd467cf8bd54283da874af54ac35de58b88444371ea48bb5cef289a0942981 -[http://gpephone.linuxtogo.org/download/gpephone/libiac-0.1/libiac-0.1.tar.bz2] -md5=cf829bb82f84728194c64a41e9f1cf32 -sha256=10197df9daee806453c5a7e99e538d7eac0421796f2a9ae114d4369d85fcf3af - [ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz] md5=b77a17e4a5a817100ad4b2613935055e sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index 7c675087ab..e039a144d3 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -62,6 +62,7 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-session ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 0e29c19c5c..316fc5a4de 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -45,6 +45,7 @@ SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-session ?= "${AUTOREV}" SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ead766e3ee..a65f477296 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -9,14 +9,15 @@ SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-bfin-uclibc ?= "1857" +SRCREV_pn-contact ?= "1410" SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dfu-util ?= "2866" SRCREV_pn-dfu-util-native ?= "2866" SRCREV_pn-eds-dbus ?= "628" -SRCREV_pn-eglibc ?= "3531" -SRCREV_pn-eglibc-initial ?= "3531" -SRCREV_pn-eglibc-intermediate ?= "3531" +SRCREV_pn-eglibc ?= "4355" +SRCREV_pn-eglibc-initial ?= "4355" +SRCREV_pn-eglibc-intermediate ?= "4355" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7650" @@ -28,8 +29,9 @@ SRCREV_pn-gypsy ?= "56" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" +SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libfakekey ?= "1455" -SRCREV_pn-libgsmd ?= "3451" +SRCREV_pn-libgsmd ?= "3519" SRCREV_pn-libgsmd-devel ?= "3293" SRCREV_pn-libjana ?= "697" SRCREV_pn-libmokogsmd2 ?= "3378" @@ -40,6 +42,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" +SRCREV_pn-linux-ixp4xx ?= "927" SRCREV_pn-linux-openmoko ?= "3238" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" @@ -69,7 +72,7 @@ SRCREV_pn-openmoko-contacts2 ?= "374" SRCREV_pn-openmoko-dates ?= "467" SRCREV_pn-openmoko-dates2 ?= "661" SRCREV_pn-openmoko-dialer ?= "2811" -SRCREV_pn-openmoko-dialer2 ?= "3462" +SRCREV_pn-openmoko-dialer2 ?= "3522" SRCREV_pn-openmoko-feedreader2 ?= "3080" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" @@ -92,6 +95,7 @@ SRCREV_pn-openmoko-panel-gsm ?= "3256" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" SRCREV_pn-openmoko-panel-usb ?= "3360" SRCREV_pn-openmoko-session ?= "152" +SRCREV_pn-openmoko-sample2 ?= "3537" SRCREV_pn-openmoko-simplemediaplayer ?= "1688" SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192" SRCREV_pn-openmoko-stylus-demo ?= "2324" @@ -116,10 +120,11 @@ SRCREV_pn-python-formencode = "3148" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" -SRCREV_pn-tmut ?= "15" +SRCREV_pn-tmut ?= "60" SRCREV_pn-webkit-gtk ?= "27222" SRCREV_pn-webkit-qt ?= "27222" SRCREV_pn-webkit-qtopia ?= "27222" +SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" SRCREV_pn-networkmanager ?= "2887" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 652373a3eb..0d7c4773b7 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 = "4.6" +SLUGOS_VERSION = "4.7" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -64,6 +64,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_DEBUG = "noirqdebug" # EXTRA PACKAGES @@ -89,28 +90,32 @@ DISTRO_EXTRA_RRECOMMENDS ?= "" # necessary to define which gets generated first, glibc or the kernel, and # this is done by selecting the provider of libc (in this case it needs the # kernel, so there has to be a non-libc gcc to build the kernel!) -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_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" + +# Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +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-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" # compiler/binary/library versions -PREFERRED_VERSION_binutils ?= "2.16" -PREFERRED_VERSION_binutils-cross ?= "2.16" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" -#For SVN uclibc: -#SRCDATE_uclibc ?= "20060120" -#PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" +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_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" +PREFERRED_VERSION_glibc-initial ?= "2.5" # 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_PROVIDER_virtual/kernel ?= "linux-ixp4xx" PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" # Select the smallest provider of x11 libraries @@ -139,12 +144,7 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.163" #FIXME: HACK: REMOVE THIS IGNORE_STRIP_ERRORS = "" -# Due to upstream instability, and another OE project with conflicting -# needs, nail down a specific, known-working version of madwifi-ng. -# Remove this once the madwifi-ng stuff seems to stabilize once again. -#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" - -PREFERRED_VERSION_linux-libc-headers = "2.6.18" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 564a2d0cfb..29c96ce384 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -19,3 +19,4 @@ require conf/distro/include/slugos.inc PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index 175ec80e6a..04b6542470 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -2,13 +2,20 @@ #@NAME: ixp4xx #@DESCRIPTION: genric machine configuration for ixp4xx platforms -MACHINE_FEATURES = "kernel26 usbhost ext2" +# Set default for nslu2 - can be overridden for machines with other features. +MACHINE_FEATURES ?= "kernel26 usbhost ext2" +# Set defaults for nslu2 - can be overridden for machines with other requirements. +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +# Set default for nslu2 - can be overridden for machines with more flash. ROOT_FLASH_SIZE ?= "12" +# Set default for nslu2, nas100d, dsmg600 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" -PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" require conf/machine/include/tune-xscale.inc require conf/machine/include/tune-thumb.inc diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index f32f78ee8a..3c47b53b56 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -10,6 +10,7 @@ PREFERRED_VERSION_u-boot = "git" MACHINE_FEATURES = "kernel26 usbhost ext2" +PREFERRED_VERSION_u-boot = "1.3.0" UBOOT_MACHINE = "MPC8313ERDB_33_config" #don't try to access tty1 |