!238 [sync] PR-237: Remove installkernel and installkernel-bls scripts
From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng
This commit is contained in:
commit
e90b49bfe4
16
grub2.spec
16
grub2.spec
@ -8,7 +8,7 @@
|
|||||||
Name: grub2
|
Name: grub2
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 2.04
|
Version: 2.04
|
||||||
Release: 27
|
Release: 28
|
||||||
Summary: Bootloader with support for Linux, Multiboot and more
|
Summary: Bootloader with support for Linux, Multiboot and more
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: http://www.gnu.org/software/grub/
|
URL: http://www.gnu.org/software/grub/
|
||||||
@ -21,8 +21,6 @@ Source6: gitignore
|
|||||||
Source7: 99-grub-mkconfig.install
|
Source7: 99-grub-mkconfig.install
|
||||||
Source9: strtoull_test.c
|
Source9: strtoull_test.c
|
||||||
Source10: 20-grub.install
|
Source10: 20-grub.install
|
||||||
Source11: installkernel-bls
|
|
||||||
Source12: installkernel.in
|
|
||||||
|
|
||||||
%include %{SOURCE1}
|
%include %{SOURCE1}
|
||||||
%include %{SOURCE2}
|
%include %{SOURCE2}
|
||||||
@ -248,10 +246,6 @@ install -d -m 0755 %{buildroot}%{_unitdir}/system-update.target.wants
|
|||||||
install -m 0755 docs/grub-boot-indeterminate.service %{buildroot}%{_unitdir}
|
install -m 0755 docs/grub-boot-indeterminate.service %{buildroot}%{_unitdir}
|
||||||
ln -s ../grub-boot-indeterminate.service %{buildroot}%{_unitdir}/system-update.target.wants
|
ln -s ../grub-boot-indeterminate.service %{buildroot}%{_unitdir}/system-update.target.wants
|
||||||
|
|
||||||
install -d -m 0755 %{buildroot}%{_libexecdir}/installkernel
|
|
||||||
cp -v %{SOURCE11} %{buildroot}%{_libexecdir}/installkernel
|
|
||||||
sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/installkernel,g" %{SOURCE12} > %{buildroot}%{_sbindir}/installkernel
|
|
||||||
|
|
||||||
%global finddebugroot "%{_builddir}/%{?buildsubdir}/debug"
|
%global finddebugroot "%{_builddir}/%{?buildsubdir}/debug"
|
||||||
|
|
||||||
%global dip RPM_BUILD_ROOT=%{finddebugroot} %{__debug_install_post}
|
%global dip RPM_BUILD_ROOT=%{finddebugroot} %{__debug_install_post}
|
||||||
@ -329,7 +323,6 @@ rm -r /boot/grub2.tmp/ || :
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%dir /boot/grub2/themes/system
|
%dir /boot/grub2/themes/system
|
||||||
%attr(0755,root,root) %{_sbindir}/installkernel
|
|
||||||
%attr(0700,root,root) %dir /boot/grub2
|
%attr(0700,root,root) %dir /boot/grub2
|
||||||
%ghost %config(noreplace) /boot/grub2/grubenv
|
%ghost %config(noreplace) /boot/grub2/grubenv
|
||||||
%exclude /boot/grub2/*
|
%exclude /boot/grub2/*
|
||||||
@ -339,7 +332,6 @@ rm -r /boot/grub2.tmp/ || :
|
|||||||
%{_prefix}/lib/kernel/install.d/20-grub.install
|
%{_prefix}/lib/kernel/install.d/20-grub.install
|
||||||
%{_prefix}/lib/kernel/install.d/99-grub-mkconfig.install
|
%{_prefix}/lib/kernel/install.d/99-grub-mkconfig.install
|
||||||
%{_sysconfdir}/kernel/install.d/*.install
|
%{_sysconfdir}/kernel/install.d/*.install
|
||||||
%{_libexecdir}/installkernel/installkernel-bls
|
|
||||||
%dir %attr(0700,root,root) %{efi_esp_dir}
|
%dir %attr(0700,root,root) %{efi_esp_dir}
|
||||||
%{_datadir}/locale/*
|
%{_datadir}/locale/*
|
||||||
|
|
||||||
@ -450,6 +442,12 @@ rm -r /boot/grub2.tmp/ || :
|
|||||||
%{_datadir}/man/man*
|
%{_datadir}/man/man*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 18 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.04-28
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:Remove installkernel and installkernel-bls scripts
|
||||||
|
|
||||||
* Fri Dec 9 2022 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.04-27
|
* Fri Dec 9 2022 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.04-27
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
@ -1,85 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
#
|
|
||||||
# /sbin/installkernel
|
|
||||||
#
|
|
||||||
# Copyright 2007-2008 Red Hat, Inc. All rights reserved.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# Author(s): tyson@rwii.com
|
|
||||||
#
|
|
||||||
|
|
||||||
[[ -f /etc/default/grub ]] && . /etc/default/grub
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
echo "Usage: `basename $0` <kernel_version> <bootimage> <mapfile>" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
cfgLoader=
|
|
||||||
|
|
||||||
if [ -z "$INSTALL_PATH" -o "$INSTALL_PATH" == "/boot" ]; then
|
|
||||||
INSTALL_PATH=/boot
|
|
||||||
cfgLoader=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
LINK_PATH=/boot
|
|
||||||
RELATIVE_PATH=`echo "$INSTALL_PATH/" | sed "s|^$LINK_PATH/||"`
|
|
||||||
KERNEL_VERSION=$1
|
|
||||||
BOOTIMAGE=$2
|
|
||||||
MAPFILE=$3
|
|
||||||
ARCH=$(uname -m)
|
|
||||||
if [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then
|
|
||||||
KERNEL_NAME=vmlinux
|
|
||||||
else
|
|
||||||
KERNEL_NAME=vmlinuz
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$KERNEL_VERSION" -o -z "$BOOTIMAGE" -o -z "$MAPFILE" ]; then
|
|
||||||
usage
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f $INSTALL_PATH/$KERNEL_NAME-$KERNEL_VERSION ]; then
|
|
||||||
mv $INSTALL_PATH/$KERNEL_NAME-$KERNEL_VERSION \
|
|
||||||
$INSTALL_PATH/$KERNEL_NAME-$KERNEL_VERSION.old;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -L $INSTALL_PATH/$KERNEL_NAME ]; then
|
|
||||||
if [ -e $INSTALLPATH/$KERNEL_NAME ]; then
|
|
||||||
mv $INSTALL_PATH/$KERNEL_NAME $INSTALL_PATH/$KERNEL_NAME.old
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f $INSTALL_PATH/System.map-$KERNEL_VERSION ]; then
|
|
||||||
mv $INSTALL_PATH/System.map-$KERNEL_VERSION \
|
|
||||||
$INSTALL_PATH/System.map-$KERNEL_VERSION.old;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -L $INSTALL_PATH/System.map ]; then
|
|
||||||
if [ -e $INSTALLPATH/System.map ]; then
|
|
||||||
mv $INSTALL_PATH/System.map $INSTALL_PATH/System.map.old
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
ln -sf ${RELATIVE_PATH}$INSTALL_PATH/System.map-$KERNEL_VERSION $LINK_PATH/System.map
|
|
||||||
|
|
||||||
cat $BOOTIMAGE > $INSTALL_PATH/$KERNEL_NAME-$KERNEL_VERSION
|
|
||||||
cp $MAPFILE $INSTALL_PATH/System.map-$KERNEL_VERSION
|
|
||||||
|
|
||||||
ln -fs ${RELATIVE_PATH}$INSTALL_PATH/$KERNEL_NAME-$KERNEL_VERSION $LINK_PATH/$KERNEL_NAME
|
|
||||||
ln -fs ${RELATIVE_PATH}$INSTALL_PATH/System.map-$KERNEL_VERSION $LINK_PATH/System.map
|
|
||||||
|
|
||||||
if [ -n "$cfgLoader" ] && [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]; then
|
|
||||||
kernel-install add $KERNEL_VERSION $INSTALL_PATH/$KERNEL_NAME-$KERNEL_VERSION
|
|
||||||
exit $?
|
|
||||||
fi
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
if [[ -x @@LIBEXECDIR@@/installkernel ]] ; then
|
|
||||||
exec @@LIBEXECDIR@@/installkernel "${@}"
|
|
||||||
elif [[ -x @@LIBEXECDIR@@/installkernel-bls ]] ; then
|
|
||||||
exec @@LIBEXECDIR@@/installkernel-bls "${@}"
|
|
||||||
fi
|
|
||||||
echo "installkernel is not installed correctly." >>/dev/stderr
|
|
||||||
exit 1
|
|
||||||
Loading…
x
Reference in New Issue
Block a user