diff mbox series

[isar-cip-core] Patch ISAR to include the new repo non-free-firmware

Message ID 20230202182422.839974-1-Quirin.Gylstorff@siemens.com (mailing list archive)
State Superseded
Headers show
Series [isar-cip-core] Patch ISAR to include the new repo non-free-firmware | expand

Commit Message

Quirin Gylstorff Feb. 2, 2023, 6:24 p.m. UTC 
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This enables the bookworm build for hihope-rzg2m.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml                                |  8 +++
 kas-cip.yml                                   |  4 ++
 ...ist-add-non-free-firmware-repository.patch | 54 +++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 patches/isar/0001-sources.list-add-non-free-firmware-repository.patch
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c4796b..311702f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -307,6 +307,14 @@  build:iwg20m-bookworm:
     dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb
     release: bookworm
 
+build:hihope-rzg2m-bookworm:
+  extends:
+    - .build_base
+  variables:
+    target: hihope-rzg2m
+    dtb: r8a774a1-hihope-rzg2m-ex.dtb
+    release: bookworm
+
 build:qemu-amd64-secure-boot-bookworm:
   extends:
     - .build_base
diff --git a/kas-cip.yml b/kas-cip.yml
index b970f39..dae9040 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -25,6 +25,10 @@  repos:
     refspec: fc4f004eb67237d9d09b1ffad0de1a19217fa94a
     layers:
       meta:
+    patches:
+      non-free-firmware:
+        repo: cip-core
+        path: patches/isar/0001-sources.list-add-non-free-firmware-repository.patch
 
 bblayers_conf_header:
   standard: |
diff --git a/patches/isar/0001-sources.list-add-non-free-firmware-repository.patch b/patches/isar/0001-sources.list-add-non-free-firmware-repository.patch
new file mode 100644
index 0000000..daee224
--- /dev/null
+++ b/patches/isar/0001-sources.list-add-non-free-firmware-repository.patch
@@ -0,0 +1,54 @@ 
+From 193e9204a220323ec474cdb2f2d5fd3cd36f19a2 Mon Sep 17 00:00:00 2001
+From: Felix Moessbauer <felix.moessbauer@siemens.com>
+Date: Thu, 2 Feb 2023 10:51:00 +0100
+Subject: [PATCH] sources.list: add non-free-firmware repository
+
+The Debian project has taken the decision in 2022-10 to
+create a new repository component non-free-firmware, and
+include its content on installation media for the upcoming
+Debian release bookworm. This has to be reflected in our
+sources.list from bookworm on.
+
+While the non-free-firmware repository contains only the
+firmware parts, we could remove non-free as the intention
+of adding non-free was just to get the non-free firmware
+packages. However, still many firmware packages are not in
+the correct repository, so better keep non-free for now.
+
+Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
+---
+ meta/conf/distro/debian-bookworm.list | 12 ++++++------
+ meta/conf/distro/debian-sid.list      |  4 ++--
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/meta/conf/distro/debian-bookworm.list b/meta/conf/distro/debian-bookworm.list
+index f47e46ef..cbc0ca3b 100644
+--- a/meta/conf/distro/debian-bookworm.list
++++ b/meta/conf/distro/debian-bookworm.list
+@@ -1,8 +1,8 @@
+-deb	http://deb.debian.org/debian bookworm main contrib non-free
+-deb-src	http://deb.debian.org/debian bookworm main contrib non-free
++deb	http://deb.debian.org/debian bookworm main contrib non-free-firmware non-free
++deb-src	http://deb.debian.org/debian bookworm main contrib non-free-firmware non-free
+ 
+-deb	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free
+-deb-src	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free
++deb	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free-firmware non-free
++deb-src	http://deb.debian.org/debian-security/ bookworm-security main contrib non-free-firmware non-free
+ 
+-deb	http://deb.debian.org/debian bookworm-updates main contrib non-free
+-deb-src	http://deb.debian.org/debian bookworm-updates main contrib non-free
++deb	http://deb.debian.org/debian bookworm-updates main contrib non-free-firmware non-free
++deb-src	http://deb.debian.org/debian bookworm-updates main contrib non-free-firmware non-free
+diff --git a/meta/conf/distro/debian-sid.list b/meta/conf/distro/debian-sid.list
+index 2b8158cc..ccddf87d 100644
+--- a/meta/conf/distro/debian-sid.list
++++ b/meta/conf/distro/debian-sid.list
+@@ -1,2 +1,2 @@
+-deb	http://deb.debian.org/debian sid main contrib non-free
+-deb-src	http://deb.debian.org/debian sid main contrib non-free
++deb	http://deb.debian.org/debian sid main contrib non-free-firmware non-free
++deb-src	http://deb.debian.org/debian sid main contrib non-free-firmware non-free
+-- 
+2.39.1
+