8 files changed, 12 insertions, 73 deletions
diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb
deleted file mode 100644
index 68a5119aa1..0000000000
--- a/packages/gtk-engines/gtk-industrial-engine_0.2.36.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SECTION = "x11/base"
-DESCRIPTION = "Industrial theme engine for GTK"
-LICENSE = "GPL2"
-DEPENDS = "gtk+"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \
-	file://no-gtk1.patch;patch=1"
-
-PACKAGES += "gtk-theme-industrial"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so"
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_gtk-theme-industrial = "${datadir}/icons ${datadir}/themes"
-
-inherit autotools
-
-do_configure_prepend() {
-	for i in `ls gtk-common`; do
-		ln -sf ../gtk-common/$i gtk2-engine/$i
-	done
-}
-
diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb
deleted file mode 100644
index 68a5119aa1..0000000000
--- a/packages/gtk-engines/gtk-industrial-engine_0.2.36.4.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SECTION = "x11/base"
-DESCRIPTION = "Industrial theme engine for GTK"
-LICENSE = "GPL2"
-DEPENDS = "gtk+"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \
-	file://no-gtk1.patch;patch=1"
-
-PACKAGES += "gtk-theme-industrial"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so"
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_gtk-theme-industrial = "${datadir}/icons ${datadir}/themes"
-
-inherit autotools
-
-do_configure_prepend() {
-	for i in `ls gtk-common`; do
-		ln -sf ../gtk-common/$i gtk2-engine/$i
-	done
-}
-
diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb
deleted file mode 100644
index 68a5119aa1..0000000000
--- a/packages/gtk-engines/gtk-industrial-engine_0.2.36.5.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SECTION = "x11/base"
-DESCRIPTION = "Industrial theme engine for GTK"
-LICENSE = "GPL2"
-DEPENDS = "gtk+"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \
-	file://no-gtk1.patch;patch=1"
-
-PACKAGES += "gtk-theme-industrial"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so"
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_gtk-theme-industrial = "${datadir}/icons ${datadir}/themes"
-
-inherit autotools
-
-do_configure_prepend() {
-	for i in `ls gtk-common`; do
-		ln -sf ../gtk-common/$i gtk2-engine/$i
-	done
-}
-
diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc
index 95c5af6d1a..a9d7fcb07f 100644
--- a/packages/linux/linux-rp.inc
+++ b/packages/linux/linux-rp.inc
@@ -24,6 +24,7 @@ COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux8
 KERNEL_IMAGETYPE_qemux86 = "bzImage"
 
 CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
+CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd"
 CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
 CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw"
 CMDLINE_OTHER = "dyntick=enable"
diff --git a/packages/smartmontools/smartmontools.inc b/packages/smartmontools/smartmontools.inc
new file mode 100644
index 0000000000..908343d548
--- /dev/null
+++ b/packages/smartmontools/smartmontools.inc
@@ -0,0 +1,8 @@
+SECTION = "console/utils"
+DESCRIPTION = "Control and monitor storage systems using S.M.A.R.T."
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz"
+S = "${WORKDIR}/smartmontools-${PV}"
+
+inherit autotools
diff --git a/packages/smartmontools/smartmontools_5.33.bb b/packages/smartmontools/smartmontools_5.33.bb
index 908343d548..ec9a10d4c5 100644
--- a/packages/smartmontools/smartmontools_5.33.bb
+++ b/packages/smartmontools/smartmontools_5.33.bb
@@ -1,8 +1 @@
-SECTION = "console/utils"
-DESCRIPTION = "Control and monitor storage systems using S.M.A.R.T."
-LICENSE = "GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz"
-S = "${WORKDIR}/smartmontools-${PV}"
-
-inherit autotools
+include smartmontools.inc
diff --git a/packages/smartmontools/smartmontools_5.37.bb b/packages/smartmontools/smartmontools_5.37.bb
new file mode 100644
index 0000000000..ec9a10d4c5
--- /dev/null
+++ b/packages/smartmontools/smartmontools_5.37.bb
@@ -0,0 +1 @@
+include smartmontools.inc
diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index bbc40457f7..b93c5b7165 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment"
-PR = "r3"
+PR = "r4"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -106,7 +106,6 @@ RDEPENDS_gpe-task-connectivity := "\
 
 RDEPENDS_gpe-task-apps-extra := "\
     gpe-filemanager \
-    gpe-nmf \
     gpe-soundbite \
     mbmerlin"