6 files changed, 12 insertions, 11 deletions

diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf
index 963d2d5ce9..43ef90a9f0 100644
--- a/meta-skeleton/conf/layer.conf
+++ b/meta-skeleton/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERVERSION_skeleton = "1"
 
 LAYERDEPENDS_skeleton = "core"
 
-LAYERSERIES_COMPAT_skeleton = "styhead"
+LAYERSERIES_COMPAT_skeleton = "whinlatter"
diff --git a/meta-skeleton/conf/multilib-example.conf b/meta-skeleton/conf/multilib-example.conf
index 07fd7b6ce4..cddbfc17ae 100644
--- a/meta-skeleton/conf/multilib-example.conf
+++ b/meta-skeleton/conf/multilib-example.conf
@@ -3,11 +3,12 @@
 # or specific in an configuration file like this, then require it.
 #
 # This configuration specifies an x86 64 bit machine as the main machine
-# type and then adds a multilib in the "lib32" directory where those
-# libraries are compiled with the "x86" tune.
+# type and then adds a multilib in the explicitly overwritten "lib32" directory
+# where those libraries are compiled with the "x86" tune.
 #
 
 MACHINE = "qemux86-64"
 require conf/multilib.conf
 MULTILIBS = "multilib:lib32"
 DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
+BASELIB:virtclass-multilib-lib32 = "lib32"
diff --git a/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb b/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb
index a2fb212a68..e5f0ca1023 100644
--- a/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb
+++ b/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "file://Makefile \
            file://COPYING \
           "
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 # The inherit of module.bbclass will automatically name module packages with
 # "kernel-module-" prefix as required by the oe-core build environment.
diff --git a/meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb b/meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb
index 90d3aefd86..cb07b13974 100644
--- a/meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb
+++ b/meta-skeleton/recipes-skeleton/hello-single/hello_1.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://helloworld.c"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 do_compile() {
         ${CC} ${LDFLAGS} helloworld.c -o helloworld
diff --git a/meta-skeleton/recipes-skeleton/service/service_0.1.bb b/meta-skeleton/recipes-skeleton/service/service_0.1.bb
index 912f6b0f61..f249579310 100644
--- a/meta-skeleton/recipes-skeleton/service/service_0.1.bb
+++ b/meta-skeleton/recipes-skeleton/service/service_0.1.bb
@@ -2,22 +2,22 @@ SUMMARY = "The canonical example of init scripts"
 SECTION = "base"
 DESCRIPTION = "This recipe is a canonical example of init scripts"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYRIGHT;md5=349c872e0066155e1818b786938876a4"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=349c872e0066155e1818b786938876a4"
 
 SRC_URI = "file://skeleton \
            file://skeleton_test.c \
            file://COPYRIGHT \
            "
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 do_compile () {
-        ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/skeleton_test.c -o ${WORKDIR}/skeleton-test
+        ${CC} ${CFLAGS} ${LDFLAGS} ${S}/skeleton_test.c -o ${B}/skeleton-test
 }
 
 do_install () {
         install -d ${D}${sysconfdir}/init.d
-        cat ${WORKDIR}/skeleton | \
+        cat ${S}/skeleton | \
           sed -e 's,/etc,${sysconfdir},g' \
               -e 's,/usr/sbin,${sbindir},g' \
               -e 's,/var,${localstatedir},g' \
@@ -26,7 +26,7 @@ do_install () {
         chmod a+x ${D}${sysconfdir}/init.d/skeleton
 
         install -d ${D}${sbindir}
-        install -m 0755 ${WORKDIR}/skeleton-test ${D}${sbindir}/
+        install -m 0755 ${S}/skeleton-test ${D}${sbindir}/
 }
 
 RDEPENDS:${PN} = "initscripts"
diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
index 8437a5a774..5783d9e245 100644
--- a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
+++ b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
@@ -9,7 +9,7 @@ SRC_URI = "file://file1 \
            file://file3 \
            file://file4"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 PACKAGES =+ "${PN}-user3"