Merge pull request #16 from leon-anavi/master

Master

2 files changed, 3 insertions, 3 deletions

diff --git a/meta-sota-raspberrypi/conf/bblayers.conf.sample b/meta-sota-raspberrypi/conf/bblayers.conf.sample
index 85cc004..4dfaa22 100644
--- a/meta-sota-raspberrypi/conf/bblayers.conf.sample
+++ b/meta-sota-raspberrypi/conf/bblayers.conf.sample
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-updater-raspberrypi \
   ##OEROOT##/../meta-openembedded/meta-oe \
   ##OEROOT##/../meta-openembedded/meta-filesystems \
-  ##OEROOT##/../meta-rust \
+  ##OEROOT##/../meta-openembedded/meta-python \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
diff --git a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
index 1db6d42..451aa94 100644
--- a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
+++ b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI_append = "\
-        ${@base_conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \
+        ${@oe.utils.conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \
 "
 
 do_configure_append_smack() {
@@ -63,7 +63,7 @@ CMDLINE_DEBUG = ""
 CMDLINE_append = " usbhid.mousepoll=0"
 
 # Add options to allow CMA to operate
-CMDLINE_append = ' ${@base_conditional("ENABLE_CMA", "1", "coherent_pool=6M smsc95xx.turbo_mode=N", "", d)}'
+CMDLINE_append = ' ${@oe.utils.conditional("ENABLE_CMA", "1", "coherent_pool=6M smsc95xx.turbo_mode=N", "", d)}'
 
 KERNEL_MODULE_AUTOLOAD += "snd-bcm2835"
 KERNEL_MODULE_AUTOLOAD += "hid-multitouch"