diff --git a/conf/layer.conf b/conf/layer.conf
index a078c83..4cbfabb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1"
 
 LAYERDEPENDS_sunxi = "core meta-python meta-arm"
 
-LAYERSERIES_COMPAT_sunxi = "walnascar"
+LAYERSERIES_COMPAT_sunxi = "whinlatter"
diff --git a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb
index a506545..e03fa36 100644
--- a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb
+++ b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb
@@ -13,8 +13,6 @@ SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=https;branch=m
 # Increase PV with SRCREV change
 SRCREV = "af5f938ea14a3614d35ad3d9ab51a5d392117444"
 
-S = "${WORKDIR}/git"
-
 SUNXI_FEX_BIN_IMAGE = "fex-${MACHINE}-${PV}-${PR}.bin"
 SUNXI_FEX_BIN_IMAGE_SYMLINK = "fex-${MACHINE}.bin"
 SUNXI_FEX_BIN_IMAGE_SYMLINK_SIMPLE = "fex.bin"
diff --git a/recipes-bsp/u-boot/u-boot-sunxi.bb b/recipes-bsp/u-boot/u-boot-sunxi.bb
index 9cecda5..d9fbe03 100644
--- a/recipes-bsp/u-boot/u-boot-sunxi.bb
+++ b/recipes-bsp/u-boot/u-boot-sunxi.bb
@@ -31,8 +31,6 @@ PV = "v2014.04+git${SRCPV}"
 # Corresponds 2014.04 in Makefile
 SRCREV = "ea1ac32bf76eb60baef474c2516fc431b381d952"
 
-S = "${WORKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SPL_BINARY="u-boot-sunxi-with-spl.bin"
diff --git a/recipes-devtools/python/pya20_0.2.12.bb b/recipes-devtools/python/pya20_0.2.12.bb
index 1866636..7679d67 100644
--- a/recipes-devtools/python/pya20_0.2.12.bb
+++ b/recipes-devtools/python/pya20_0.2.12.bb
@@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = "^(olinuxino-a13|olinuxino-a10|olinuxino-a20|olinuxino-a10l
 SRC_URI = "https://pypi.python.org/packages/source/p/pyA20/pyA20-${PV}.tar.gz \
            file://mapping.h \
           "
-S = "${WORKDIR}/pyA20-${PV}"
+S = "${UNPACKDIR}/pyA20-${PV}"
 
 inherit setuptools3
 
diff --git a/recipes-graphics/libgles/sunxi-mali_git.bb b/recipes-graphics/libgles/sunxi-mali_git.bb
index f8b0a48..9bb1620 100644
--- a/recipes-graphics/libgles/sunxi-mali_git.bb
+++ b/recipes-graphics/libgles/sunxi-mali_git.bb
@@ -29,8 +29,6 @@ SRC_URI = "git://github.com/linux-sunxi/sunxi-mali.git;protocol=https;branch=mas
            file://0001-fix-test-build.patch \
            "
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "libdrm xorgproto libump patchelf-native"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
diff --git a/recipes-graphics/libump/libump_git.bb b/recipes-graphics/libump/libump_git.bb
index 49c49c9..69403d8 100644
--- a/recipes-graphics/libump/libump_git.bb
+++ b/recipes-graphics/libump/libump_git.bb
@@ -10,6 +10,3 @@ SRCREV = "ec0680628744f30b8fac35e41a7bd8e23e59c39f"
 
 SRC_URI = "git://github.com/linux-sunxi/libump.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
-
diff --git a/recipes-graphics/xorg-xserver/libdri2_git.bb b/recipes-graphics/xorg-xserver/libdri2_git.bb
index 7950a88..04713dd 100644
--- a/recipes-graphics/xorg-xserver/libdri2_git.bb
+++ b/recipes-graphics/xorg-xserver/libdri2_git.bb
@@ -11,7 +11,5 @@ SRC_URI = "git://github.com/robclark/libdri2.git;protocol=http;branch=master"
 
 SRCREV = "4f1eef3183df2b270c3d5cbef07343ee5127a6a4"
 
-S = "${WORKDIR}/git"
-
 inherit autotools pkgconfig
 
diff --git a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
index ed5a049..0e29064 100644
--- a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
+++ b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb
@@ -14,8 +14,6 @@ SRCREV = "e094e3c8f9004ca3347694bd05b99d136e8621b9"
 SRC_URI = "git://github.com/ssvb/xf86-video-fbturbo.git;protocol=http;branch=master \
            file://20-fbturbo.conf"
 
