A couple of fixes for kernel in models

Rpi3+4 on debian needs a workaround before install Rpi3+4 on suse needs to have the kernel-default package Signed-off-by: Itxaka <[email protected]>
kairos-io · Feb 7, 2025 · e6e0854 · e6e0854
1 parent 0ca6f43
commit e6e0854
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pkg/stages/stages.go b/pkg/stages/stages.go
@@ -735,6 +735,19 @@ func RunInstallStage(logger types.KairosLogger) (schema.YipConfig, error) {
 	data := schema.YipConfig{Stages: map[string][]schema.Stage{}}
 	// Run things before we install packages and framework
 	data.Stages["before-install"] = []schema.Stage{}
+
+	// On Rpi3 and Rpi4 we need to enable the non-free repository for Debian to get the firmware
+	if config.DefaultConfig.Model == values.Rpi3.String() || config.DefaultConfig.Model == values.Rpi4.String() {
+		data.Stages["before-install"] = append(data.Stages["before-install"], []schema.Stage{
+			{
+				Name:     "Enable non-free repository",
+				OnlyIfOs: "Debian.*",
+				Commands: []string{
+					"sed -i 's/^Components: main.*$/& non-free-firmware/' /etc/apt/sources.list.d/debian.sources",
+				},
+			},
+		}...)
+	}
 	// Add packages install
 	installStage, err := GetInstallStage(sis, logger)
 	if err != nil {

diff --git a/pkg/values/packagemaps.go b/pkg/values/packagemaps.go
@@ -605,6 +605,7 @@ var KernelPackagesModels = ModelPackageMap{
 		ArchARM64: {
 			Rpi3: {
 				Common: {
+					"kernel-default",
 					"raspberrypi-eeprom",
 					"raspberrypi-firmware",
 					"raspberrypi-firmware-dt",
@@ -617,6 +618,7 @@ var KernelPackagesModels = ModelPackageMap{
 			},
 			Rpi4: {
 				Common: {
+					"kernel-default",
 					"raspberrypi-eeprom",
 					"raspberrypi-firmware",
 					"raspberrypi-firmware-dt",