merge of '471f6e7d5fb5bc4d13a2338851dabca9f72b3f0a'

     and '89b1d1f0f032b64f7620006be8bcf6271c70f4b8'

14 files changed, 127 insertions, 20 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 5f8f91240d..232986827c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -157,6 +157,7 @@ CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool
 CVSDIR = "${DL_DIR}/cvs"
 SVNDIR = "${DL_DIR}/svn"
 GITDIR = "${DL_DIR}/git"
+BZRDIR = "${DL_DIR}/bzr"
 
 STAMP = "${TMPDIR}/stamps/${PF}"
 WORKDIR = "${TMPDIR}/work/${PF}"
@@ -203,7 +204,7 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel"
 ##################################################################
 
 IMAGE_ROOTFS = "${TMPDIR}/rootfs"
-IMAGE_BASENAME = "rootfs"
+IMAGE_BASENAME = "${PN}"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
 IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
 IMAGE_CMD = ""
@@ -372,6 +373,7 @@ KERNELORG_MIRROR = "http://kernel.org/"
 FETCHCMD_svn = "/usr/bin/env svn"
 FETCHCMD_cvs = "/usr/bin/env cvs"
 FETCHCMD_wget = "/usr/bin/env wget -t 5"
+FETCHCMD_bzr = "/usr/bin/env bzr"
 
 FETCHCOMMAND = "ERROR, this must be a BitBake bug"
 FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
@@ -383,7 +385,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug"
 UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
 SRCDATE = "${DATE}"
-SRCREV = "${@base_get_srcrev(d)}"
+SRCREV = "${@bb.fetch.get_srcrev(d)}"
 AUTOREV = "${@bb.fetch.get_srcrev(d)}"
 
 SRC_URI = "file://${FILE}"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 909e66dcd9..3b2dcce756 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -267,9 +267,9 @@ 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_binutils          ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross    ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils          ?= "2.18"
+PREFERRED_VERSION_binutils-cross    ?= "2.18"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
 
 #avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 655d435994..34a1e54959 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -21,10 +21,6 @@ DISTRO_REVISION = "0"
 PREFERRED_VERSION_gcc               = "4.2.1"
 PREFERRED_VERSION_gcc-cross         = "4.2.1"
 
-PREFERRED_VERSION_binutils          = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross    = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12"
-
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers = "2.6.22"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 865f0bc5a6..0c3ac35672 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -16,6 +16,11 @@ require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
 #Use this variable in feeds and other parts that need a URI
 ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
 
+#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/*, /etc/apt/sources.list)
+# usefull for derivative distros and local testing
+# As this is runtime we can't and won't use virtual/feed-configs
+ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
+
 #Set the default maintainer to angstrom-dev
 MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
