linux4sam · mdavis777 · Jul 21, 2022 · Jul 21, 2022 · Jul 21, 2022
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
@@ -163,7 +163,7 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 # run tests against any SDK that are built. To enable this uncomment these lines.
 # See classes/test{image,sdk}.bbclass for further details.
 #IMAGE_CLASSES += "testimage testsdk"
-#TESTIMAGE_AUTO_qemuall = "1"
+#TESTIMAGE_AUTO:qemuall = "1"
 
 #
 # Interactive shell configuration
@@ -239,14 +239,14 @@ BB_DISKMON_DIRS ??= "\
 #
 # By default native qemu will build with a builtin VNC server where graphical output can be
 # seen. The line below enables the SDL UI frontend too.
-#PACKAGECONFIG_append_pn-qemu-system-native = " sdl"
+#PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
 # By default libsdl2-native will be built, if you want to use your host's libSDL instead of 
 # the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
 #ASSUME_PROVIDED += "libsdl2-native"
 
 # You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
 # a handy set of menus for controlling the emulator.
-#PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"
+#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
 
 #
 # Hash Equivalence
@@ -266,6 +266,6 @@ BB_DISKMON_DIRS ??= "\
 # track the version of this file when it was generated. This can safely be ignored if
 # this doesn't mean anything to you.
 CONF_VERSION = "1"
-LICENSE_FLAGS_WHITELIST += "commercial"
+LICENSE_FLAGS_ACCEPTED += "commercial"
 SYSVINIT_ENABLED_GETTYS = ""
 INHERIT += "rm_work"
diff --git a/conf/machine/include/at91sam9.inc b/conf/machine/include/at91sam9.inc
@@ -5,9 +5,9 @@ require conf/machine/include/bootloaders.inc
 
 SOC_FAMILY = "at91sam9"
 
-PREFERRED_PROVIDER_virtual/kernel_at91sam9 ?= "linux-at91"
-PREFERRED_PROVIDER_virtual/bootloader_at91sam9 ?= "u-boot-at91"
-PREFERRED_PROVIDER_u-boot_at91sam9 ?= "u-boot-at91"
+PREFERRED_PROVIDER_virtual/kernel:at91sam9 ?= "linux-at91"
+PREFERRED_PROVIDER_virtual/bootloader:at91sam9 ?= "u-boot-at91"
+PREFERRED_PROVIDER_u-boot:at91sam9 ?= "u-boot-at91"
 
 SERIAL_CONSOLES ?= "115200;ttyS0"
 

diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.10.1.bb b/recipes-bsp/at91bootstrap/at91bootstrap_3.10.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=27;md5=a2a70db58191379e2550cbed95449fb
 
 COMPATIBLE_MACHINE = '(sama5d3xek|sama5d3-xplained|sama5d3-xplained-sd|at91sam9x5ek|at91sam9rlek|at91sam9m10g45ek|sama5d4ek|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd|sama5d27-wlsom1-ek-sd|sama7g5ek)'
 
-SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https"
+SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https;branch=master"
 
 PV = "3.10.1+git${SRCPV}"
 SRCREV = "1d013b417bb9de963cd2e819d83a3c94f381b6bf"

diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.8.13.bb b/recipes-bsp/at91bootstrap/at91bootstrap_3.8.13.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=27;md5=a2a70db58191379e2550cbed95449fb
 
 COMPATIBLE_MACHINE = '(sama5d3xek|sama5d3-xplained|sama5d3-xplained-sd|at91sam9x5ek|at91sam9rlek|at91sam9m10g45ek|sama5d4ek|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd)'
 
-SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https \
+SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https;branch=master \
            file://0001-scripts-upgrade-scripts-to-use-Python3.patch \
 "
 

diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.9.0.bb b/recipes-bsp/at91bootstrap/at91bootstrap_3.9.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=27;md5=a2a70db58191379e2550cbed95449fb
 
 COMPATIBLE_MACHINE = '(sama5d3xek|sama5d3-xplained|sama5d3-xplained-sd|at91sam9x5ek|at91sam9rlek|at91sam9m10g45ek|sama5d4ek|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd|sama5d27-wlsom1-ek-sd)'
 
-SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https \
+SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https;branch=master \
            file://0001-scripts-upgrade-scripts-to-use-Python3.patch \
 "
 

diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.9.1.bb b/recipes-bsp/at91bootstrap/at91bootstrap_3.9.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=27;md5=a2a70db58191379e2550cbed95449fb
 
 COMPATIBLE_MACHINE = 'sama5d2-icp-sd'
 
-SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https \
+SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https;branch=master \
            file://0001-scripts-upgrade-scripts-to-use-Python3.patch \
 "
 

diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.9.2.bb b/recipes-bsp/at91bootstrap/at91bootstrap_3.9.2.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=27;md5=a2a70db58191379e2550cbed95449fb
 
 COMPATIBLE_MACHINE = '(sama5d3xek|sama5d3-xplained|sama5d3-xplained-sd|at91sam9x5ek|at91sam9rlek|at91sam9m10g45ek|sama5d4ek|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd|sama5d27-wlsom1-ek-sd)'
 
-SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https \
+SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https;branch=master \
            file://0001-scripts-upgrade-scripts-to-use-Python3.patch \
 "
 

diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.9.3.bb b/recipes-bsp/at91bootstrap/at91bootstrap_3.9.3.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://main.c;endline=27;md5=a2a70db58191379e2550cbed95449fb
 
 COMPATIBLE_MACHINE = '(sama5d3xek|sama5d3-xplained|sama5d3-xplained-sd|at91sam9x5ek|at91sam9rlek|at91sam9m10g45ek|sama5d4ek|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd|sama5d27-wlsom1-ek-sd)'
 
-SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https"
+SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https;branch=master"
 
 PV = "3.9.3+git${SRCPV}"
 SRCREV = "d96833a4b6680b237708eb4dc9f10708b9e709d8"

diff --git a/recipes-bsp/dt-overlay-at91/dt-overlay-at91_git.bb b/recipes-bsp/dt-overlay-at91/dt-overlay-at91_git.bb
@@ -8,7 +8,7 @@ inherit deploy
 
 COMPATIBLE_MACHINE = '(sama5d3-xplained|sama5d3-xplained-sd|at91sam9x5ek|at91sam9x5ek-sd|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd|sama5d27-wlsom1-ek-sd|sama7g5ek)'
 
-SRC_URI = "git://github.com/linux4sam/dt-overlay-at91.git;protocol=https"
+SRC_URI = "git://github.com/linux4sam/dt-overlay-at91.git;protocol=https;branch=master"
 
 PV = "1.0+git${SRCPV}"
 SRCREV = "b4383488119b298940ced981eadf5d1765581fa9"

diff --git a/recipes-connectivity/wilc-ble-apps/wilc-ble-demo_1.0.bb b/recipes-connectivity/wilc-ble-apps/wilc-ble-demo_1.0.bb
@@ -13,7 +13,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2aadfbb30f3dc663d0c881ccb240fc4c"
 
 DEPENDS = "bluez5 wilc-demo-fs-overlay"
-SRC_URI = "git://github.com/MicrochipTech/wilcbtapps-buildroot-external-microchip.git;protocol=https"
+SRC_URI = "git://github.com/MicrochipTech/wilcbtapps-buildroot-external-microchip.git;protocol=https;branch=master"
 PV = "1.0+git${SRCPV}"
 SRCREV  = "44dae79d567ab713edbd313ee3647b000f9c81b3"
 

diff --git a/recipes-connectivity/wilc-ble-apps/wilc-demo-fs-overlay.bb b/recipes-connectivity/wilc-ble-apps/wilc-demo-fs-overlay.bb
@@ -19,7 +19,7 @@ SECTION = "net"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 
-SRC_URI = "git://github.com/MicrochipTech/linux4sam-wilc-demo-fs-overlay.git;protocol=https"
+SRC_URI = "git://github.com/MicrochipTech/linux4sam-wilc-demo-fs-overlay.git;protocol=https;branch=master"
 PV = "1.0+git${SRCPV}"
 SRCREV = "aef78d828baedfc7cab1e5456df284e7a1c5bbbb"
 S = "${WORKDIR}/git"

diff --git a/recipes-connectivity/wilc-ble-apps/wilc-websocket-demo_1.0.bb b/recipes-connectivity/wilc-ble-apps/wilc-websocket-demo_1.0.bb
@@ -10,7 +10,7 @@ SECTION = "examples"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e24bfdbf6035afa17b105dc86b249d9f"
 DEPENDS = "nginx"
-SRC_URI = "git://github.com/MicrochipTech/websocket-buildroot-external-microchip.git;protocol=https"
+SRC_URI = "git://github.com/MicrochipTech/websocket-buildroot-external-microchip.git;protocol=https;branch=master"
 PV = "1.0+git${SRCPV}"
 SRCREV = "dccae5ea9b0710d4331a5a1f9f56764141b99117"
 

diff --git a/recipes-egt/apps/egt-media_1.3.bb b/recipes-egt/apps/egt-media_1.3.bb
@@ -18,7 +18,7 @@ RDEPENDS:${PN} = "gstreamer1.0 \
 	gstreamer1.0-plugins-base-videoscale \
 	gstreamer1.0-plugins-base-videoconvert \
 	gstreamer1.0-plugins-base-volume \
-	${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \
+	${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \
 "
 
 inherit siteinfo

diff --git a/recipes-egt/apps/egt-thermostat_1.3.bb b/recipes-egt/apps/egt-thermostat_1.3.bb
@@ -9,7 +9,7 @@ PACKAGES = "\
 "
 DEPENDS = " libegt sqlite3-native"
 
-SRC_URI = "git://github.com/linux4sam/egt-thermostat.git;protocol=https"
+SRC_URI = "git://github.com/linux4sam/egt-thermostat.git;protocol=https;branch=master"
 
 SRCREV = "6519e4c516ded1b9557fdea16de7b28e82e2b8f3"
 

diff --git a/recipes-egt/apps/lohit-fonts.bb b/recipes-egt/apps/lohit-fonts.bb
@@ -22,5 +22,5 @@ do_install() {
 
 do_compile[noexec] = "1"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 INHIBIT_DEFAULT_DEPS = "1"
diff --git a/recipes-graphics/libm2d/libm2d_1.0.bb b/recipes-graphics/libm2d/libm2d_1.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;endline=20;md5=b0693ac296607eb1fc06d98b632728
 
 DEPENDS += "linux-at91 libdrm"
 
-SRC_URI = "git://github.com/linux4sam/libm2d.git;protocol=https"
+SRC_URI = "git://github.com/linux4sam/libm2d.git;protocol=https;branch=master"
 
 SRCREV = "923e28dfe68690085905a1d9d1695cddb56c3ef8"