5 files changed, 8 insertions, 12 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index bbdbe7f80b..4ada4a89d4 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -35,9 +35,6 @@ MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
 #use debian style naming
 INHERIT += "debian"
 
-#use multimachine buildrules 
-INHERIT += "multimachine"
-
 #activate config checker
 INHERIT += "sanity" 
 
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 9043345134..66a7201cf0 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -3,8 +3,8 @@ SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
 SRCREV_pn-diversity-nav ?= "${AUTOREV}"
-SRCREV_pn-illume ?= "${AUTOREV}"
-SRCREV_pn-illume-theme ?= "${AUTOREV}"
+#SRCREV_pn-illume ?= "${AUTOREV}"
+#SRCREV_pn-illume-theme ?= "${AUTOREV}"
 SRCREV_pn-libgsmd ?= "${AUTOREV}"
 SRCREV_pn-libjana ?= "${AUTOREV}"
 SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc
index a7eac524bc..36eca58241 100644
--- a/conf/distro/include/oplinux.inc
+++ b/conf/distro/include/oplinux.inc
@@ -9,9 +9,6 @@ BB_MIN_VERSION = "1.8.10"
 #OPLinux and OPLinux-uclibc source mirrors
 INHERIT += "oplinux-mirrors"
 
-#oplinux is a multimachine distro
-INHERIT += "multimachine"
-
 # check for required tools and minimal BitBake version
 INHERIT += "sanity"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index feb237cea6..cdd4c6f993 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -48,8 +48,8 @@ SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "124"
-SRCREV_pn-illume-theme ?= "124"
+SRCREV_pn-illume ?= "134"
+SRCREV_pn-illume-theme ?= "134"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
@@ -141,6 +141,8 @@ SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opkg ?= "4488"
 SRCREV_pn-opkg-native ?= "4491"
 SRCREV_pn-opkg-sdk ?= "4488"
+SRCREV_pn-opkg-utils ?= "4534"
+SRCREV_pn-opkg-utils-native ?= "4534"
 SRCREV_pn-oprofileui ?= "173"
 SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
 SRCREV_pn-psplash ?= "249"
@@ -164,7 +166,7 @@ SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "4297"
+SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 8661e5b065..b149f65f11 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -42,7 +42,7 @@ TARGET_FPU = "soft"
 # glib-2.0 builds require USE_NLS to be overridden
 USE_NLS_glib-2.0 = "yes"
 
-INHERIT += "package_ipk debian multimachine"
+INHERIT += "package_ipk debian"
 
 # FULL_OPTIMIZATION
 #    Optimization settings.  Os works fine and is significantly better than O2.