merge of '86dacb8c8e579fd5d42ab61a0c0f344bcf74146d'

     and 'd4a97f257158aba4fde91347580030110ef215bf'

13 files changed, 97 insertions, 39 deletions

diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index e38a3abd06..92c44fe630 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -255,5 +255,5 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     openssh-sftp-server \
     "
 
-SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 8e295028b3..382d562426 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,5 +1,5 @@
-PREFERRED_VERSION_busybox 	= "1.9.1"
-PREFERRED_VERSION_dbus 		= "1.1.20"
+PREFERRED_VERSION_busybox 	= "1.9.2"
+PREFERRED_VERSION_dbus 		= "1.2.1"
 PREFERRED_VERSION_glib-2.0 	= "2.16.1"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
 PREFERRED_VERSION_libtool 	= "1.5.10"
@@ -7,3 +7,4 @@ PREFERRED_VERSION_pango 	= "1.18.3"
 PREFERRED_VERSION_pulseaudio 	= "0.9.9"
 PREFERRED_VERSION_udev 		= "118"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_dropbear 	= "0.50"
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 837aec9f2d..394ec7c2d4 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -16,7 +16,7 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm'
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
+# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 29b34f9665..fd79eff276 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -5,11 +5,21 @@ PREFERRED_PROVIDER_virtual/libc ?= "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
 
+#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-angstrom-linux-gnueabi-libc-for-gcc    = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc  = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc            = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc        = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc         = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc          = "glibc-intermediate"
+
+
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
+# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os"
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 7e8e60d7dd..4b68293faf 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -3,6 +3,12 @@
 PREFERRED_PROVIDER_virtual/libc = "uclibc"
 PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
 PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc    = "uclibc-initial"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc  = "uclibc-initial"
+
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
@@ -16,8 +22,15 @@ FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-reg
 BUILD_OPTIMIZATION = "-Os"
 
 #Gcc will die with 'internal consistency error when using the above optimizations
-FULL_OPTIMIZATION_avr32 = ""
-BUILD_OPTIMIZATION_avr32 = ""
+#with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports).
+#However, some packages require optimizations to compile (e.g. libmad).
+#It appears the guilty optimization is "-frename-registers", leaving that one 
+#out allows the build to proceed normally.  -fexpensive-optimizations may be OK,
+#it was removed while debugging an issue that ultimately turned out to be due
+#to the ICE fixed by gcc-pr32889.patch.  It needs to be tested again. 
+#Note that this testing was done without the gcc-pr32889.patch.
+FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
+
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index f53f1fb8bd..c7415a7d8b 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -76,8 +76,11 @@ ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
 TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
 TARGET_FPU_ixp4xx ?= "soft"
+TARGET_FPU_ppc405 ?= "soft"
 
-TARGET_FPU_dht-walnut ?= "soft"
+TARGET_FPU_armv6 ?= "hard"
+TARGET_FPU_armv7a ?= "hard"
+TARGET_FPU_ppc603e ?= "hard"
 
 #Set the right arch for the feeds
 #Alphabetically sorted
@@ -284,11 +287,11 @@ TINDER_REPORT     = "1"
 # in their local.conf
 
 # seppuku bbclass
-SEPPUKU_LOGIN        = "http://bugs.openembedded.org/query.cgi?"
-SEPPUKU_QUERY        = "http://bugs.openembedded.org/buglist.cgi?"
-SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
-SEPPUKU_ADDCOMMENT   = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
-SEPPUKU_ATTACHMENT   = "http://bugs.openembedded.org/attachment.cgi?"
+SEPPUKU_LOGIN        = "http://bugs.openembedded.net/query.cgi?"
+SEPPUKU_QUERY        = "http://bugs.openembedded.net/buglist.cgi?"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ADDCOMMENT   = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ATTACHMENT   = "http://bugs.openembedded.net/attachment.cgi?"
 SEPPUKU_AUTOBUILD    = "1"
 
 SEPPUKU_PRODUCT      = "Openembedded"
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
new file mode 100644
index 0000000000..6288c0ab91
--- /dev/null
+++ b/conf/distro/include/fso-autorev.inc
@@ -0,0 +1,8 @@
+SRCREV_pn-gsm0710muxd = "${AUTOREV}"
+SRCREV_pn-pygsm = "${AUTOREV}"
+SRCREV_pn-pyneod = "${AUTOREV}"
+SRCREV_pn-pynoeg = "${AUTOREV}"
+SRCREV_pn-python-odeviced = "${AUTOREV}"
+SRCREV_pn-python-ophoned = "${AUTOREV}"
+SRCREV_pn-python-pytrc = "${AUTOREV}"
+SRCREV_pn-zhone = "${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 90b6737e02..2c2bffea96 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -1,4 +1,3 @@
-EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}"
 SRCREV_pn-assassin ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc
