merge of '8004ebe0d31a849b3faff027d1ef807246b029ed'

     and 'e104d077b009a60b79d4d9002547dd6eae504a71'

12 files changed, 12 insertions, 12 deletions

diff --git a/packages/images/nslu2-linksys-image.bb b/packages/images/nslu2-linksys-image.bb
index d1bdbe64b9..18329c913c 100644
--- a/packages/images/nslu2-linksys-image.bb
+++ b/packages/images/nslu2-linksys-image.bb
@@ -11,4 +11,4 @@ NSLU2_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_
 EXTRA_IMAGECMD_ext2.gz = "-f ${NSLU2_DEVICE_TABLE}"
 
 inherit image_ipk
-LICENSE = MIT
+LICENSE = "MIT"
diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index 3fa3607e83..ce946e7677 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,4 +1,4 @@
-LICENSE = MIT
+LICENSE = "MIT"
 PR = "r25"
 COMPATIBLE_MACHINE = "nslu2"
 
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.1.bb b/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
index ea7d747a3e..4f1d9383a5 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
@@ -5,7 +5,7 @@ PR = "r3"
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
 inherit native
-S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
+S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
 do_compile() {
 	mv ${WORKDIR}/IxNpeMicrocode.h ${S}/
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.3.bb b/packages/ixp4xx/ixp4xx-npe-native_2.3.bb
index 9744e06c3d..ab8909423f 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.3.bb
@@ -5,7 +5,7 @@ PR = "r3"
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
 inherit native
-S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
+S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
 do_compile() {
 	mv ${WORKDIR}/IxNpeMicrocode.h ${S}/
diff --git a/packages/ixp4xx/ixp4xx-npe_2.1.bb b/packages/ixp4xx/ixp4xx-npe_2.1.bb
index c02528796d..94188bedee 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.1.bb
@@ -4,7 +4,7 @@ PR = "r6"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip"
-S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
+S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb
index 9e28fbba81..b6a47177cb 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb
@@ -4,7 +4,7 @@ PR = "r8"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip"
-S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
+S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
diff --git a/packages/mdev/mdev_1.2.1.bb b/packages/mdev/mdev_1.2.1.bb
index 78f7e942f1..b67d4deccf 100644
--- a/packages/mdev/mdev_1.2.1.bb
+++ b/packages/mdev/mdev_1.2.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 PR = "r5"
 
-S = ${WORKDIR}/busybox-${PV}
+S = "${WORKDIR}/busybox-${PV}"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://mdevdelnodes.patch;patch=1 \
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 722c2acfcd..d61e3796ed 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -12,7 +12,7 @@ PROVIDES += "${SLUGOS_IMAGENAME}-packages"
 COMPATIBLE_MACHINE = "nslu2"
 EXCLUDE_FROM_WORLD = "1"
 INHIBIT_DEFAULT_DEPS = "1"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 
 # The list of packages to build for the slugos DISTRO.
 # KEEP IN ALPHABETICAL ORDER
diff --git a/packages/mt-daapd/mt-daapd_0.2.2.bb b/packages/mt-daapd/mt-daapd_0.2.2.bb
index d333aab19b..dd2da24e65 100644
--- a/packages/mt-daapd/mt-daapd_0.2.2.bb
+++ b/packages/mt-daapd/mt-daapd_0.2.2.bb
@@ -1,4 +1,4 @@
 require ${PN}.inc
 # This has not been released yet!
-DEFAULT_PREFERENCE = -1
+DEFAULT_PREFERENCE = "-1"
 PR = "r0"
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index d91658346b..08b630737a 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -12,7 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
 	file://nfsserver \
 	file://forgotten-defines"
 
-S = ${WORKDIR}/nfs-utils-${PV}/
+S = "${WORKDIR}/nfs-utils-${PV}/"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb
index d2ce470758..26d3664518 100644
--- a/packages/ntp/ntp_4.2.0.bb
+++ b/packages/ntp/ntp_4.2.0.bb
@@ -40,7 +40,7 @@ FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
 #RDEPENDS_ntp-bin = perl
 # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms 
 # with wonky clocks (e.g. OpenSlug)
-RDEPENDS_${PN} = ${PN}-tickadj
+RDEPENDS_${PN} = "${PN}-tickadj"
 FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
 FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd"
 FILES_${PN}-tickadj = "${bindir}/tickadj"
diff --git a/packages/ntp/ntp_4.2.2p3.bb b/packages/ntp/ntp_4.2.2p3.bb
index 4509a2d1d8..679f666b46 100644
--- a/packages/ntp/ntp_4.2.2p3.bb
+++ b/packages/ntp/ntp_4.2.2p3.bb
@@ -33,7 +33,7 @@ FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
 
 # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms 
 # with wonky clocks (e.g. OpenSlug)
-RDEPENDS_${PN} = ${PN}-tickadj
+RDEPENDS_${PN} = "${PN}-tickadj"
 FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
 FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd"
 FILES_${PN}-tickadj = "${bindir}/tickadj"