From c19916d63838bdd3d07c4d7c5f2abdc6d45468d6 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Mar 17 2020 23:27:20 +0000 Subject: Update kernel-install script for fedora-like kernels --- diff --git a/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch b/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch new file mode 100644 index 0000000..c42f0b6 --- /dev/null +++ b/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch @@ -0,0 +1,57 @@ +From c49c37d5e26bf71a97d5194d390f80d3e71758e1 Mon Sep 17 00:00:00 2001 +From: systemd team +Date: Tue, 23 Apr 2019 10:46:19 -0300 +Subject: [PATCH] Update kernel-install script by backporting fedora patches + +--- + src/kernel-install/kernel-install | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install +index f1c74de..d860701 100755 +--- a/src/kernel-install/kernel-install ++++ b/src/kernel-install/kernel-install +@@ -73,23 +73,27 @@ KERNEL_IMAGE="$2" + + if [[ -x /sbin/new-kernel-pkg ]]; then + KERNEL_DIR="${KERNEL_IMAGE%/*}" +- if [[ "${KERNEL_DIR}" != "/boot" ]]; then +- for i in \ +- "$KERNEL_IMAGE" \ +- "$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac" \ +- "$KERNEL_DIR"/System.map \ +- "$KERNEL_DIR"/config \ +- "$KERNEL_DIR"/zImage.stub \ +- "$KERNEL_DIR"/dtb \ +- ; do +- [[ -e "$i" ]] || continue +- cp -a "$i" "/boot/${i##*/}-${KERNEL_VERSION}" +- done +- fi + + [[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}" + case "$COMMAND" in + add) ++ if [[ "${KERNEL_DIR}" != "/boot" ]]; then ++ for i in \ ++ "$KERNEL_IMAGE" \ ++ "$KERNEL_DIR"/System.map \ ++ "$KERNEL_DIR"/config \ ++ "$KERNEL_DIR"/zImage.stub \ ++ "$KERNEL_DIR"/dtb \ ++ ; do ++ [[ -e "$i" ]] || continue ++ cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}" ++ done ++ # hmac is .vmlinuz-.hmac so needs a special treatment ++ i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac" ++ if [[ -e "$i" ]]; then ++ cp -aT "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac" ++ fi ++ fi + /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $? + /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $? + /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $? +-- +1.8.3.1 + diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec index d4c7539..609492d 100644 --- a/SPECS/systemd.spec +++ b/SPECS/systemd.spec @@ -805,6 +805,8 @@ Patch0763: 0763-tests-add-basic-journal-test.patch Patch0764: 0764-tests-add-regression-test-for-systemctl-restart-syst.patch Patch0765: 0765-tests-add-test-that-journald-keeps-fds-over-terminat.patch +Patch9999: 9999-Update-kernel-install-script-by-backporting-fedora-p.patch + %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} BuildRequires: libcap-devel