Thread (7 messages) flat view 7 messages, 1 author, 2022-08-31

[isar-cip-core][PATCH 2/6] Update Isar revision

From: Jan Kiszka <jan.kiszka@siemens.com>
Date: 2022-08-31 07:31:29
Subsystem: the rest · Maintainer: Linus Torvalds

From: Jan Kiszka <jan.kiszka@siemens.com>

Allows to drop the meanwhile merged kernel recipe patch.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ...ernel-Check-if-CONFIG_MODULES-is-set.patch | 33 -------------------
 kas-cip.yml                                   |  6 +---
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch
diff --git a/isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch b/isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch
deleted file mode 100644
index d07c36d..0000000
--- a/isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6ad8f9bb92d3722ff5eb60f09e5ef75ba5febcbd Mon Sep 17 00:00:00 2001
-From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
-Date: Thu, 28 Jul 2022 16:24:16 +0200
-Subject: [PATCH] recipes-kernel: Check if CONFIG_MODULES is set
-
-This fixes an error during the kernel build with sbuild if
-Modules.symvers doesn't exist as find returns 1 if a name
-could not be found.
-
-Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
----
- meta/recipes-kernel/linux/files/debian/isar/install.tmpl | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
-index c6b5059..909b01b 100644
---- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
-+++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl
-@@ -173,7 +173,10 @@ kernel_headers() {
-     (cd ${S}; find arch/${ARCH} -name module.lds -o -name Kbuild.platforms -o -name Platform) >>${src_hdr_files}
-     (cd ${S}; find $(find arch/${ARCH} -name include -o -name scripts -type d) -type f) >>${src_hdr_files}
- 
--    (cd ${O}; find arch/${ARCH}/include Module.symvers include scripts -type f) >>${obj_hdr_files}
-+    if [ -n "${CONFIG_MODULES}" ]; then
-+        echo Module.symvers >> ${obj_hdr_files}
-+    fi
-+    (cd ${O}; find arch/${ARCH}/include include scripts -type f) >>${obj_hdr_files}
-     if [ -n "${CONFIG_STACK_VALIDATION}" ]; then
-         (cd ${O}; find tools/objtool -type f -executable) >>${obj_hdr_files}
-     fi
--- 
-2.35.1
-
diff --git a/kas-cip.yml b/kas-cip.yml
index 5a43cd1..d005b81 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,13 +22,9 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: 64c755053d1252d183757b294cf9849fced64799
+    refspec: 8dfa97cf6e25a7adec2e02c50c5ef6329f31931b
     layers:
       meta:
-    patches:
-      fix-hihope-kernel-build:
-        repo: cip-core
-        path: isar-patches/0001-recipes-kernel-Check-if-CONFIG_MODULES-is-set.patch
 
 bblayers_conf_header:
   standard: |
-- 
2.35.3

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help