diff --git a/.gitignore b/.gitignore index 5f70d06..79197b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +1 @@ -/dracut-011-9b30d47.tar.bz2 -/dracut-011.tar.bz2 -/dracut-013.tar.bz2 -/dracut-014.tar.bz2 -/dracut-015.tar.bz2 -/dracut-016.tar.bz2 -/dracut-017.tar.bz2 -/dracut-018.tar.bz2 -/dracut-019.tar.bz2 -/dracut-020.tar.bz2 -/dracut-021.tar.bz2 -/dracut-022.tar.bz2 -/dracut-023.tar.bz2 -/dracut-025.tar.bz2 -/dracut-026.tar.bz2 -/dracut-027.tar.bz2 -/dracut-028.tar.bz2 -/dracut-029.tar.bz2 -/dracut-030.tar.bz2 -/dracut-031.tar.bz2 -/dracut-032.tar.bz2 -/dracut-033.tar.bz2 -/dracut-034.tar.bz2 -/dracut-036.tar.xz -/dracut-037.tar.xz -/dracut-038.tar.xz -/dracut-040.tar.xz -/dracut-041.tar.xz -/dracut-042.tar.xz -/dracut-043.tar.xz -/dracut-044.tar.xz -/dracut-045.tar.xz -/dracut-046.tar.xz -/dracut-047.tar.xz -/dracut-048.tar.xz -/dracut-049.tar.xz -/dracut-050.tar.xz -/dracut-051.tar.xz -/dracut-053.tar.xz -/dracut-054.tar.xz -/dracut-055.tar.xz +/dracut-*.tar.xz diff --git a/0001-fix-90kernel-modules-add-Type-C-USB-drivers-for-gene.patch b/0001-fix-90kernel-modules-add-Type-C-USB-drivers-for-gene.patch new file mode 100644 index 0000000..18f7346 --- /dev/null +++ b/0001-fix-90kernel-modules-add-Type-C-USB-drivers-for-gene.patch @@ -0,0 +1,32 @@ +From c4796589e7cbc0e2d6837b30511c82d22668c2bf Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Wed, 6 Oct 2021 11:05:49 +0100 +Subject: [PATCH] fix(90kernel-modules): add Type-C USB drivers for generic + initrd + +We need to pull in Type-C USB drivers as they can provide a number of +differnet bits of functionality in early boot including input, display +(altmode DP) and storage so we need to have them available to ensure +functionality attached to those buses/interfaces are available in early +boot. + +Signed-off-by: Peter Robinson +--- + modules.d/90kernel-modules/module-setup.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh +index 613c20e7..a1aba71b 100755 +--- a/modules.d/90kernel-modules/module-setup.sh ++++ b/modules.d/90kernel-modules/module-setup.sh +@@ -59,6 +59,7 @@ installkernel() { + "=drivers/pci/host" \ + "=drivers/pci/controller" \ + "=drivers/pinctrl" \ ++ "=drivers/usb/typec" \ + "=drivers/watchdog" + + instmods \ +-- +2.32.0 + diff --git a/dracut.spec b/dracut.spec index 52e1d1c..3710efa 100644 --- a/dracut.spec +++ b/dracut.spec @@ -5,11 +5,11 @@ # strip the automatically generated dep here and instead co-own the # directory. %global __requires_exclude pkg-config -%define dist_free_release 3 +%define dist_free_release 4 Name: dracut Version: 055 -Release: %{dist_free_release}%{?dist}.1 +Release: %{dist_free_release}%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -44,6 +44,8 @@ Patch2: 0001-fix-network-manager-pull-in-network.target-in-nm-ini.patch # Drop requirement on deprecated systemd-udev-settle # https://github.com/dracutdevs/dracut/pull/1552 Patch3: 0001-fix-network-manager-don-t-pull-in-systemd-udev-settl.patch +# https://github.com/dracutdevs/dracut/pull/1616/ +Patch4: 0001-fix-90kernel-modules-add-Type-C-USB-drivers-for-gene.patch BuildRequires: bash BuildRequires: git-core @@ -497,6 +499,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Wed Oct 06 2021 Peter Robinson - 055-4 +- Add USB Type-C to fix display/input/storage attached via it (rhbz #1964218) + * Wed Jul 21 2021 Fedora Release Engineering - 055-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild