Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions SPECS/dracut/dracut.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Summary: dracut to create initramfs
Name: dracut
Version: 102
Release: 13%{?dist}
Release: 14%{?dist}
# The entire source code is GPLv2+
# except install/* which is LGPLv2+
License: GPLv2+ AND LGPLv2+
Expand Down Expand Up @@ -58,16 +58,6 @@ Patch: 0014-fix-systemd-pcrphase-in-hostonly-mode-do-not-try-to-include
Patch: 0015-fix-systemd-pcrphase-make-tpm2-tss-an-optional-dependency.patch
Patch: 0016-Handle-SELinux-configuration-for-overlayfs-folders.patch
Patch: avoid-mktemp-collisions-with-find-not-path.patch
# fix-dracut-systemd-include-systemd-cryptsetup.patch has been introduced
# by the Azure Linux team to ensure that the systemd-cryptsetup module is included
# in the initramfs when needed.
# In dracut 102, systemd-cryptsetup was split from the crypt module and is no longer
# included by default, causing encrypted volumes in crypttab to be skipped in initrd.
# This patch modifies dracut-systemd to explicitly include systemd-cryptsetup.
# The patch can be removed if Dracut is upgraded to 104+.
# - References: https://github.com/dracut-ng/dracut-ng/pull/262
# https://github.com/dracut-ng/dracut-ng/commit/e0e5424a7b5e387ccb70e47ffea5a59716bf7b76
Patch: fix-dracut-systemd-include-systemd-cryptsetup.patch

BuildRequires: bash
BuildRequires: kmod-devel
Expand Down Expand Up @@ -355,6 +345,9 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
%dir %{_sharedstatedir}/%{name}/overlay

%changelog
* Thu May 22 2025 Mun Chun Yep <mun.chun.yep@intel.com> - 102-14
- Revert 6d93d4260 to fix tmpfs mount issue.

* Fri May 16 2025 Swee Yee Fonn <swee.yee.fonn@intel.com> - 102-13
- Add tmpfsroot dracut module

Expand Down

This file was deleted.

7 changes: 5 additions & 2 deletions SPECS/kernel/kernel-uki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Summary: Unified Kernel Image
Name: kernel-uki
Version: 6.12.23
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Vendor: Intel Corporation
Distribution: Edge Microvisor Toolkit
Expand All @@ -23,7 +23,7 @@ Source0: kernel-uki-dracut.conf

BuildRequires: kernel = %{version}-%{release}
BuildRequires: systemd-ukify
BuildRequires: dracut-systemd-cryptsetup
BuildRequires: dracut
BuildRequires: binutils
BuildRequires: systemd-boot
BuildRequires: systemd-udev
Expand Down Expand Up @@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Thu May 22 2025 Mun Chun Yep <mun.chun.yep@intel.com> - 6.12.23-3
- Revert 6d93d4260 to fix tmpfs mount issue.

* Thu May 15 2025 Lee Chee Yang <chee.yang.lee@intel.com> - 6.12.23-2
- bump to sync for kernel-uki

Expand Down
5 changes: 4 additions & 1 deletion SPECS/kernel/kernel.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Linux Kernel
Name: kernel
Version: 6.12.23
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Vendor: Intel Corporation
Distribution: Edge Microvisor Toolkit
Expand Down Expand Up @@ -414,6 +414,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Thu May 22 2025 Mun Chun Yep <mun.chun.yep@intel.com> - 6.12.23-3
- bump to sync for kernel-uki

* Thu May 15 2025 Lee Chee Yang <chee.yang.lee@intel.com> - 6.12.23-2
- bump to sync for kernel-uki

Expand Down