-S = "${WORKDIR}/git"
-
 CFLAGS += " -I${STAGING_INCDIR}/xorg "
 
 do_install:append() {
diff --git a/recipes-kernel/armbian-firmware/armbian-firmware_git.bb b/recipes-kernel/armbian-firmware/armbian-firmware_git.bb
index ca36687..dd0988c 100644
--- a/recipes-kernel/armbian-firmware/armbian-firmware_git.bb
+++ b/recipes-kernel/armbian-firmware/armbian-firmware_git.bb
@@ -6,8 +6,6 @@ PV = "1.0+git"
 SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master"
 SRCREV = "4050e02da2dce2b74c97101f7964ecfb962f5aec"
 
-S = "${WORKDIR}/git"
-
 inherit allarch
 
 do_compile[noexec] = "1"
@@ -29,7 +27,6 @@ FILES:${PN}-ap6212 = " \
     ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \
 "
 
-
 # Make armbian-firmware depend on all of the split-out packages.
 python populate_packages:prepend () {
     firmware_pkgs = oe.utils.packages_filter_out_system(d)
diff --git a/recipes-kernel/linux/linux-mainline.inc b/recipes-kernel/linux/linux-mainline.inc
index 6d7911a..97e80fb 100644
--- a/recipes-kernel/linux/linux-mainline.inc
+++ b/recipes-kernel/linux/linux-mainline.inc
@@ -20,7 +20,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
-S = "${WORKDIR}/linux-${PV}"
+S = "${UNPACKDIR}/linux-${PV}"
 
 # get release version 5.x or 6.x based on version
 KRELEASE = "${@d.getVar('PV', True).split('.')[0]}"
diff --git a/recipes-kernel/linux/linux-mainline_6.6.85.bb b/recipes-kernel/linux/linux-mainline_6.6.85.bb
index 993b1ce..d8194b3 100644
--- a/recipes-kernel/linux/linux-mainline_6.6.85.bb
+++ b/recipes-kernel/linux/linux-mainline_6.6.85.bb
@@ -9,6 +9,5 @@ SRC_URI += "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.t
            "
 SRC_URI[sha256sum] = "5ebaccf4ca3428cd26817bae62171f4efd270eed866a3e3d0a1d9e970b7b7529"
 
-
 KERNEL_FEATURES:append:orange-pi-3lts = " bsp/orange-pi-3lts/orange-pi-3lts-6_5.scc bsp/uwe5622/uwe5622-6_6.scc bsp/orange-pi-3lts/fix-rtc.scc"
 KERNEL_FEATURES:append:orange-pi-zero2 = " bsp/h61x/orangepi-zero2-6_6.scc bsp/uwe5622/uwe5622-6_6.scc"
diff --git a/recipes-kernel/linux/linux-sunxi_3.4.bb b/recipes-kernel/linux/linux-sunxi_3.4.bb
index 8f9b742..fd06ac8 100644
--- a/recipes-kernel/linux/linux-sunxi_3.4.bb
+++ b/recipes-kernel/linux/linux-sunxi_3.4.bb
@@ -21,8 +21,6 @@ SRC_URI += "git://github.com/linux-sunxi/linux-sunxi.git;branch=sunxi-3.4;protoc
         "
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-S = "${WORKDIR}/git"
-
 #fix QA issue "Files/directories were installed but not shipped: /usr/src/debug"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
diff --git a/recipes-kernel/linux/linux-tools.inc b/recipes-kernel/linux/linux-tools.inc
index 3b03c05..11103db 100644
--- a/recipes-kernel/linux/linux-tools.inc
+++ b/recipes-kernel/linux/linux-tools.inc
@@ -24,7 +24,6 @@ fakeroot do_install_perf () {
     fi
 }
 
-
 # perf tasks
 addtask compile_perf after do_compile before do_install
 addtask install_perf after do_install before do_package
diff --git a/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb b/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb
index 4882604..3b9561a 100644
--- a/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb
+++ b/recipes-kernel/uwe5622-firmware/uwe5622-firmware.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "UWE5622 Wifi firmware"
 LICENSE = "CC0-1.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a8067e55da801e4a1"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 COMPATIBLE_MACHINE = "(orange-pi-zero2|orange-pi-3lts)"
 
diff --git a/recipes-kernel/xradio-firmware/xradio-firmware.bb b/recipes-kernel/xradio-firmware/xradio-firmware.bb
index e48dcd0..b788e60 100644
--- a/recipes-kernel/xradio-firmware/xradio-firmware.bb
+++ b/recipes-kernel/xradio-firmware/xradio-firmware.bb
@@ -11,8 +11,6 @@ COMPATIBLE_MACHINE = "orange-pi-zero"
 
 SRC_URI = "git://github.com/armbian/firmware.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 do_install() {
     install -d ${D}${base_libdir}/firmware/xr819
     install -m 0644 ${S}/xr819/boot_xr819.bin ${D}${base_libdir}/firmware/xr819/
diff --git a/recipes-kernel/xradio/xradio.bb b/recipes-kernel/xradio/xradio.bb
index cf329a5..a7338ad 100644
--- a/recipes-kernel/xradio/xradio.bb
+++ b/recipes-kernel/xradio/xradio.bb
@@ -17,8 +17,6 @@ SRC_URI = "\
 	   git://github.com/fifteenhex/xradio.git;protocol=http;branch=master \
           "
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE += "-C ${STAGING_KERNEL_DIR} M=${S}"
 
 KERNEL_MODULE_AUTOLOAD += "xradio_wlan"
diff --git a/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb b/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb
index 37ac582..b8d2b69 100644
--- a/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb
+++ b/recipes-multimedia/gstreamer/gst-plugin-cedar_git.bb
@@ -15,8 +15,6 @@ SRC_URI = "git://github.com/ebutera/gst-plugin-cedar.git;protocol=https;branch=m
 PV = "0.10.1+git${SRCPV}"
 PR = "r1"
 
-S = "${WORKDIR}/git"
-
 FILES:${PN} += "${libdir}/gstreamer-0.10/*.so"
 FILES:${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
 FILES:${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
diff --git a/recipes-support/sunxi-tools/sunxi-tools_git.bb b/recipes-support/sunxi-tools/sunxi-tools_git.bb
index ab6f1e5..c4d0be5 100644
--- a/recipes-support/sunxi-tools/sunxi-tools_git.bb
+++ b/recipes-support/sunxi-tools/sunxi-tools_git.bb
@@ -12,8 +12,6 @@ SRCREV = "9a3d62aa0c820b3dd42ba3409b2043f4143683cd"
 
 inherit pkgconfig
 
-S = "${WORKDIR}/git"
-
 BBCLASSEXTEND = "native nativesdk"
 
 FILES:${PN} = "${bindir}/*"