Djam/kernel
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel.git synced 2025-02-24 08:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into rosa2014.1

Browse source
This commit is contained in:
Eugene Shatokhin 2015-04-22 10:42:59 +03:00
commit b0fd2a9614
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kernel.spec
View file

@ -1426,6 +1426,9 @@ EOF
### Create -devel Postun script on the fly ### Create -devel Postun script on the fly
cat > $kernel_devel_files-postun <<EOF cat > $kernel_devel_files-postun <<EOF
rm -rf /usr/src/linux-$KernelVer >/dev/null rm -rf /usr/src/linux-$KernelVer >/dev/null
# depmod (called when removing DKMS modules) might have created files in
# /lib/modules/.../. Remove these first.
rm -rf /lib/modules/$KernelVer/modules*
# Remove the dir if it is already empty. # Remove the dir if it is already empty.
find /lib/modules/$KernelVer -maxdepth 0 -empty -exec rm -rf {} \; || true find /lib/modules/$KernelVer -maxdepth 0 -empty -exec rm -rf {} \; || true
EOF EOF
@ -1487,14 +1490,16 @@ EOF
%endif %endif
### Create kernel Post script ### Create kernel Post script
# We always regenerate initrd here, even if it already exists. This may
# happen if kernel-<...>-devel is installed first, triggers rebuild of
# DKMS modules and some of these request remaking of initrd. The initrd
# that is created then will be non-functional. But when the user installs
# kernel-<...> package, that defunct initrd will be replaced with a working
# one here.
cat > $kernel_files-post <<EOF cat > $kernel_files-post <<EOF
INITRD=/boot/initrd-$KernelVer.img INITRD=/boot/initrd-$KernelVer.img
/sbin/dracut -f \${INITRD} $KernelVer
if [ ! -e \${INITRD} ]; then
/sbin/dracut \${INITRD} $KernelVer
else
printf "WARNING: Initrd image \${INITRD} already exists and will not be replaced.\n"
fi
/usr/sbin/update-grub2 /usr/sbin/update-grub2
pushd /boot > /dev/null pushd /boot > /dev/null
@ -1531,6 +1536,9 @@ EOF
cat > $kernel_files-postun <<EOF cat > $kernel_files-postun <<EOF
rm -f /boot/initrd-$KernelVer.img rm -f /boot/initrd-$KernelVer.img
rm -f /boot/initrd-$KernelVer_old.img rm -f /boot/initrd-$KernelVer_old.img
# Third-party modules might have left something in /lib/modules/.../kernel/.
rm -rf /lib/modules/$KernelVer/kernel/
rm -rf /lib/modules/$KernelVer/modules*
# Remove /lib/modules/<...>/ if it is empty (-devel uses it too). # Remove /lib/modules/<...>/ if it is empty (-devel uses it too).
find /lib/modules/$KernelVer -maxdepth 0 -empty -exec rm -rf {} \; || true find /lib/modules/$KernelVer -maxdepth 0 -empty -exec rm -rf {} \; || true
EOF EOF