new file mode 100644
index 0000000000..27ce277965
--- /dev/null
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -0,0 +1,74 @@
+#Ggenerated with 
+# bitbake -s | grep svnr  | awk '{print "SRCREV_pn-" $1 "=" $2}' | \
+# sed -e s:\+:\=:g -e s:svnr::g| awk -F "=" '{print $1 "=\"" $3}' | \
+# awk -F "-r" '{print $1"\""}'
+
+# This will miss recipes that have skippackage set (e.g. uclibc)
+
+SRCREV_pn-dfu-util="2866"
+SRCREV_pn-dfu-util-native="2866"
+SRCREV_pn-eglibc="3376"
+SRCREV_pn-eglibc-initial="3376"
+SRCREV_pn-eglibc-intermediate="3376"
+SRCREV_pn-elf2flt="1786"
+SRCREV_pn-gnuradio="6316"
+SRCREV_pn-hildon-1="13599"
+SRCREV_pn-libgsmd="2806"
+SRCREV_pn-libmokogsmd2="2780"
+SRCREV_pn-libmokojournal2="2780"
+SRCREV_pn-libmokopanelui2="2892"
+SRCREV_pn-libmokoui2="2868"
+SRCREV_pn-libowl="277"
+SRCREV_pn-libxosd="627"
+SRCREV_pn-llvm-gcc4="41698"
+SRCREV_pn-llvm-gcc4-cross="41698"
+SRCREV_pn-matchbox-desktop-2="1649"
+SRCREV_pn-matchbox-keyboard="1583"
+SRCREV_pn-matchbox-panel-2="1626"
+SRCREV_pn-neod="2901"
+SRCREV_pn-openmoko-appmanager="1851"
+SRCREV_pn-openmoko-calculator="2404"
+SRCREV_pn-openmoko-calculator2="2789"
+SRCREV_pn-openmoko-common="397"
+SRCREV_pn-openmoko-common2="2679"
+SRCREV_pn-openmoko-contacts="2298"
+SRCREV_pn-openmoko-contacts2="335"
+SRCREV_pn-openmoko-dates="467"
+SRCREV_pn-openmoko-dialer="2811"
+SRCREV_pn-openmoko-dialer2="2869"
+SRCREV_pn-openmoko-feedreader2="2905"
+SRCREV_pn-openmoko-finger-demo="1671"
+SRCREV_pn-openmoko-firststart2="2873"
+SRCREV_pn-openmoko-footer="2354"
+SRCREV_pn-openmoko-icon-theme-standard="2232"
+SRCREV_pn-openmoko-icon-theme-standard2="2840"
+SRCREV_pn-openmoko-keyboard="1631"
+SRCREV_pn-openmoko-libs="2367"
+SRCREV_pn-openmoko-mediaplayer2="2883"
+SRCREV_pn-openmoko-messages="2276"
+SRCREV_pn-openmoko-panel-battery="2897"
+SRCREV_pn-openmoko-panel-bt="2896"
+SRCREV_pn-openmoko-panel-clock="2567"
+SRCREV_pn-openmoko-panel-demo="1622"
+SRCREV_pn-openmoko-panel-demo-simple="1328"
+SRCREV_pn-openmoko-panel-gps="2900"
+SRCREV_pn-openmoko-panel-gsm="2894"
+SRCREV_pn-openmoko-panel-mainmenu="2567"
+SRCREV_pn-openmoko-panel-usb="2893"
+SRCREV_pn-openmoko-session="152"
+SRCREV_pn-openmoko-simplemediaplayer="1688"
+SRCREV_pn-openmoko-sound-theme-standard="2827"
+SRCREV_pn-openmoko-stylus-demo="2324"
+SRCREV_pn-openmoko-stylus-demo-simple="1818"
+SRCREV_pn-openmoko-taskmanager="1663"
+SRCREV_pn-openmoko-tasks="320"
+SRCREV_pn-openmoko-tasks2="320"
+SRCREV_pn-openmoko-theme-standard="2370"
+SRCREV_pn-openmoko-theme-standard-qvga="2370"
+SRCREV_pn-openmoko-today="2556"
+SRCREV_pn-openmoko-today2="2919"
+SRCREV_pn-openmoko-today2-folders="2680"
+SRCREV_pn-opentapi="2012"
+SRCREV_pn-sphyrna="43"
+SRCREV_pn-webkit-gtk="webcore"
+SRCREV_pn-xoo="1623"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 7061ef2c63..0748b8cb7f 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -11,7 +11,7 @@ require conf/distro/angstrom-2007.1.conf
 #
 DISTRO = "openmoko"
 DISTRO_NAME = "OpenMoko"
-DISTRO_VERSION = "P1-August-Snapshot-${DATE}"
+DISTRO_VERSION = "P1-September-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index 2cae2a87dc..0ef522441b 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -24,3 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
 
+#tune for pentium cpu
+require conf/machine/include/tune-pentium.inc
+
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index 883d6b4dd0..8ff87553ba 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -22,3 +22,6 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
+#tune for pentium pro cpu
+require conf/machine/include/tune-pentiumpro.inc
+
diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
new file mode 100644
index 0000000000..7b1a517895
--- /dev/null
+++ b/conf/machine/include/tune-pentium.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=pentium"
+PACKAGE_ARCH = "i586"
+
diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
new file mode 100644
index 0000000000..aa9a8dfa1d
--- /dev/null
+++ b/conf/machine/include/tune-pentiumpro.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=pentiumpro"
+PACKAGE_ARCH = "i686"
+
diff --git a/conf/machine/rokr-e2.conf b/conf/machine/rokr-e2.conf
deleted file mode 100644
index ccd496c03d..0000000000
--- a/conf/machine/rokr-e2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: Motorola EZX rokr e2 
-#@DESCRIPTION: Machine configuration for the Motorola GSM phones rokr e2
-
-require conf/machine/include/motorola-ezx-base.inc
-
-#no touchscreen
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-
diff --git a/conf/machine/rokre2.conf b/conf/machine/rokre2.conf
new file mode 100644
index 0000000000..621e95f166
--- /dev/null
+++ b/conf/machine/rokre2.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: Motorola EZX ROKR E2
+#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E2
+
+require conf/machine/include/motorola-ezx-base.inc
+
+# there is no touchscreen
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
diff --git a/conf/machine/ts72xx.conf b/conf/machine/ts72xx.conf
new file mode 100644
index 0000000000..632f3044cc
--- /dev/null
+++ b/conf/machine/ts72xx.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: Technologic Systems TS-72xx SBC
+#@DESCRIPTION: Machine configuration for Technologic Systems TS-72xx SBC
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
+
+# default is 2.6.22.6
+#PREFERRED_VERSION_linux = "2.6.23-rc5"
+
+SERIAL_CONSOLE = "115200 ttyAM0"
+USE_VT = "0"
+CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/om2007.2/ts72xx/tmp/deploy/glibc/images/ts72xx/nfs_root"
+
+require conf/machine/include/tune-arm920t.inc
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 163b63195e..fe1e2282e4 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -3,6 +3,6 @@
 # See sanity.bbclass
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.8.5"
+BB_MIN_VERSION = "1.8.8"
 INHERIT += "sanity"