Improve kiwi-ng images building

mbugni · May 25, 2024 · 3c25356 · 3c25356
1 parent b73190f
commit 3c25356
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 13 deletions.
diff --git a/kiwi-descriptions/components/boot.xml b/kiwi-descriptions/components/boot.xml
@@ -6,15 +6,18 @@
 		<package name="kernel"/>
 		<package name="kernel-modules"/>
 		<package name="kernel-modules-extra"/>
-		<!-- The point of a live image is to install -->
-		<package name="grub2-efi-ia32*"/>
-		<package name="grub2-efi-x64*"/>
-		<package name="grub2-pc*"/>
-		<package name="grub2-tools*"/>
+		<!-- Boot loader -->
+		<package name="grub2-efi-x64"/>
+		<package name="grub2-efi-x64-modules"/>
+		<package name="grub2-pc"/>
+		<package name="grub2-pc-modules"/>
 		<package name="grubby"/>
-		<package name="shim-*"/>
+		<package name="shim-signed-x64"/>
 		<!-- Basic langpack -->
 		<package name="glibc-langpack-en"/>
 		<package name="langpacks-en"/>
 	</packages>
+	<packages type="iso" profiles="BootCore">
+		<package name="grub2-efi-x64-cdboot"/>
+	</packages>
 </image>
diff --git a/kiwi-descriptions/components/livesystem.xml b/kiwi-descriptions/components/livesystem.xml
@@ -1,6 +1,6 @@
 <image>
 	<profiles>
-		<profile name="LiveSystemCore" description="Live system core components" />
+		<profile name="LiveSystemCore" description="Live system core components"/>
 		<profile name="LiveSystemConsole" description="Live system console">
 			<requires profile="LiveSystemCore"/>
 		</profile>
@@ -17,15 +17,19 @@
 		<package name="dracut-squash"/>
 	</packages>
 	<preferences profiles="LiveSystemConsole">
-		<type image="iso" primary="true" flags="dmsquash" hybridpersistent_filesystem="ext4" hybridpersistent="true"
-			volid="Fedora_Remix" kernelcmdline="quiet"/>
+		<type image="iso" primary="true" flags="dmsquash" hybridpersistent_filesystem="ext4"
+				hybridpersistent="true"	volid="Fedora_Remix" firmware="uefi" kernelcmdline="quiet">
+			<bootloader name="grub2"/>
+		</type>
 	</preferences>
 	<packages type="image" profiles="LiveSystemGraphical">
 		<package name="plymouth-theme-spinner"/>
 	</packages>
 	<preferences profiles="LiveSystemGraphical">
-		<type image="iso" primary="true" flags="dmsquash" hybridpersistent_filesystem="ext4" hybridpersistent="true"
-			volid="Fedora_Remix" kernelcmdline="rhgb quiet"/>
+		<type image="iso" primary="true" flags="dmsquash" hybridpersistent_filesystem="ext4"
+				hybridpersistent="true"	volid="Fedora_Remix" firmware="uefi" kernelcmdline="rhgb quiet">
+			<bootloader name="grub2"/>
+		</type>
 	</preferences>
 	<packages type="image" profiles="LiveSystemInstaller">
 		<!-- Common-->
@@ -37,4 +41,4 @@
 		<!-- Calamares -->
 		<!-- package name="calamares"/ -->
 	</packages>
-</image>
+</image>
diff --git a/kiwi-descriptions/platforms/workstation.xml b/kiwi-descriptions/platforms/workstation.xml
@@ -18,10 +18,17 @@
 		<package name="kde-connect"/>
 		<package name="kio_mtp"/>
 		<!-- Networking -->
+		<namedCollection name="networkmanager-submodules"/>
 		<package name="plasma-nm-l2tp"/>
 		<package name="plasma-nm-openvpn"/>
 		<package name="plasma-nm-pptp"/>
 		<!-- Printing -->
+		<namedCollection name="printing"/>
+		<package name="cups-ipptool"/>
+		<package name="cups-lpd"/>
 		<package name="kde-print-manager"/>
+		<!-- Scanning -->
+		<package name="sane-backends-drivers-cameras"/>
+		<package name="sane-backends-drivers-scanners"/>		
 	</packages>
-</image>
+</image>
diff --git a/kiwi-descriptions/root/etc/yum.repos.d/openprinting-drivers.repo b/kiwi-descriptions/root/etc/yum.repos.d/openprinting-drivers.repo
@@ -0,0 +1,31 @@
+[openprinting-drivers-main]
+name=OpenPrinting LSB-based driver - main
+baseurl=http://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS
+enabled=1
+gpgcheck=0
+timeout=5
+skip_if_unavailable=True
+
+[openprinting-drivers-contrib]
+name=OpenPrinting LSB-based driver - contrib
+baseurl=http://www.openprinting.org/download/printdriver/components/lsb3.2/contrib/RPMS
+enabled=1
+gpgcheck=0
+timeout=5
+skip_if_unavailable=True
+
+[openprinting-drivers-lsbddk]
+name=OpenPrinting LSB-based driver - lsbddk
+baseurl=http://www.openprinting.org/download/printdriver/components/lsb3.2/lsbddk/RPMS
+enabled=1
+gpgcheck=0
+timeout=5
+skip_if_unavailable=True
+
+[openprinting-drivers-main-nonfree]
+name=OpenPrinting LSB-based driver packages - main-nonfree
+baseurl=http://www.openprinting.org/download/printdriver/components/lsb3.2/main-nonfree/RPMS
+enabled=1
+gpgcheck=0
+timeout=5
+skip_if_unavailable=True