Merge pull request #121 from rdkcentral/develop

Kirkstone changes for intial tagging

conf/layer.conf

@@ -10,5 +10,5 @@ BBFILE_PATTERN_rdk-raspberrypi = "^${LAYERDIR}/"
 BBFILE_PRIORITY_rdk-raspberrypi = "7"
 
 LAYERDEPENDS_rdk-raspberrypi = "core"
-LAYERSERIES_COMPAT_rdk-raspberrypi = "dunfell"
+LAYERSERIES_COMPAT_rdk-raspberrypi = "kirkstone"
 

conf/machine/include/vendor.inc

@@ -4,13 +4,13 @@ include conf/include/rdke-vendor-bbmask.inc
 include conf/include/vendor_pkg_versions.inc
 
 #Enable esdk
-DISTRO_FEATURES_append = " VENDOR"
-DISTRO_FEATURES_append = " enable_esdk"
+DISTRO_FEATURES:append = " VENDOR"
+DISTRO_FEATURES:append = " enable_esdk"
 
 VENDOR_LAYER_EXTENSION = "${MACHINE}-vendor"
-PACKAGE_EXTRA_ARCHS_append = " ${VENDOR_LAYER_EXTENSION}"
+PACKAGE_EXTRA_ARCHS:append = " ${VENDOR_LAYER_EXTENSION}"
 
-LICENSE_FLAGS_WHITELIST += "commercial_gst-fluendo-mpegdemux \
+LICENSE_FLAGS_ACCEPTED += "commercial_gst-fluendo-mpegdemux \
                             commercial_${MLPREFIX}gst-ffmpeg \
                             ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer1_18','commercial_${MLPREFIX}ffmpeg','commercial_${MLPREFIX}libav',d)} \
                             commercial_libomxil \

conf/template/local.conf.sample

@@ -235,7 +235,7 @@ BB_DISKMON_DIRS = "\
 # By default qemu will build with a builtin VNC server where graphical output can be
 # seen. The two lines below enable the SDL backend too. This assumes there is a
 # libsdl library available on your build system.
-# PACKAGECONFIG_append_pn-qemu-native = " sdl"
+# PACKAGECONFIG:append:pn-qemu-native = " sdl"
 # ASSUME_PROVIDED += "libsdl-native"
 
 # Nice debug data
@@ -254,7 +254,7 @@ BB_SRCREV_POLICY ??= "cache"
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
 # 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"
+CONF_VERSION = "2"
 
 #
 # Debugging Tools

recipes-bsp/bootfiles/rpi-bootfiles.bbappend

@@ -0,0 +1,2 @@
+RPIFW_DATE = "20210831"
+SRC_URI[sha256sum] = "a5055796e39efd874c5bccb689b909f39b20705f6ed32f8274c785a376369369"

recipes-bsp/bootfiles/rpi-cmdline.bbappend

@@ -0,0 +1,6 @@
+do_compile:append() {
+   if ${@bb.utils.contains('DISTRO_FEATURES', 'DOBBY_CONTAINERS', 'true', 'false', d)}; then
+        sed -i 's/[[:space:]]*$//g' ${WORKDIR}/cmdline.txt
+        sed -i 's/$/ cgroup_enable=memory cgroup_memory=1/' ${WORKDIR}/cmdline.txt
+   fi
+}

recipes-bsp/bootfiles/rpi-config_%.bbappend

@@ -1,4 +1,4 @@
-SRC_URI_remove = "git://github.com/Evilpaul/RPi-config.git;protocol=git;branch=master"
+SRC_URI:remove = "git://github.com/Evilpaul/RPi-config.git;protocol=git;branch=master"
 SRC_URI += "git://github.com/Evilpaul/RPi-config.git;protocol=https;branch=master"
 
 # RDK specific changes
@@ -18,7 +18,7 @@ CORE_FREQ = "500"
 SDRAM_FREQ = "500"
 OVER_VOLTAGE = "6"
 