index 843f8e18ba..a7eac524bc 100644
--- a/conf/distro/include/oplinux.inc
+++ b/conf/distro/include/oplinux.inc
@@ -1,10 +1,10 @@
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
+
 # extra checking for needed tools
 #
-
 # set minimal version of BitBake needed
-BB_MIN_VERSION = "1.6.7"
+BB_MIN_VERSION = "1.8.10"
 
 #OPLinux and OPLinux-uclibc source mirrors
 INHERIT += "oplinux-mirrors"
@@ -33,15 +33,16 @@ IMAGE_FSTYPES = "tar.gz jffs2 ext2.gz cramfs squashfs squashfs-lzma cpio.gz"
 
 # Specifies a location to search for pre-generated tarballs when fetching
 # a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
-CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/current/"
+#CVS_TARBALL_STASH = "http://www.digital-opsis.com/oplinux/sources/"
 
+PREMIRRORS = "(ftp|http)://.*/.*/ http://source.digital-opsis.com/"
 
 #
 # Bootstrap & Init
 PREFERRED_PROVIDER_task-bootstrap = "task-base"
 
 # We want images supporting the following features (for task-base
-DISTRO_FEATURES = "nfs smbfs ext2 pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "nfs smbfs ext2 usbhost pci"
 
 
 #We need to set this to avoid problems when building for if host=target
@@ -53,17 +54,21 @@ OPLINUX-uCLIBC_URI = "http://www.digital-opsis.com/oplinux-uclibc"
 
 #Dir config
 IMAGE_ROOTFS = "${TMPDIR}/rootfs/${MACHINE}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 #Set the name of the generated images
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${MACHINE}-${DATE}-${SVN_REV}"
-DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 
+#Do not ship kernel image with the rootfs
+IMAGE_PREPROCESS_COMMAND_append = "if [ -f ${IMAGE_ROOTFS}/boot/bzImage ]; then rm \
+${IMAGE_ROOTFS}/boot/bzImage*;fi;"
 
 
 
 #
-#feed definitions
+#Feed definitions
+#
 #i32 machines
 #i486 machines
 FEED_ARCH_x86           ="i486"
@@ -75,9 +80,6 @@ FEED_ARCH_epia          = "i586"
 
 #i686 machines
 FEED_ARCH_i686-generic  = "i686"
-FEED_ARCH_guinness      = "i686"
-FEED_ARCH_progear       = "i686"
-
 
 #powerpc machines
 #ppc405
@@ -91,12 +93,27 @@ FEED_ARCH_sequoia       = "ppc440e"
 #ppc603e
 FEED_ARCH_efika         = "ppc603e"
 
+#ppce300c2
+FEED_ARCH_mpc8323e-rdb  = "ppce300c2"
+
+#avr32
+FEED_ARCH_atngw100      = "avr32"
+FEED_ARCH_at32stk100    = "avr32"
+
+
 
 #
 #Preferred versions of packages we need
 #
 PREFERRED_VERSION_busybox = "1.2.1"
 PREFERRED_VERSION_u-boot ?= "1.1.4"
+PREFERRED_VERSION_fakeroot ?= "1.7.1"
+PREFERRED_VERSION_fakeroot-native ?= "1.7.1"
+PREFERRED_VERSION_makedev ?= "2.3.1"
+PREFERRED_VERSION_makedevs ?= "1.0.0"
+PREFERRED_VERSION_makedevs-native ?= "1.0.0"
+
+
 # Latest linphone supports yeaphone
 PREFERRED_VERSION_linphone ?= "1.6.0"
 
@@ -106,3 +123,6 @@ PREFERRED_VERSION_linphone ?= "1.6.0"
 DISTRO_SSH_DAEMON ?= "dropbear"
 
 
+#PREFERRED_VERSION_opsis-asterisk-bri_dht-walnut = "1.2.17"
+#PREFERRED_VERSION_zaptel-bri_dht-walnut = "1.2.19"
+#PREFERRED_VERSION_libpri_dht-walnut = "1.2.4"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index d5377020fd..0e04959b7e 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -162,10 +162,10 @@ PREFERRED_VERSION_chrpath-native ?= "0.13"
 PREFERRED_VERSION_ckermit ?= "211"
 PREFERRED_VERSION_clamav ?= "0.91.1"
 PREFERRED_VERSION_clamsmtp ?= "1.8"
