mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
linux: drop unused 5.15 version
* 6.1 version was used by default since mickledore:12a1187b01
and kirkstone for rpi5 MACHINEs since:9dc6673d41
* scarthgap uses 6.6 by default since:1cf3dd5e5e
* nobody is probably using 5.15 with newer release and there are issues with "iw reg" since wireless-regdb upgrade in oe-core as well as shown in: https://github.com/agherzan/meta-raspberrypi/pull/1317 so better to drop it from master/scarthgap together with rpi.scc used only for 5.15 and 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch used only by rpi.scc Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
This commit is contained in:
parent
e7476edfcb
commit
6160d0d737
|
@ -1,50 +0,0 @@
|
||||||
From 32f53700aeef2f5c7797ddda66348fc0b29e1047 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kees Cook <keescook@chromium.org>
|
|
||||||
Date: Wed, 18 Jan 2023 12:21:35 -0800
|
|
||||||
Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13
|
|
||||||
|
|
||||||
The gimple-iterator.h header must be included before gimple-fold.h
|
|
||||||
starting with GCC 13. Reorganize gimple headers to work for all GCC
|
|
||||||
versions.
|
|
||||||
|
|
||||||
Reported-by: Palmer Dabbelt <palmer@rivosinc.com>
|
|
||||||
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
|
|
||||||
Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/
|
|
||||||
Cc: linux-hardening@vger.kernel.org
|
|
||||||
Signed-off-by: Kees Cook <keescook@chromium.org>
|
|
||||||
---
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
scripts/gcc-plugins/gcc-common.h | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
|
|
||||||
index 0c087614fc3e..27770c31214c 100644
|
|
||||||
--- a/scripts/gcc-plugins/gcc-common.h
|
|
||||||
+++ b/scripts/gcc-plugins/gcc-common.h
|
|
||||||
@@ -77,8 +77,10 @@
|
|
||||||
#include "varasm.h"
|
|
||||||
#include "stor-layout.h"
|
|
||||||
#include "internal-fn.h"
|
|
||||||
+#include "gimple.h"
|
|
||||||
#include "gimple-expr.h"
|
|
||||||
#include "gimple-fold.h"
|
|
||||||
+#include "gimple-iterator.h"
|
|
||||||
#include "context.h"
|
|
||||||
#include "tree-ssa-alias.h"
|
|
||||||
#include "tree-ssa.h"
|
|
||||||
@@ -91,11 +93,9 @@
|
|
||||||
#include "tree-eh.h"
|
|
||||||
#include "stmt.h"
|
|
||||||
#include "gimplify.h"
|
|
||||||
-#include "gimple.h"
|
|
||||||
#include "tree-ssa-operands.h"
|
|
||||||
#include "tree-phinodes.h"
|
|
||||||
#include "tree-cfg.h"
|
|
||||||
-#include "gimple-iterator.h"
|
|
||||||
#include "gimple-ssa.h"
|
|
||||||
#include "ssa-iterators.h"
|
|
||||||
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
patch 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
|
|
|
@ -1,6 +0,0 @@
|
||||||
# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
require linux-raspberrypi-v7.inc
|
|
||||||
require linux-raspberrypi_5.15.bb
|
|
|
@ -1,32 +0,0 @@
|
||||||
LINUX_VERSION ?= "5.15.92"
|
|
||||||
LINUX_RPI_BRANCH ?= "rpi-5.15.y"
|
|
||||||
LINUX_RPI_KMETA_BRANCH ?= "yocto-5.15"
|
|
||||||
|
|
||||||
SRCREV_machine = "14b35093ca68bf2c81bbc90aace5007142b40b40"
|
|
||||||
SRCREV_meta = "509f4b9d68337f103633d48b621c1c9aa0dc975d"
|
|
||||||
|
|
||||||
KMETA = "kernel-meta"
|
|
||||||
|
|
||||||
SRC_URI = " \
|
|
||||||
git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \
|
|
||||||
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \
|
|
||||||
file://rpi.scc \
|
|
||||||
file://powersave.cfg \
|
|
||||||
file://android-drivers.cfg \
|
|
||||||
"
|
|
||||||
|
|
||||||
require linux-raspberrypi.inc
|
|
||||||
|
|
||||||
KERNEL_DTC_FLAGS += "-@ -H epapr"
|
|
||||||
|
|
||||||
RDEPENDS:${KERNEL_PACKAGE_NAME}:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}"
|
|
||||||
RDEPENDS:${KERNEL_PACKAGE_NAME}-base:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-base"
|
|
||||||
RDEPENDS:${KERNEL_PACKAGE_NAME}-image:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-image"
|
|
||||||
RDEPENDS:${KERNEL_PACKAGE_NAME}-dev:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dev"
|
|
||||||
RDEPENDS:${KERNEL_PACKAGE_NAME}-vmlinux:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-vmlinux"
|
|
||||||
RDEPENDS:${KERNEL_PACKAGE_NAME}-modules:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-modules"
|
|
||||||
RDEPENDS:${KERNEL_PACKAGE_NAME}-dbg:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dbg"
|
|
||||||
|
|
||||||
DEPLOYDEP = ""
|
|
||||||
DEPLOYDEP:raspberrypi-armv7 = "${RASPBERRYPI_v7_KERNEL}:do_deploy"
|
|
||||||
do_deploy[depends] += "${DEPLOYDEP}"
|
|
Loading…
Reference in New Issue
Block a user