janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 07:43:55 +01:00
Code Activity

integrate-distro.sh: Underscores in kernel version become dashes in RPM executables

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-09-19 13:12:40 +00:00
commit 926bba0152
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/integrate-distro.sh
View file

@ -297,6 +297,8 @@ esac
umask 0022 umask 0022
kernel_files_version=${kernel_version/_/-}
unused_pkgs=" unused_pkgs="
sysvinit-systemd sysvinit-systemd
kernel kernel
@ -1014,14 +1016,14 @@ setup_boot_loader_net()
|umask 0022 |umask 0022
|/sbin/mkinitrd \\ |/sbin/mkinitrd \\
| -B \\ | -B \\
| -k /boot/vmlinuz-$kernel_version \\ | -k /boot/vmlinuz-$kernel_files_version \\
| -i /boot/initrd-netboot-$kernel_version \\ | -i /boot/initrd-netboot-$kernel_files_version \\
| -M /boot/System.map-$kernel_version \\ | -M /boot/System.map-$kernel_files_version \\
| -m "$initrd_modules" \\ | -m "$initrd_modules" \\
| -d jan://blub/dings | -d jan://blub/dings
|ln -sf initrd-netboot-$kernel_version /boot/initrd-netboot |ln -sf initrd-netboot-$kernel_files_version /boot/initrd-netboot
|ln -sf memtest.bin /boot/memtest |ln -sf memtest.bin /boot/memtest
|chmod 644 /boot/initrd-netboot-$kernel_version |chmod 644 /boot/initrd-netboot-$kernel_files_version
EOT EOT
chmod 755 $root$mkinitrd_sh chmod 755 $root$mkinitrd_sh
@ -1201,7 +1203,7 @@ cmd_install()
[ "$install_dev" ] && setup_boot_loader_local [ "$install_dev" ] && setup_boot_loader_local
setup_boot_loader_net setup_boot_loader_net
run_chroot ln -sf vmlinuz-${kernel_version/_/-} /boot/vmlinuz run_chroot ln -sf vmlinuz-$kernel_files_version /boot/vmlinuz
insserv_all insserv_all