[neon/neon/seeds/Neon/unstable] /: manual merge jammy.ship-live components needed for new arm64 iso images

[Carlos De Maine]

Git commit 0f1af943901bcb84612b7e057c9910c0e4b89d4a by Carlos De Maine.
Committed on 21/03/2024 at 13:04.
Pushed by carlosdem into branch 'Neon/unstable'.

manual merge jammy.ship-live components needed for new arm64 iso images

M  +28   -4    ship-live

https://invent.kde.org/neon/neon/seeds/-/commit/0f1af943901bcb84612b7e057c9910c0e4b89d4a

diff --git a/ship-live b/ship-live
index 51e59b8..a209d5d 100644
--- a/ship-live
+++ b/ship-live
@@ -5,17 +5,28 @@ packages.
 
 == Hardware & Network Access ==
 
- * pptp-linux             # client for Microsoft-compatible VPN's, needed for some ISPs
  * sl-modem-daemon	# needed for some Winmodems (see OutoftheboxWinmodem)
+ * intel-microcode      # needed to update Intel cpu microcode LP #1386257
+ * amd64-microcode      # needed to update AMD cpu microcode LP #1386257 
 
  * libatm1	# suggested by ppp for PPP-over-ATM
  * setserial	# needed by folks with nonstandard serial ports
- * mouseemu	# needed on Macs with single-button mice
- * ps3pf-utils [powerpc] # small utilities for PlayStation 3 systems
- * elfspe2 [powerpc] # SPE access for Cell systems
  * b43-fwcutter
  * bcmwl-kernel-source #since we no longer have LRM
 
+This must be kept in sync with live
+ * /^linux-modules-nvidia-.+-generic-hwe-22.04$/
+ * /^nvidia-driver-[0-9]+$/  # Needed for networkless installation of graphics drivers
+ * nvidia-prime
+ * /^linux-modules-iwlwifi-generic-hwe-22.04$/
+ * /^linux-modules-ipu6-generic-hwe-22.04$/
+ * /^linux-modules-ivsc-generic-hwe-22.04$/
+
+ == Neon Hardware Additions ==
+ * mouseemu	# needed on Macs with single-button mice
+ * ps3pf-utils [powerpc] # small utilities for PlayStation 3 systems
+ * elfspe2 [powerpc] # SPE access for Cell systems
+ 
 == Installer ==
 
  * grub # needed for dmraid et al
@@ -28,6 +39,19 @@ packages.
  * oem-config-kde
  * u-boot-tools [arm64]
 
+== OEM support ==
+
+These packages are dynamically installed by the Ubuntu installer when we're
+installing on compatible hardware. They will pull in additional hardware
+support packages. They default to oem linux flavour, seed it too.
+
+ * /^oem-.+-meta$/
+ * linux-oem-22.04
+ * /^linux-modules-nvidia-.+-oem-22.04$/
+ * /^linux-modules-iwlwifi-oem-22.04$/
+ * /^linux-modules-ipu6-oem-22.04$/
+ * /^linux-modules-ivsc-oem-22.04$/
+
 == Blacklist ==
 
 libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).