merge of '8c0da7de9130cf6ce338544b5a8d83595a1fd839'

     and 'fa6299477f4dc9026d80a08ac4d4494c8c32eb64'

42 files changed, 60 insertions, 63 deletions

diff --git a/packages/libmimedir/libmimedir_0.3.1.bb b/packages/libmimedir/libmimedir_0.3.1.bb
index 6b0aab737a..5238cb7ef3 100644
--- a/packages/libmimedir/libmimedir_0.3.1.bb
+++ b/packages/libmimedir/libmimedir_0.3.1.bb
@@ -19,6 +19,6 @@ autotools_stage_all
 }
 
 
-PACKAGES += libmimedir-utils
+PACKAGES += "libmimedir-utils"
 FILES_libmimedir-utils = "${bindir}"
 FILES_${PN} = "${libdir}"
diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb
index a0a199151f..f687245fcd 100644
--- a/packages/libmimedir/libmimedir_cvs.bb
+++ b/packages/libmimedir/libmimedir_cvs.bb
@@ -22,7 +22,7 @@ do_stage() {
 	autotools_stage_all
 }
 
-PACKAGES += libmimedir-utils
+PACKAGES += "libmimedir-utils"
 FILES_libmimedir-utils = "${bindir}"
 FILES_${PN} = "${libdir}"
 
diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb
index 42a4a55e29..6504405d49 100644
--- a/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -8,7 +8,7 @@ DEPENDS = "libxsettings virtual/libx11 libxt"
 inherit autotools pkgconfig gpe
 
 SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2"
-S = ${WORKDIR}/xsettings-client-${PV}
+S = "${WORKDIR}/xsettings-client-${PV}"
 
 
 headers = "xsettings-client.h xsettings-common.h"
diff --git a/packages/lockstat/lockstat_1.4.10.bb b/packages/lockstat/lockstat_1.4.10.bb
index 61f4a61b0d..ef7254eab3 100644
--- a/packages/lockstat/lockstat_1.4.10.bb
+++ b/packages/lockstat/lockstat_1.4.10.bb
@@ -5,8 +5,8 @@ DEPENDS = "virtual/kernel"
 SRC_URI = "ftp://oss.sgi.com/projects/lockmeter/download/lockstat-${PV}.tar.gz"
 S = "${WORKDIR}/lockstat"
 
-export KERNEL_VERSION = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}
-export KERNEL_SOURCE = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}
+export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
+export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
 CFLAGS += " -I${KERNEL_SOURCE}/include"
 
 python () {
diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb
index f09e92c05e..4ef906f2f9 100644
--- a/packages/ltrace/ltrace_0.4.bb
+++ b/packages/ltrace/ltrace_0.4.bb
@@ -18,7 +18,7 @@ EXTRA_OEMAKE = "ARCH=${LTRACE_ARCH} \
 
 export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include"
 
-LTRACE_ARCH = ${TARGET_ARCH}
+LTRACE_ARCH = "${TARGET_ARCH}"
 LTRACE_ARCH_x86 = "i386"
 
 do_configure_prepend() {
diff --git a/packages/maemo/audiofile_0.2.6-3osso4.bb b/packages/maemo/audiofile_0.2.6-3osso4.bb
index 46c1b701cb..7b9e0c1cbe 100644
--- a/packages/maemo/audiofile_0.2.6-3osso4.bb
+++ b/packages/maemo/audiofile_0.2.6-3osso4.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL GPL"
 DESCRIPTION = "The Audio File Library provides a uniform and elegant \
 API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \
 WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \
-Research, Amiga IFF/8SVX, and NIST SPHERE." 
+Research, Amiga IFF/8SVX, and NIST SPHERE."
 
 PACKAGES += "${PN}-bin"
 FILES_${PN} = "${libdir}/libaudiofile*.so.*"
@@ -15,7 +15,7 @@ RPROVIDES_${PN} += "audiofile"
 
 SRC_URI = "http://stage.maemo.org/pool/maemo/ossw/source/a/${PN}/${PN}_${PV}.tar.gz"
 
-S = ${WORKDIR}/${PN}-0.2.6
+S = "${WORKDIR}/${PN}-0.2.6"
 
 inherit autotools pkgconfig binconfig
 
diff --git a/packages/maemo/libosso-help_1.0.01.bb b/packages/maemo/libosso-help_1.0.01.bb
index 9a4c1f471c..867cc66b7d 100644
--- a/packages/maemo/libosso-help_1.0.01.bb
+++ b/packages/maemo/libosso-help_1.0.01.bb
@@ -8,7 +8,7 @@ SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/libo/${PN}/libosso
 
 inherit pkgconfig autotools
 
-S = ${WORKDIR}/libosso-help-sdk-${PV}
+S = "${WORKDIR}/libosso-help-sdk-${PV}"
 
 #FILES_${PN} += "${libdir}/dbus-1.0/services/ ${libdir}/outo/*.so ${libdir}/outo/*bin ${libdir}/outo/mimedummy.doc"
 
diff --git a/packages/maemo/osso-af-startup_0.28-1.bb b/packages/maemo/osso-af-startup_0.28-1.bb
index 640ebc9671..daf120a914 100644
--- a/packages/maemo/osso-af-startup_0.28-1.bb
+++ b/packages/maemo/osso-af-startup_0.28-1.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://stage.maemo.org:80/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.
            file://osso-af-startup-source.patch;patch=1;pnum=0 \
            file://launch-no-o.patch;patch=1;pnum=0"
 
-S = ${WORKDIR}/${PN}-0.28
+S = "${WORKDIR}/${PN}-0.28"
 
 FILES_${PN} = "${sysconfdir}/osso-af-init ${sysconfdir}/init.d/af-startup"
 FILES_osso-af-services = "${sysconfdir}/init.d/af-services"
@@ -42,4 +42,4 @@ do_install () {
 	install -m 755 ${S}/top-scripts/af-base-apps ${D}/${sysconfdir}/init.d/af-base-apps
 	install -m 755 ${S}/top-scripts/af-services ${D}/${sysconfdir}/init.d/af-services
 	install -m 755 ${S}/top-scripts/af-startup ${D}/${sysconfdir}/init.d/af-startup
-}
\ No newline at end of file
+}
diff --git a/packages/maemo/osso-app-killer_0.4-3.bb b/packages/maemo/osso-app-killer_0.4-3.bb
index e531120956..96de1cd03a 100644
--- a/packages/maemo/osso-app-killer_0.4-3.bb
+++ b/packages/maemo/osso-app-killer_0.4-3.bb
@@ -5,7 +5,7 @@ DEPENDS = "libosso"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz"
 
-S = ${WORKDIR}/${PN}-0.4
+S = "${WORKDIR}/${PN}-0.4"
 
 inherit autotools pkgconfig
 
diff --git a/packages/maemo/osso-esd_0.5.bb b/packages/maemo/osso-esd_0.5.bb
index e53cc95a05..dde84ca601 100644
--- a/packages/maemo/osso-esd_0.5.bb
+++ b/packages/maemo/osso-esd_0.5.bb
@@ -7,7 +7,7 @@ DEPENDS = "audiofile osso-dsp-headers"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.orig.tar.gz"
 
-S = ${WORKDIR}/esd
+S = "${WORKDIR}/esd"
 
 inherit autotools pkgconfig
 
diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
index 9ab3e03b33..e0f258decd 100644
--- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
+++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV
 
 EXTRA_OECONF = "--with-ipc=dbus --enable-ext-dbus-daemon --disable-orbit"
 
-S = ${WORKDIR}/${PN}-2.8.4.4
+S = "${WORKDIR}/${PN}-2.8.4.4"
 
 FILES_${PN} += " ${libdir}/vfs"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include"
diff --git a/packages/maemo/osso-sounds_0.3-1.bb b/packages/maemo/osso-sounds_0.3-1.bb
index 8d82a29610..662eefd9f8 100644
--- a/packages/maemo/osso-sounds_0.3-1.bb
+++ b/packages/maemo/osso-sounds_0.3-1.bb
@@ -5,7 +5,7 @@ DEPENDS = "audiofile"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz"
 
-S = ${WORKDIR}/${PN}-0.3
+S = "${WORKDIR}/${PN}-0.3"
 
 datafiles = "game-chess_check.wav ui-charging_started.wav game-chess_checkmate.wav \
              ui-clock_alarm.mp3 game-chess_illegal_move.wav ui-confirmation_note.wav \
diff --git a/packages/maemo/sapwood_1.20-1.bb b/packages/maemo/sapwood_1.20-1.bb
index e4241e324e..8cd52fa602 100644
--- a/packages/maemo/sapwood_1.20-1.bb
+++ b/packages/maemo/sapwood_1.20-1.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://stage.maemo.org/pool/maemo/ossw/source/s/${PN}/${PN}_${PV}.tar
            file://cflags.patch;patch=1;pnum=0 \
            file://sockets.patch;patch=1;pnum=0"
 
-S = ${WORKDIR}/${PN}-1.20 
+S = "${WORKDIR}/${PN}-1.20"
 EXTRA_OECONF = "--enable-abstract-sockets=no"
 
 inherit autotools pkgconfig
diff --git a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
index 6ee3bd2c77..6534285fd4 100644
--- a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
+++ b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb
@@ -9,7 +9,7 @@ CFLAGS += "-I${STAGING_INCDIR} \
 	   -I${STAGING_INCDIR}/glib-2.0 \
 	   -I${STAGING_INCDIR}/freetype2 \
 	   -I${STAGING_INCDIR}/atk-1.0 \
-	   -I${STAGING_INCDIR}/libwnck-1.0 \	
+	   -I${STAGING_INCDIR}/libwnck-1.0 \
 	   -I${STAGING_LIBDIR}/gtk-2.0/include \
 	   -I${STAGING_INCDIR}/cairo \
 	   -DWNCK_I_KNOW_THIS_IS_UNSTABLE"
diff --git a/packages/matchbox-common/matchbox_0.8.1.bb b/packages/matchbox-common/matchbox_0.8.1.bb
index a74e6d1398..701c2bc302 100644
--- a/packages/matchbox-common/matchbox_0.8.1.bb
+++ b/packages/matchbox-common/matchbox_0.8.1.bb
@@ -4,4 +4,4 @@ DEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop"
 RDEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop"
 SECTION = "x11/wm"
 PACKAGES= "${PN}"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
diff --git a/packages/matchbox-common/matchbox_0.9.1.bb b/packages/matchbox-common/matchbox_0.9.1.bb
index a74e6d1398..701c2bc302 100644
--- a/packages/matchbox-common/matchbox_0.9.1.bb
+++ b/packages/matchbox-common/matchbox_0.9.1.bb
@@ -4,4 +4,4 @@ DEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop"
 RDEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop"
 SECTION = "x11/wm"
 PACKAGES= "${PN}"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
diff --git a/packages/matchbox-common/matchbox_0.9.bb b/packages/matchbox-common/matchbox_0.9.bb
index a74e6d1398..701c2bc302 100644
--- a/packages/matchbox-common/matchbox_0.9.bb
+++ b/packages/matchbox-common/matchbox_0.9.bb
@@ -4,4 +4,4 @@ DEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop"
 RDEPENDS = "matchbox-common matchbox-wm matchbox-panel matchbox-desktop"
 SECTION = "x11/wm"
 PACKAGES= "${PN}"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 17f1f09005..4aba935386 100644
--- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -20,11 +20,11 @@ FILES_${PN} = "${bindir}/* \
 
 FILES_${PN}-dev += "${libdir}/matchbox-desktop \
 		   ${includedir}/matchbox-desktop \
-		   ${libdir}/matchbox/desktop/*.*a \	
+		   ${libdir}/matchbox/desktop/*.*a \
 		   ${datadir}/matchbox/desktop/modules/*a"
 
 FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
-  	 
+
 
 do_stage() {
 		install -d ${STAGING_INCDIR}/matchbox-desktop/
diff --git a/packages/matchbox-desktop/matchbox-desktop_svn.bb b/packages/matchbox-desktop/matchbox-desktop_svn.bb
index 86a91d5846..1dea200225 100644
--- a/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -11,7 +11,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
 
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig
 
diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index de709f340b..e0c3e4d578 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -8,7 +8,7 @@ PR="r2"
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
 
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig gettext
 
@@ -18,4 +18,4 @@ FILES_${PN} = "${bindir}/* \
 	       ${datadir}/applications \
 	       ${datadir}/pixmaps \
 		${datadir}/matchbox-keyboard"
-	
+
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb
index a2cad8ac06..6ce450dc22 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.3.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb
@@ -1,5 +1,5 @@
 require matchbox-panel.inc
 DEFAULT_PREFERENCE = "-1"
 PR="r0"
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \        
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
 	   file://mb-applet-battery-repaint-093.patch;patch=1"
diff --git a/packages/matchbox-panel/matchbox-panel_svn.bb b/packages/matchbox-panel/matchbox-panel_svn.bb
index 98b770406b..3ff258fe8f 100644
--- a/packages/matchbox-panel/matchbox-panel_svn.bb
+++ b/packages/matchbox-panel/matchbox-panel_svn.bb
@@ -4,6 +4,4 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
-S = ${WORKDIR}/${PN}
-
-
+S = "${WORKDIR}/${PN}"
diff --git a/packages/matchbox-stroke/matchbox-stroke_svn.bb b/packages/matchbox-stroke/matchbox-stroke_svn.bb
index ead214407b..7afa80d589 100644
--- a/packages/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/packages/matchbox-stroke/matchbox-stroke_svn.bb
@@ -9,7 +9,7 @@ PR="r2"
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
 
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig gettext
 
@@ -17,4 +17,3 @@ FILES_${PN} = "${bindir}/* \
 	       ${datadir}/applications \
 	       ${datadir}/pixmaps \
 		${datadir}/matchbox-stroke"
-	
diff --git a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
index ac00978c41..fb91f03b12 100644
--- a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
+++ b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
@@ -11,7 +11,7 @@ inherit autotools  pkgconfig
 # split into several packages plus one meta package
 PACKAGES = "${PN} ${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
 
-ALLOW_EMPTY_${PN} = 1
+ALLOW_EMPTY_${PN} = "1"
 FILES_${PN} = ""
 RDEPENDS_${PN} = "${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
 
diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb
index fdd3d195b2..21960c6573 100644
--- a/packages/meta/meta-e-x11-core.bb
+++ b/packages/meta/meta-e-x11-core.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 SECTION = "x11/base"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 PR = "r1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-BUILD_ALL_DEPS=1
+BUILD_ALL_DEPS="1"
 
 DEPENDS = "task-e-x11-core"
 RDEPENDS = "task-e-x11-core"
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 3f9459c7d4..0edfd43496 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 SECTION = "x11/base"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 PR = "r1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-BUILD_ALL_DEPS=1
+BUILD_ALL_DEPS = "1"
 
 DEPENDS = "task-e-x11"
 RDEPENDS = "task-e-x11"
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index 7716fa674d..0adb7c4e05 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
-LICENSE = MIT
+LICENSE = "MIT"
 PR="r2"
 
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 BUILD_ALL_DEPS = "1"
 
 DEPENDS = "task-gpe"
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 2619fcdae4..94197d07cf 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,4 +1,4 @@
-PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme
+PACKAGES    = "maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme"
 DESCRIPTION = "Meta-package for maemo environment"
 PR          = "r8"
 
diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb
index 72f1a8b36f..6f315d3306 100644
--- a/packages/meta/meta-opie-all.bb
+++ b/packages/meta/meta-opie-all.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "Meta-package for QPE stuff"
 SECTION = "opie/base"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 DEPENDS = "task-qpe"
 PR = "r3"
 
-BUILD_ALL_DEPS = 1
+BUILD_ALL_DEPS = "1"
 
 RDEPENDS = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index eafd34aae8..1158d859a0 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Meta-package for Opie"
 SECTION = "opie/base"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 PR = "r34"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-BUILD_ALL_DEPS=1
+BUILD_ALL_DEPS = "1"
 
 DEPENDS = "task-opie"
 RDEPENDS = "task-opie-applets task-opie-apps task-opie-base \
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 35ea8630c9..4a38b79caf 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Meta package for SDK including GPE and Opie"
-LICENSE = MIT
+LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
 PR = "r11"
 
diff --git a/packages/meta/meta-sdl.bb b/packages/meta/meta-sdl.bb
index 9d0f2163bf..cb19cb6834 100644
--- a/packages/meta/meta-sdl.bb
+++ b/packages/meta/meta-sdl.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Meta-package for SDL"
-LICENSE = MIT
+LICENSE = "MIT"
 RDEPENDS = "task-sdl-libs task-sdl-games task-sdl-emulators"
 PR = "r2"
 
-ALLOW_EMPTY = 1
-BUILD_ALL_DEPS = 1
+ALLOW_EMPTY = "1"
+BUILD_ALL_DEPS = "1"
 
 # no need to add libsdl as all libsdl-* already rdepend on it
 RDEPENDS_task-sdl-libs = "libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf libsdl-net"
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index f3a0332ac7..3f51644c68 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
-LICENSE = MIT
+LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
 PR = "r0"
 
@@ -95,5 +95,5 @@ EOF
 	fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-oe-toolchain.tar.bz2 .
 }
 
-do_populate_sdk[nostamp] = 1
+do_populate_sdk[nostamp] = "1"
 addtask populate_sdk before do_build after do_install
diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb
index 75a2a28a95..e07b41be77 100644
--- a/packages/meta/nylon-feed.bb
+++ b/packages/meta/nylon-feed.bb
@@ -1,4 +1,4 @@
-LICENSE = MIT
+LICENSE = "MIT"
 
 include nylon-feed.inc
 DEPENDS = "${NYLON_FEED} \
diff --git a/packages/meta/package-index.bb b/packages/meta/package-index.bb
index 0afb36a6ba..eebc4efcc7 100644
--- a/packages/meta/package-index.bb
+++ b/packages/meta/package-index.bb
@@ -5,7 +5,7 @@ PR = "r0"
 DEPENDS = "ipkg-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 PACKAGES = ""
 
 do_fetch() {
@@ -23,7 +23,7 @@ do_install() {
 do_stage() {
 }
 
-do_build[nostamp] = 1
+do_build[nostamp] = "1"
 do_build[dirs] = "${DEPLOY_DIR_IPK}"
 do_build() {
 	set -ex
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index d61e3796ed..3f878aaf5c 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -111,7 +111,7 @@ SLUGOS_PACKAGES = "\
 	mdadm \
 	memtester \
 	mgetty \
-	miau \ 
+	miau \
 	microcom \
 	minicom \
 	motion \
diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb
index 2b6d64c5e5..30fb513627 100644
--- a/packages/meta/unslung-binary-kernel-packages.bb
+++ b/packages/meta/unslung-binary-kernel-packages.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware"
-LICENSE = MIT
+LICENSE = "MIT"
 PR = "r1"
 COMPATIBLE_MACHINE = "nslu2"
 
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 
 UNSLUNG_PACKAGES = "\
diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb
index 9bd77ff746..707787224e 100644
--- a/packages/meta/unslung-packages.bb
+++ b/packages/meta/unslung-packages.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Packages that are compatible with the Unslung firmware"
-LICENSE = MIT
+LICENSE = "MIT"
 PR = "r4"
 COMPATIBLE_MACHINE = "nslu2"
 
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 
 UNSLUNG_PACKAGES = "\
diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb
index 52afebac38..4297440074 100644
--- a/packages/meta/xbase-clients.bb
+++ b/packages/meta/xbase-clients.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Basic X clients (meta package)"
 PR = "r1"
 
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 
 RDEPENDS = 'xauth \
@@ -9,4 +9,4 @@ RDEPENDS = 'xauth \
 	xmodmap \
 	xrdb \
 	xset'
-LICENSE = MIT
+LICENSE = "MIT"
diff --git a/packages/mii-diag/mii-diag_2.11.bb b/packages/mii-diag/mii-diag_2.11.bb
index 6f9188db30..8f664e9efe 100644
--- a/packages/mii-diag/mii-diag_2.11.bb
+++ b/packages/mii-diag/mii-diag_2.11.bb
@@ -4,7 +4,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 PR = "r3"
 
-S = ${WORKDIR}/
+S = "${WORKDIR}/"
 
 #INHIBIT_PACKAGE_STRIP = "1"
 
diff --git a/packages/minipredict/minipredict.bb b/packages/minipredict/minipredict.bb
index e67bf0daff..be5b58e772 100644
--- a/packages/minipredict/minipredict.bb
+++ b/packages/minipredict/minipredict.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://handhelds.org/~paxanima/files/${PN}.tar.gz \
 	   file://minipredict.desktop \
 	   file://minipredict.png"
 
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 
diff --git a/packages/minisip/minisip_svn.bb b/packages/minisip/minisip_svn.bb
index 51573940ad..6928387ad0 100644
--- a/packages/minisip/minisip_svn.bb
+++ b/packages/minisip/minisip_svn.bb
@@ -6,9 +6,9 @@ PR = "r0"
 DESCRIPTION = "SIP user agent, with focus on security"
 DEPENDS = "libglademm libmsip0 libmikey0"
 SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip"
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
-DEFAULT_PREFERENCE=-1
+DEFAULT_PREFERENCE="-1"
 
 FILES_${PN} += "${datadir}/minisip"