diff --git a/conf/layer.conf b/conf/layer.conf index ee6b90d87..f417e640e 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -18,6 +18,4 @@ BBFILES_DYNAMIC += " \ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ - meta-linux-mainline:${LAYERDIR}/dynamic-layers/meta-linux-mainline/*/*/*.bb \ - meta-linux-mainline:${LAYERDIR}/dynamic-layers/meta-linux-mainline/*/*/*.bbappend \ " diff --git a/dynamic-layers/meta-linux-mainline/recipes-kernel/linux/linux-mainline.bbappend b/dynamic-layers/meta-linux-mainline/recipes-kernel/linux/linux-mainline.bbappend deleted file mode 100644 index 2fefa5b9e..000000000 --- a/dynamic-layers/meta-linux-mainline/recipes-kernel/linux/linux-mainline.bbappend +++ /dev/null @@ -1 +0,0 @@ -include linux-mainline.inc diff --git a/dynamic-layers/meta-linux-mainline/recipes-kernel/linux/linux-mainline.inc b/dynamic-layers/meta-linux-mainline/recipes-kernel/linux/linux-mainline.inc deleted file mode 100644 index b1cfb69a8..000000000 --- a/dynamic-layers/meta-linux-mainline/recipes-kernel/linux/linux-mainline.inc +++ /dev/null @@ -1,4 +0,0 @@ -require recipes-kernel/linux/linux-qcom-bootimg.inc - -KBUILD_DEFCONFIG:qcom = "defconfig" -KBUILD_DEFCONFIG:qcom:arm = "qcom_defconfig" diff --git a/dynamic-layers/meta-linux-mainline/recipes-kernel/linux/linux-stable_%.bbappend b/dynamic-layers/meta-linux-mainline/recipes-kernel/linux/linux-stable_%.bbappend deleted file mode 100644 index 2fefa5b9e..000000000 --- a/dynamic-layers/meta-linux-mainline/recipes-kernel/linux/linux-stable_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -include linux-mainline.inc diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/images/qcom-x11-image.bb b/dynamic-layers/openembedded-layer/recipes-graphics/images/qcom-x11-image.bb deleted file mode 100644 index 9376de1a4..000000000 --- a/dynamic-layers/openembedded-layer/recipes-graphics/images/qcom-x11-image.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Basic X11 graphics image" - -IMAGE_FEATURES += "splash package-management debug-tweaks ssh-server-openssh hwcodecs x11 tools-debug" - -LICENSE = "MIT" - -inherit core-image features_check extrausers - -# let's make sure we have a good image.. -REQUIRED_DISTRO_FEATURES = "x11" - -# make sure we boot to desktop -# by default and without x11-base in IMAGE_FEATURES we default to multi-user.target -SYSTEMD_DEFAULT_TARGET = "graphical.target" - -CORE_IMAGE_BASE_INSTALL += " \ - alsa-utils-aplay \ - coreutils \ - glmark2 \ - gptfdisk \ - gstreamer1.0-plugins-bad-meta \ - gstreamer1.0-plugins-base-meta \ - gstreamer1.0-plugins-good-meta \ - gtkperf \ - kernel-modules \ - kmscube \ - mesa-demos \ - openbox \ - rsync \ -" diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb deleted file mode 100644 index 0e52ea91f..000000000 --- a/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "QCOM Firmware for DragonBoard 845c" - -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE.qcom.txt;md5=cbbe399f2c983ad51768f4561587f000" - -SRC_URI = "https://releases.linaro.org/96boards/dragonboard845c/qualcomm/firmware/RB3_firmware_${PV}.zip;subdir=${BP}" -SRC_URI[md5sum] = "ad69855a1275547b16d94a1b5405ac62" -SRC_URI[sha256sum] = "4289d2f2a7124b104d0274879e702aae9b1e50c42eec3747f8584c6744ef65e3" - -FILES:${PN} += "${nonarch_base_libdir}/firmware/" - -do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/ - - install -m 0444 ./17-USB3-201-202-FW/K2026090.mem ${D}${nonarch_base_libdir}/firmware/renesas_usb_fw.mem - - install -d ${D}${sysconfdir}/ - install -m 0644 LICENSE.qcom.txt ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN} -} diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-dragonboard845c.bb b/recipes-bsp/packagegroups/packagegroup-firmware-dragonboard845c.bb index 004d8dc6f..9bbf736c8 100644 --- a/recipes-bsp/packagegroups/packagegroup-firmware-dragonboard845c.bb +++ b/recipes-bsp/packagegroups/packagegroup-firmware-dragonboard845c.bb @@ -3,7 +3,6 @@ SUMMARY = "Firmware packages for the DragonBoard 845c board" inherit packagegroup RRECOMMENDS:${PN} += " \ - firmware-qcom-dragonboard845c \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a630 linux-firmware-qcom-sdm845-adreno', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990 linux-firmware-qcom-sdm845-modem', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca linux-firmware-qcom-sdm845-modem', '', d)} \ diff --git a/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch deleted file mode 100644 index 35e65e47d..000000000 --- a/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 994f33977973baeda1956d253827fc3953bfab55 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Jan 2020 15:23:47 -0800 -Subject: [PATCH] meson misdetects 64bit atomics on mips/clang - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - src/util/u_atomic.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/u_atomic.c b/src/util/u_atomic.c -index e4bffa8534e..58e1dddca35 100644 ---- a/src/util/u_atomic.c -+++ b/src/util/u_atomic.c -@@ -21,7 +21,7 @@ - * IN THE SOFTWARE. - */ - --#if defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) -+#if !defined(__clang__) && defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) - - #include - #include diff --git a/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch deleted file mode 100644 index dc89ffc1c..000000000 --- a/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fdcbfd2841eb34f44bdf51aeb4ef45811b66fd75 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Thu, 14 Nov 2019 13:04:49 -0800 -Subject: [PATCH] meson.build: check for all linux host_os combinations - -Make sure that we are also looking for our host_os combinations like -linux-musl etc. when assuming support for DRM/KMS. - -Also delete a duplicate line. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal -Signed-off-by: Fabio Berton -Signed-off-by: Otavio Salvador -Signed-off-by: Alistair Francis - ---- - meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index ff333961a0d..5931260dd3d 100644 ---- a/meson.build -+++ b/meson.build -@@ -158,7 +158,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 - # Only build shared_glapi if at least one OpenGL API is enabled - with_shared_glapi = with_shared_glapi and with_any_opengl - --system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system()) -+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') - - dri_drivers = get_option('dri-drivers') - if dri_drivers.contains('auto') -@@ -1000,7 +1000,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', - endif - - # TODO: this is very incomplete --if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) -+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux') - pre_args += '-D_GNU_SOURCE' - elif host_machine.system() == 'sunos' - pre_args += '-D__EXTENSIONS__' diff --git a/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch b/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch deleted file mode 100644 index 043217c29..000000000 --- a/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8f767113d5b8a2ee89cd069d54243f8b0ac9a218 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Wed, 2 Sep 2020 15:28:50 -0500 -Subject: [PATCH] meson.build: make TLS ELF optional - -USE_ELF_TLS has replaced GLX_USE_TLS so this patch is the original "make -TLS GLX optional again" patch updated to the latest mesa. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Alistair Francis ---- - meson.build | 2 +- - meson_options.txt | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9b4e5e28864..15eacbe6918 100644 ---- a/meson.build -+++ b/meson.build -@@ -509,7 +509,7 @@ foreach platform : _platforms - endforeach - - use_elf_tls = false --if not with_platform_windows or not with_shared_glapi -+if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls') - pre_args += '-DUSE_ELF_TLS' - use_elf_tls = true - -diff --git a/meson_options.txt b/meson_options.txt -index fd0d99f2f9a..f994c22ac61 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -455,6 +455,12 @@ option( - value : true, - description : 'Enable direct rendering in GLX and EGL for DRI', - ) -+option( -+ 'elf-tls', -+ type : 'boolean', -+ value : true, -+ description : 'Enable TLS support in ELF', -+) - option( - 'prefer-iris', - type : 'boolean', --- -2.34.0 - diff --git a/recipes-graphics/mesa/mesa.bb b/recipes-graphics/mesa/mesa.bb deleted file mode 100644 index fda9950d4..000000000 --- a/recipes-graphics/mesa/mesa.bb +++ /dev/null @@ -1,37 +0,0 @@ -require recipes-graphics/mesa/mesa.inc - -SRC_URI = "git://gitlab.freedesktop.org/mesa/mesa.git;protocol=https;branch=main \ - file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ - file://0002-meson.build-make-TLS-ELF-optional.patch \ - file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ - " -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f" - -SRCREV := "${@oe.utils.conditional("MESA_DEV", "1", "${AUTOREV}", "26677008b9a7c0ef82f2a7f4b479d3cb06097c66", d)}" -DEFAULT_PREFERENCE = "${@oe.utils.conditional("MESA_DEV", "1", "1", "-1", d)}" - -PLATFORMS:remove = "drm surfaceless" -PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false" -DRIDRIVERS:remove = "swrast" -DRIDRIVERS:append = ",auto" -DRIDRIVERS:class-native = ",auto" -DRIDRIVERS:class-nativesdk = ",auto" - -S = "${WORKDIR}/git" -PV = "2x.x-dev+git${SRCPV}" -ERROR_QA:remove = "version-going-backwards" - -# Add package to install require files to run tests for mesa -PACKAGES =+ "mesa-ci" -FILES:${PN}-ci = "${bindir}/deqp-runner.sh ${datadir}/mesa/deqp-*" -do_install:append () { - install -d ${D}/${datadir}/mesa - - install -m 0644 ${S}/.gitlab-ci/all-skips.txt ${D}/${datadir}/mesa/ - for f in ${S}/src/freedreno/ci/deqp-freedreno-*; do - install -m 0644 $f ${D}/${datadir}/mesa/ - done - - install -d ${D}/${bindir} - install -m 0755 ${S}/.gitlab-ci/deqp-runner.sh ${D}/${bindir}/ -} diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/dragonboard-410c/10-preload-modules.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/dragonboard-410c/10-preload-modules.conf deleted file mode 100644 index 9be356a1a..000000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/dragonboard-410c/10-preload-modules.conf +++ /dev/null @@ -1,9 +0,0 @@ -Section "Module" - Load "fb" - Load "shadow" - Load "int10" - Load "vbe" - Load "vgahw" - Load "exa" -EndSection - diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend deleted file mode 100644 index 4fc41d058..000000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend deleted file mode 100644 index 7fc43f6e3..000000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# We want to use modesetting + glamor with mesa freedreno driver -# http://bloggingthemonkey.blogspot.fr/2016/11/a-quick-note-for-usersdistros.html -PACKAGECONFIG:append:qcom = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' dri3 glamor', '', d)}" diff --git a/recipes-test/images/initramfs-test-image.bb b/recipes-test/images/initramfs-test-image.bb index 3c1999675..724f9623f 100644 --- a/recipes-test/images/initramfs-test-image.bb +++ b/recipes-test/images/initramfs-test-image.bb @@ -23,7 +23,6 @@ PACKAGE_INSTALL += " \ gptfdisk \ i2c-tools \ iw \ - lava-test-shell \ libdrm-tests \ lrzsz \ mybw \ diff --git a/recipes-test/lava-test-shell/lava-test-shell.bb b/recipes-test/lava-test-shell/lava-test-shell.bb deleted file mode 100644 index 92daeb2f8..000000000 --- a/recipes-test/lava-test-shell/lava-test-shell.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Lava test shell helpers" -SECTION = "test" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRCREV = "dcf554ef9b89c74d028734c74edea1ef5e777d33" -SRC_URI = "git://git.linaro.org/lava/lava-dispatcher.git;branch=release;protocol=https" - -PV = "2018.2+${SRCPV}" - -S = "${WORKDIR}/git" - -do_install() { - mkdir -p ${D}${bindir} - for file in $(ls lava_dispatcher/lava_test_shell/lava-*) - do - install -m 0755 $file ${D}${bindir}/$(basename $file) - done -}