-do_deploy_append_raspberrypi4() {
+do_deploy:append:raspberrypi4() {
 # Fix to enable both the HDMI ports in case of raspberry pi 4
 # Force both hdmi mode to 720p@60Hz
     sed -i '/#hdmi_group=/ c\[HDMI:0]\
@@ -31,7 +31,7 @@ do_deploy_append_raspberrypi4() {
  hdmi_mode=4' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt
 }
 
-do_deploy_append() {
+do_deploy:append() {
     echo "dtoverlay=lirc-rpi" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt
     # fix to enable audio from 4.4 kernel
     sed -i '/#dtparam=audio=/ c\dtparam=audio=on' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt
@@ -49,15 +49,15 @@ do_deploy_append() {
     sed -i '/#boot_delay=/ c\boot_delay=0' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt
 }
 
-do_deploy_append_hybrid() {
+do_deploy:append_hybrid() {
     do_deploy_rdk_config
 }
 
-do_deploy_append_client() {
+do_deploy:append:client() {
     do_deploy_rdk_config
 }
 
-do_deploy_append_ipclient() {
+do_deploy:append_ipclient() {
     do_deploy_rdk_config
 }
 
@@ -69,7 +69,7 @@ do_deploy_rdk_config() {
    fi
 }
 
-do_deploy_append_camera() {
+do_deploy:append_camera() {
     echo "# for sound over HDMI" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt
     echo "hdmi_drive=2" >> ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt
 }

recipes-core/images/vendor-test-image.bb

@@ -1,9 +1,14 @@
 SUMMARY = "A small image just capable of allowing a device to boot."
 
+# https://github.com/rdk-e/meta-rdk-oss-reference/pull/335
+# Change 'ca-certificates-default-certs' to 'virtual/ca-certificates-trust-store' when OSS release provides it.
+
 IMAGE_INSTALL = " \
                  packagegroup-core-boot \
                  ${CORE_IMAGE_EXTRA_INSTALL} \
                  packagegroup-vendor-layer \
+                 ca-certificates-default-certs \
+                 dropbear \
                 "
 
 IMAGE_LINGUAS = " "
@@ -13,4 +18,4 @@ LICENSE = "MIT"
 inherit core-image
 
 IMAGE_ROOTFS_SIZE ?= "8192"
-IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"
+IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"

recipes-core/packagegroups/packagegroup-hal-raspberrypi4.bb

@@ -9,7 +9,7 @@ inherit packagegroup
 PV = "1.0.0"
 PR = "r0"
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     devicesettings-hal-raspberrypi4 \
     hdmicec-hal-raspberrypi4 \
     iarmmgrs-hal-raspberrypi4 \

recipes-core/packagegroups/packagegroup-kernel-modules-raspberrypi4.bb

@@ -11,7 +11,7 @@ DEPENDS = "virtual/kernel"
 PV = "1.0.0"
 PR = "r0"
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     kernel-modules \
     linux-firmware-rpidistro-bcm43455 \
     bluez-firmware-rpidistro-bcm4345c0-hcd \

recipes-core/packagegroups/packagegroup-vendor-layer.bb

@@ -11,7 +11,7 @@ DEPENDS = " virtual/kernel make-mod-scripts"
 PV = "1.2.6"
 PR = "r0"
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
         pi-bluetooth \
         sysint-soc \
         systemaudioplatform \
@@ -20,13 +20,13 @@ RDEPENDS_${PN} = " \
         "
 
 # Include MACHINE specific packagegroup.
-RDEPENDS_${PN}:append:raspberrypi4 = " \
+RDEPENDS:${PN}:append:raspberrypi4 = " \
         packagegroup-kernel-modules-raspberrypi4 \
         packagegroup-hal-raspberrypi4 \
         "
 
 # These packages shall be moved to OSS layer in future.
-RDEPENDS_${PN}:append:rdkv-oss = " \
+RDEPENDS:${PN}:append:rdkv-oss = " \
         cairo \
         essos \
         gstreamer1.0 \

recipes-graphics/userland/userland_git.bbappend

@@ -1,9 +1,9 @@
-SRC_URI_remove = "git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH}"
+SRC_URI:remove = "git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH}"
 SRC_URI += "git://github.com/${SRCFORK}/userland.git;protocol=https;branch=${SRCBRANCH}"
 
 DEPENDS += "freetype"
 
-CFLAGS_append = "\
+CFLAGS:append = "\
     -I${PKG_CONFIG_SYSROOT_DIR}/usr/include/freetype2 \
     -I${PKG_CONFIG_SYSROOT_DIR}/usr/include/ \
     -I${S} \
@@ -13,27 +13,30 @@ CFLAGS_append = "\
     -I${S}/interface/vmcs_host/linux \
 "
 
-LDFLAGS_append = "\
+LDFLAGS:append = "\
     ${PKG_CONFIG_SYSROOT_DIR}/lib/libpthread.so.0 \
     -L${PKG_CONFIG_SYSROOT_DIR}/usr/lib \
     -L${PKG_CONFIG_SYSROOT_DIR}/lib \
 "
 
-do_compile_append(){
+do_compile:append(){
     oe_runmake -C ${S}/host_applications/linux/apps/hello_pi/libs/vgfont
 }
 
-do_install_append(){
+do_install:append(){
     install -d ${D}${libdir}
     install -d ${D}${includedir}
     install -m 644 ${S}/host_applications/linux/apps/hello_pi/libs/vgfont/vgfont.h ${D}${includedir}
     install -m 644 ${S}/host_applications/linux/apps/hello_pi/libs/vgfont/libvgfont.a ${D}${libdir}
 }
 
-FILES_${PN}_append = "\
+FILES:${PN}:append = "\
     ${includedir}/vgfont.h \
     ${libdir}/libvgfont.a \
 "
 
 # no EGL runtime providers for vc4graphics
-RPROVIDES_${PN}_remove = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'libegl', '', d)}"
+RPROVIDES:${PN}:remove = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'libegl', '', d)}"
+
+# Fix do_package_qa err
+INSANE_SKIP:${PN}-dev = " staticdev"

recipes-graphics/westeros-soc/westeros-soc-drm.bb

@@ -14,30 +14,30 @@ PROVIDES = " \
     virtual/vendor-westeros-soc \
     westeros-soc \
     "
-RPROVIDES_${PN} = " \
+RPROVIDES:${PN} = " \
     virtual/westeros-soc \
     virtual/vendor-westeros-soc \
     westeros-soc \
     "
 
-CFLAGS_append = " -I${STAGING_INCDIR}/libdrm"
+CFLAGS:append = " -I${STAGING_INCDIR}/libdrm"
 
-SECURITY_CFLAGS_remove = "-fpie"
-SECURITY_CFLAGS_remove = "-pie"
+SECURITY_CFLAGS:remove = "-fpie"
+SECURITY_CFLAGS:remove = "-pie"
 
-DEBIAN_NOAUTONAME_${PN} = "1"
-DEBIAN_NOAUTONAME_${PN}-dbg = "1"
-DEBIAN_NOAUTONAME_${PN}-dev = "1"
-DEBIAN_NOAUTONAME_${PN}-staticdev = "1"
+DEBIAN_NOAUTONAME:${PN} = "1"
+DEBIAN_NOAUTONAME:${PN}-dbg = "1"
+DEBIAN_NOAUTONAME:${PN}-dev = "1"
+DEBIAN_NOAUTONAME:${PN}-staticdev = "1"
 
 inherit autotools pkgconfig
 
 #Commented below line to get "westeros-gl-console" binary into final image.
-#FILES_${PN} = "${libdir}/*"
+#FILES:${PN} = "${libdir}/*"
 
 COMPATIBLE_MACHINE = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}"
 
 # incase if enabled in bb file, it should be removed for Rpi
-CFLAGS_remove = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '-DWESTEROS_GL_NO_PLANES', '', d)}"
-CFLAGS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' -DDRM_NO_NATIVE_FENCE', '', d)}"
+CFLAGS:remove = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '-DWESTEROS_GL_NO_PLANES', '', d)}"
+CFLAGS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' -DDRM_NO_NATIVE_FENCE', '', d)}"
 

