From e1fa2866ff597e6f315ec08327cef3284e0fd8f6 Mon Sep 17 00:00:00 2001
From: Pablo Greco <pgreco@centosproject.org>
Date: Jul 30 2019 15:43:07 +0000
Subject: Revert "Update kernel-install script for fedora-like kernels"


This reverts commit 6bae8a1f51a2c882c1e00728be7d06253adefa39.

---

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
deleted file mode 100644
index c42f0b6..0000000
--- a/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c49c37d5e26bf71a97d5194d390f80d3e71758e1 Mon Sep 17 00:00:00 2001
-From: systemd team <systemd-maint@redhat.com>
-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-<version>.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 5968620..844dc49 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -7,7 +7,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        219
-Release:        62%{?dist}.7.0.1
+Release:        62%{?dist}.7
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -714,8 +714,6 @@ Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
 Patch0673: 0673-Revert-bus-when-dumping-string-property-values-escap.patch
 Patch0674: 0674-rules-fix-memory-hotplug-rule-so-systemd-detect-virt.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
@@ -1691,9 +1689,6 @@ fi
 %{_mandir}/man8/systemd-resolved.*
 
 %changelog
-* Wed Jul 03 2019 Pablo Greco <pgreco@centosproject.org> - 219-62.7.0.1
-- Update kernel-install script for fedora-like kernels
-
 * Wed Apr 24 2019 Lukas Nykryn <lnykryn@redhat.com> - 219-62.7
 - rules: fix memory hotplug rule so systemd-detect-virt does not run too often (#1701230)