summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/layer.conf2
-rw-r--r--recipes-core/base-files/base-files_%.bbappend4
-rw-r--r--recipes-devtools/spidev-test/spidev-test.bb14
-rw-r--r--recipes-images/images/packagegroup-tdx-cli.bb3
-rw-r--r--recipes-images/images/tdx-reference-minimal-image.bb5
-rw-r--r--recipes-images/images/tdx-reference-multimedia-image.bb6
6 files changed, 30 insertions, 4 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 8b80324..a489ef4 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -23,4 +23,4 @@ LAYERDEPENDS_toradex-demos = " \
freescale-layer \
freescale-distro \
"
-LAYERSERIES_COMPAT_toradex-demos = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_toradex-demos = "gatesgarth hardknott honister"
diff --git a/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend
new file mode 100644
index 0000000..f63c02c
--- /dev/null
+++ b/recipes-core/base-files/base-files_%.bbappend
@@ -0,0 +1,4 @@
+# If hostname is empty, the /etc/hostname file is not created.
+# Prevent creating /etc/hostname file which blocks starting the
+# systemd service "set-hostname.service"
+hostname = "${@bb.utils.contains('DISTRO_FEATURES','systemd','','${MACHINE}',d)}"
diff --git a/recipes-devtools/spidev-test/spidev-test.bb b/recipes-devtools/spidev-test/spidev-test.bb
index 9fd6ab7..2c403e6 100644
--- a/recipes-devtools/spidev-test/spidev-test.bb
+++ b/recipes-devtools/spidev-test/spidev-test.bb
@@ -1,6 +1,8 @@
+COMPATIBLE_MACHINE = "(colibri-vf)"
+
SUMMARY = "The Linux kernels spidev-test programm"
LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${STAGING_KERNEL_DIR}/${KERNELPATH};endline=1;md5=fcab174c20ea2e2bc0be64b493708266"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
PACKAGE_ARCH = "${MACHINE_ARCH}"
S = "${WORKDIR}"
@@ -8,10 +10,18 @@ S = "${WORKDIR}"
do_configure[depends] += "virtual/kernel:do_shared_workdir"
do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
+# the spidev_test.c example got moved to tools/spi/ starting with
+# the v.4.5.y kernel
KERNELPATH = "tools/spi/spidev_test.c"
+KERNELPATH-OLD = "Documentation/spi/spidev_test.c"
do_compile () {
- ${CC} ${LDFLAGS} ${STAGING_KERNEL_DIR}/${KERNELPATH} -o spidev_test
+ if [ -f "${STAGING_KERNEL_DIR}/${KERNELPATH}" ]
+ then
+ ${CC} ${LDFLAGS} ${STAGING_KERNEL_DIR}/${KERNELPATH} -o spidev_test
+ else
+ ${CC} ${LDFLAGS} ${STAGING_KERNEL_DIR}/${KERNELPATH-OLD} -o spidev_test
+ fi
}
do_install () {
diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb
index f1ae5c6..f329401 100644
--- a/recipes-images/images/packagegroup-tdx-cli.bb
+++ b/recipes-images/images/packagegroup-tdx-cli.bb
@@ -41,6 +41,7 @@ RRECOMMENDS_packagegroup-base-tdx-cli = "\
libgpiod-tools \
libsoc \
mtd-utils \
+ set-hostname \
u-boot-fw-utils \
udev-toradex-rules \
uhubctl \
@@ -75,6 +76,7 @@ RRECOMMENDS_packagegroup-devel-tdx-cli = "\
spidev-test \
strace \
"
+RRECOMMENDS_packagegroup-devel-tdx-cli_remove_use-nxp-bsp_colibri-vf = "perf"
SUMMARY_packagegroup-machine-tdx-cli = "Machine specific tools"
RRECOMMENDS_packagegroup-machine-tdx-cli = "\
@@ -100,7 +102,6 @@ RRECOMMENDS_packagegroup-machine-tdx-cli_mx8 = "\
"
RRECOMMENDS_packagegroup-machine-tdx-cli_tegra124 = "\
hdmi-hotplug \
- lvds-tegra124 \
kernel-modules \
"
diff --git a/recipes-images/images/tdx-reference-minimal-image.bb b/recipes-images/images/tdx-reference-minimal-image.bb
index 1dacae4..0aaa42f 100644
--- a/recipes-images/images/tdx-reference-minimal-image.bb
+++ b/recipes-images/images/tdx-reference-minimal-image.bb
@@ -16,6 +16,11 @@ COPY_LIC_DIRS ?= "1"
# Show Tezi EULA license
TEZI_SHOW_EULA_LICENSE ?= "1"
+TEZI_SHOW_EULA_LICENSE_apalis-tk1 ?= "0"
+TEZI_SHOW_EULA_LICENSE_use-mainline-bsp ?= "0"
+TEZI_SHOW_EULA_LICENSE_colibri-imx6_use-mainline-bsp ?= "1"
+TEZI_SHOW_EULA_LICENSE_apalis-imx6_use-mainline-bsp ?= "1"
+
add_rootfs_version () {
printf "${DISTRO_NAME} ${DISTRO_VERSION} (${DISTRO_CODENAME}) \\\n \\\l\n" > ${IMAGE_ROOTFS}/etc/issue
diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb
index 4acb778..144e607 100644
--- a/recipes-images/images/tdx-reference-multimedia-image.bb
+++ b/recipes-images/images/tdx-reference-multimedia-image.bb
@@ -10,6 +10,12 @@ export IMAGE_BASENAME = "Reference-Multimedia-Image"
# Show Tezi EULA license
TEZI_SHOW_EULA_LICENSE ?= "1"
+TEZI_SHOW_EULA_LICENSE_apalis-tk1 ?= "0"
+
+TEZI_SHOW_EULA_LICENSE_use-mainline-bsp ?= "0"
+TEZI_SHOW_EULA_LICENSE_colibri-imx6_use-mainline-bsp ?= "1"
+TEZI_SHOW_EULA_LICENSE_apalis-imx6_use-mainline-bsp ?= "1"
+
SYSTEMD_DEFAULT_TARGET = "graphical.target"