recipes-graphics/westeros/westeros-sink.bbappend

@@ -1,26 +1,26 @@
 S = "${WORKDIR}/git"
 
 PROVIDES = "virtual/vendor-westeros-sink"
-RPROVIDES_${PN} = "virtual/vendor-westeros-sink"
+RPROVIDES:${PN} = "virtual/vendor-westeros-sink"
 
 SINK_SOC_PATH = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'v4l2', 'rpi', d)}"
 
 AUTOTOOLS_SCRIPT_PATH = "${S}/${SINK_SOC_PATH}/westeros-sink"
 
 LICENSE_LOCATION = "${S}/LICENSE"
 
-CFLAGS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', \
+CFLAGS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', \
                     '-DWESTEROS_PLATFORM_DRM', \
                     ' -DWESTEROS_PLATFORM_RPI -DWESTEROS_INVERTED_Y -DBUILD_WAYLAND \
                     -I${STAGING_INCDIR}/interface/vmcs_host/linux', d)} -x c++"
 
-CFLAGS_append = " -DWESTEROS_PLATFORM_DRM -x c++"
+CFLAGS:append = " -DWESTEROS_PLATFORM_DRM -x c++"
 
 PACKAGECONFIG[gst1] = "--enable-gstreamer1=yes,--enable-gstreamer1=no,gstreamer1.0"
 
 PACKAGECONFIG = "gst1"
 