-PREFERRED_VERSION_classpath ?= "0.20"
-PREFERRED_VERSION_classpath-gtk ?= "0.93"
-PREFERRED_VERSION_classpath-minimal ?= "0.95"
-PREFERRED_VERSION_classpath-minimal-native ?= "0.95"
+PREFERRED_VERSION_classpath ?= "0.97.1"
+PREFERRED_VERSION_classpath-gtk ?= "0.97.1"
+PREFERRED_VERSION_classpath-minimal ?= "0.97.1"
+PREFERRED_VERSION_classpath-native ?= "0.97.1"
 PREFERRED_VERSION_clearsilver ?= "0.10.3"
 PREFERRED_VERSION_clish ?= "0.7.1"
 PREFERRED_VERSION_cmake-native ?= "2.4.7"
@@ -220,7 +220,7 @@ PREFERRED_VERSION_db ?= "4.3.29"
 PREFERRED_VERSION_dbench ?= "4.0"
 PREFERRED_VERSION_dbh ?= "1.0-18"
 PREFERRED_VERSION_db-native ?= "4.3.29"
-PREFERRED_VERSION_dbus ?= "1.1.20"
+PREFERRED_VERSION_dbus ?= "1.2.1"
 PREFERRED_VERSION_dbus-glib ?= "0.74"
 PREFERRED_VERSION_dbus-glib-native ?= "0.74"
 PREFERRED_VERSION_dbus-native ?= "1.0.3"
@@ -648,7 +648,7 @@ PREFERRED_VERSION_gweled ?= "0.5"
 PREFERRED_VERSION_gxine ?= "0.4.1enhanced"
 PREFERRED_VERSION_gzip ?= "1.3.5"
 PREFERRED_VERSION_hal ?= "0.5.9"
-PREFERRED_VERSION_hal-info ?= "20080313"
+PREFERRED_VERSION_hal-info ?= "20070618"
 PREFERRED_VERSION_haserl ?= "0.8.0"
 PREFERRED_VERSION_havp ?= "0.86"
 PREFERRED_VERSION_hdparm ?= "6.9"
@@ -739,7 +739,7 @@ PREFERRED_VERSION_irssi ?= "0.8.10"
 PREFERRED_VERSION_iso-codes ?= "1.4"
 PREFERRED_VERSION_ixp4xx-npe-native ?= "2.4"
 PREFERRED_VERSION_jack ?= "0.103.0"
-PREFERRED_VERSION_jamvm ?= "1.4.5"
+PREFERRED_VERSION_jamvm ?= "1.5.1"
 PREFERRED_VERSION_jards ?= "1.0"
 PREFERRED_VERSION_jhead ?= "2.6.0"
 PREFERRED_VERSION_jikes ?= "1.22"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 15d37d2e2a..23093ef2c1 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE ?= "20080411"
+EFL_SRCDATE ?= "20080427"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b42f915bbb..8feb23d740 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -14,6 +14,8 @@
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-assassin ?= "41"
 SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-uclibc ?= "21926"
+SRCREV_pn-uclibc-initial ?= "21926"
 SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
@@ -37,7 +39,7 @@ SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "193"
+SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
@@ -152,14 +154,16 @@ SRCREV_pn-opkg-sdk ?= "4247"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-py-odeviced ?= "190"
+SRCREV_pn-python-odeviced ?= "e2ae2c252ef43be23781c2d09567a8d21ca1e965"
+SRCREV_pn-python-ophoned ?= "e657c81a6729aeef21ba4c6b75590658cbbef391"
+SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
-SRCREV_pn-pyneod ?= "88"
-SRCREV_pn-pyneog ?= "88"
+SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
+SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
 SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
-SRCREV_pn-python-pyrtc = "152"
+SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
@@ -168,9 +172,9 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "4297"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-webkit-gtk ?= "30762"
+SRCREV_pn-webkit-gtk ?= "32839"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1971"
-
+SRCREV_pn-zhone ?= "a9496c35328f66ed8e4f840709721c5bacae2bb4"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index c13c9b6c75..ae79e5f9ae 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.9"
+SLUGOS_VERSION = "4.10"
 DISTRO_REVISION ?= ""
 DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # For release (only):