diff options
| -rw-r--r-- | conf/layer.conf | 2 | ||||
| -rw-r--r-- | recipes-graphics/mesa/mesa_git.bb | 4 | ||||
| -rw-r--r-- | recipes-test/images/initramfs-test-image.bb | 39 | ||||
| -rw-r--r-- | recipes-test/images/initramfs-tiny-image.bb | 37 |
4 files changed, 45 insertions, 37 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 380bb02..ae7ef91 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "qcom" BBFILE_PATTERN_qcom := "^${LAYERDIR}/" BBFILE_PRIORITY_qcom = "5" -LAYERSERIES_COMPAT_qcom = "zeus dunfell gatesgarth" +LAYERSERIES_COMPAT_qcom = "zeus dunfell gatesgarth hardknott" BBFILES_DYNAMIC += " \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ diff --git a/recipes-graphics/mesa/mesa_git.bb b/recipes-graphics/mesa/mesa_git.bb index 4713ee6..d902e8e 100644 --- a/recipes-graphics/mesa/mesa_git.bb +++ b/recipes-graphics/mesa/mesa_git.bb @@ -7,9 +7,9 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/mesa.git;protocol=https \ file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496" +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f" -SRCREV = "${@oe.utils.conditional("MESA_DEV", "1", "${AUTOREV}", "dfb0e0d246ef0437eb029066c0dd48c06f62820a", d)}" +SRCREV = "${@oe.utils.conditional("MESA_DEV", "1", "${AUTOREV}", "a084d012a9ee71049749a6209b0a1cd637e113e1", d)}" DEFAULT_PREFERENCE = "${@oe.utils.conditional("MESA_DEV", "1", "1", "-1", d)}" PLATFORMS_remove = "drm surfaceless" diff --git a/recipes-test/images/initramfs-test-image.bb b/recipes-test/images/initramfs-test-image.bb index fd03d70..e43dca7 100644 --- a/recipes-test/images/initramfs-test-image.bb +++ b/recipes-test/images/initramfs-test-image.bb @@ -1,10 +1,10 @@ +require recipes-test/images/initramfs-tiny-image.bb + DESCRIPTION = "Small ramdisk image for running tests (bootrr, etc)" +export IMAGE_BASENAME = "initramfs-test-image" -PACKAGE_INSTALL = " \ - ${ROOTFS_BOOTSTRAP_INSTALL} \ +PACKAGE_INSTALL += " \ bluez5 \ - busybox \ - base-passwd \ dhcpcd \ diag \ e2fsprogs \ @@ -16,41 +16,12 @@ PACKAGE_INSTALL = " \ gptfdisk \ iw \ lava-test-shell \ - packagegroup-core-boot \ + libdrm-tests \ pciutils \ pd-mapper \ qrtr \ rmtfs \ tqftpserv \ - udev \ usbutils \ wpa-supplicant \ " - -# Do not pollute the initrd image with rootfs features -IMAGE_FEATURES = "debug-tweaks" - -export IMAGE_BASENAME = "initramfs-test-image" -IMAGE_LINGUAS = "" - -LICENSE = "MIT" - -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -inherit core-image - -IMAGE_ROOTFS_SIZE = "8192" -IMAGE_ROOTFS_EXTRA_SPACE = "0" - -# Disable installation of kernel and modules via packagegroup-core-boot -NO_RECOMMENDATIONS = "1" - -# Enable local auto-login (on systemd) of the root user (local = serial port and -# virtual console by default, can be configured). -LOCAL_GETTY ?= " \ - ${IMAGE_ROOTFS}${systemd_system_unitdir}/serial-getty@.service \ - ${IMAGE_ROOTFS}${systemd_system_unitdir}/getty@.service \ -" -local_autologin () { - sed -i -e 's/^\(ExecStart *=.*getty \)/\1--autologin root /' ${LOCAL_GETTY} -} -ROOTFS_POSTPROCESS_COMMAND += "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'local_autologin;', '', d)}" diff --git a/recipes-test/images/initramfs-tiny-image.bb b/recipes-test/images/initramfs-tiny-image.bb new file mode 100644 index 0000000..4fd06a2 --- /dev/null +++ b/recipes-test/images/initramfs-tiny-image.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Tiny ramdisk image for board bringup" + +PACKAGE_INSTALL = " \ + ${ROOTFS_BOOTSTRAP_INSTALL} \ + busybox \ + base-passwd \ + packagegroup-core-boot \ + udev \ +" + +# Do not pollute the initrd image with rootfs features +IMAGE_FEATURES = "debug-tweaks" + +export IMAGE_BASENAME = "initramfs-tiny-image" +IMAGE_LINGUAS = "" + +LICENSE = "MIT" + +IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +inherit core-image + +IMAGE_ROOTFS_SIZE = "8192" +IMAGE_ROOTFS_EXTRA_SPACE = "0" + +# Disable installation of kernel and modules via packagegroup-core-boot +NO_RECOMMENDATIONS ?= "1" + +# Enable local auto-login (on systemd) of the root user (local = serial port and +# virtual console by default, can be configured). +LOCAL_GETTY ?= " \ + ${IMAGE_ROOTFS}${systemd_system_unitdir}/serial-getty@.service \ + ${IMAGE_ROOTFS}${systemd_system_unitdir}/getty@.service \ +" +local_autologin () { + sed -i -e 's/^\(ExecStart *=.*getty \)/\1--autologin root /' ${LOCAL_GETTY} +} +ROOTFS_POSTPROCESS_COMMAND += "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'local_autologin;', '', d)}" |