-do_configure_prepend() {
+do_configure:prepend() {
   ln -sf ../../westeros-sink/westeros-sink.c ${AUTOTOOLS_SCRIPT_PATH}
   ln -sf ../../westeros-sink/westeros-sink.h ${AUTOTOOLS_SCRIPT_PATH}
 
@@ -29,7 +29,7 @@ do_configure_prepend() {
   ln -sf ../../westeros-sink/westeros-sink.h ${AUTOTOOLS_SCRIPT_PATH}
 }
 
-FILES_${PN} += "${libdir}/gstreamer-*/*.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-*/*.la"
-FILES_${PN}-dbg += "${libdir}/gstreamer-*/.debug/*"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-*/*.a "
+FILES:${PN} += "${libdir}/gstreamer-*/*.so"
+FILES:${PN}-dev += "${libdir}/gstreamer-*/*.la"
+FILES:${PN}-dbg += "${libdir}/gstreamer-*/.debug/*"
+FILES:${PN}-staticdev += "${libdir}/gstreamer-*/*.a "

recipes-halif/deepsleepmgr/deepsleepmgr-hal-raspberrypi4.bb

@@ -3,7 +3,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
 
 PROVIDES = "virtual/deepsleep-hal virtual/vendor-deepsleep-hal"
-RPROVIDES_${PN} += " virtual/vendor-deepsleepmgr-hal "
+RPROVIDES:${PN} += " virtual/vendor-deepsleepmgr-hal "
 
 SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-deepsleep-manager-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
 

recipes-halif/devicesettings/devicesettings-hal-raspberrypi4.bb

@@ -7,7 +7,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e"
 
 PROVIDES = "virtual/devicesettings-hal virtual/vendor-devicesettings-hal"
-RPROVIDES_${PN} = "virtual/devicesettings-hal virtual/vendor-devicesettings-hal"
+RPROVIDES:${PN} = "virtual/devicesettings-hal virtual/vendor-devicesettings-hal"
 
 # a HAL is machine specific
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -33,12 +33,12 @@ CFLAGS += "-fPIC -D_REENTRANT -Wall ${INCLUDE_DIRS}"
 export DSHAL_API_MAJOR_VERSION = '0'
 export DSHAL_API_MINOR_VERSION = '0'
 
-FILES_${PN} += "${libdir}/*.so*"
-FILES_${PN} += "/opt/www/*.html"
-FILES_${PN} += "/opt/persistent/ds/"
-FILES_${PN} += "/opt/persistent/ds/*"
-FILES_${PN} += "/lib/rdk/*"
-FILES_${PN} += "/lib/systemd/system/*"
+FILES:${PN} += "${libdir}/*.so*"
+FILES:${PN} += "/opt/www/*.html"
+FILES:${PN} += "/opt/persistent/ds/"
+FILES:${PN} += "/opt/persistent/ds/*"
+FILES:${PN} += "/lib/rdk/*"
+FILES:${PN} += "/lib/systemd/system/*"
 
 #inherit coverity systemd pkgconfig
 inherit systemd
@@ -67,9 +67,9 @@ do_install() {
     install -m 0644 ${S}/systemd/rpiDisplay.service ${D}/lib/systemd/system/rpiDisplay.service
 }
 
-SYSTEMD_SERVICE_${PN} += "rpiDisplay.service"
+SYSTEMD_SERVICE:${PN} += "rpiDisplay.service"
 
 # Fix the QA warning.
-INSANE_SKIP_${PN} = "ldflags"
-INSANE_SKIP_${PN}-dev = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
+INSANE_SKIP:${PN}-dev = "ldflags"
 

recipes-halif/hdmicec/hdmicec-hal-raspberrypi4.bb

@@ -13,7 +13,7 @@ PROVIDES = " \
     virtual/vendor-hdmicec-hal \
     "
 
-RPROVIDES_${PN} = " \
+RPROVIDES:${PN} = " \
     virtual/hdmicec-hal \
     virtual/vendor-hdmicec-hal \
     "

recipes-halif/iarmmgrs/iarmmgrs-hal-raspberrypi4.bb

@@ -3,7 +3,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
 
 PROVIDES = "virtual/iarmmgrs-hal virtual/vendor-iarmmgrs-hal"
-RPROVIDES_${PN} = "virtual/iarmmgrs-hal virtual/vendor-iarmmgrs-hal"
+RPROVIDES:${PN} = "virtual/iarmmgrs-hal virtual/vendor-iarmmgrs-hal"
 
 SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-ir-manager-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"
 

recipes-halif/mfrlibs/mfrlibs-hal-raspberrypi4.bb

@@ -9,9 +9,17 @@ SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-mfrlibs-raspberrypi4;${CMF_GIT_SRC_URI_SUF
 S = "${WORKDIR}/git"
 
 PROVIDES = "virtual/mfrlib"
-RPROVIDES_${PN} = "virtual/mfrlib"
+RPROVIDES:${PN} = "virtual/mfrlib"
 
 EXTRA_OECONF += "--enable-thermalprotection"
 
 inherit autotools coverity
 
+do_install:append() {
+    # Provide FlashApp support
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/FlashApp.sh ${D}${bindir}/FlashApp.sh
+    ln -sf ${D}${bindir}/FlashApp.sh ${D}${bindir}/FlashApp
+}
+
+FILES:${PN} += "${bindir}/*"

recipes-halif/pwrmgr/pwrmgr-hal-raspberrypi4.bb

@@ -3,7 +3,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
 
 PROVIDES += " virtual/vendor-pwrmgr-hal "
-RPROVIDES_${PN} += " virtual/vendor-pwrmgr-hal"
+RPROVIDES:${PN} += " virtual/vendor-pwrmgr-hal"
 
 SRC_URI = "${CMF_GITHUB_ROOT}/rdkvhal-power-manager-raspberrypi4;${CMF_GIT_SRC_URI_SUFFIX}"