janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 06:40:39 +01:00
Code Activity

integrate-distro.sh: Detect kernel version (rather than configuring it)

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-01-22 17:00:26 +00:00
commit 7a335673ea
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scripts/integrate-distro.sh
View file

@ -294,7 +294,7 @@ tumbleweed)
#kernel_version=4.8.0_rc6_jux+-1 #kernel_version=4.8.0_rc6_jux+-1
#rpm_kernel_version=4.8.0_rc6_jux+-1 #rpm_kernel_version=4.8.0_rc6_jux+-1
kernel_version=4.8.0-swm+ kernel_version=4.8.0-swm+
rpm_kernel_version=4.8.0_swm+-79 #rpm_kernel_version=4.8.0_swm+-79
;; ;;
esac esac
@ -709,7 +709,11 @@ _run_chroot()
run_chroot() run_chroot()
{ {
local cmd="LANG=POSIX SSH_AUTH_SOCK=$ssh_auth_sock chroot $root" local cmd="LANG=POSIX SSH_AUTH_SOCK=$ssh_auth_sock chroot $root"
echo == running $cmd "$@" if [ "$1" = -q ]; then
shift
else
echo == running $cmd "$@"
fi
#eval $cmd "$@" || { #eval $cmd "$@" || {
#LANG=POSIX SSH_AUTH_SOCK=$ssh_auth_sock chroot $root "$@" || { #LANG=POSIX SSH_AUTH_SOCK=$ssh_auth_sock chroot $root "$@" || {
LANG=POSIX SSH_AUTH_SOCK=$ssh_auth_sock chroot $root "$@" || { LANG=POSIX SSH_AUTH_SOCK=$ssh_auth_sock chroot $root "$@" || {
@ -1178,14 +1182,14 @@ setup_boot_loader_net()
|umask 0022 |umask 0022
|/sbin/mkinitrd \\ |/sbin/mkinitrd \\
| -B \\ | -B \\
| -k /boot/vmlinuz-$kernel_files_version \\ | -k /boot/vmlinuz-$kernel_version \\
| -i /boot/initrd-netboot-$kernel_files_version \\ | -i /boot/initrd-netboot-$kernel_version \\
| -M /boot/System.map-$kernel_files_version \\ | -M /boot/System.map-$kernel_version \\
| -m "$modules" \\ | -m "$modules" \\
| -d jan://blub/dings | -d jan://blub/dings
|ln -sf initrd-netboot-$kernel_files_version /boot/initrd-netboot |ln -sf initrd-netboot-$kernel_version /boot/initrd-netboot
|ln -sf memtest.bin /boot/memtest |ln -sf memtest.bin /boot/memtest
|chmod 644 /boot/initrd-netboot-$kernel_files_version |chmod 644 /boot/initrd-netboot-$kernel_version
EOT EOT
chmod 755 $root$mkinitrd_sh chmod 755 $root$mkinitrd_sh
@ -1339,6 +1343,7 @@ cmd_install()
# run_chroot zypper $zypper_global_opts -t srcpackage --download-only `pkgs payload` # run_chroot zypper $zypper_global_opts -t srcpackage --download-only `pkgs payload`
#kernel_version=`readlink -f $root/boot/vmlinuz 2>/dev/null | xargs basename | sed 's/vmlinuz-//'` #kernel_version=`readlink -f $root/boot/vmlinuz 2>/dev/null | xargs basename | sed 's/vmlinuz-//'`
kernel_version=`run_chroot -q rpm -q kernel | sort -V | sed 's/_/-/g; s/\.\(i386\|x86_64\)$//; s/-[^.-]\+$//; s/^kernel-//'`
if have_cfg_file_section repos.after-install; then if have_cfg_file_section repos.after-install; then
run_chroot zypper mr --all --disable run_chroot zypper mr --all --disable
@ -1374,7 +1379,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_files_version /boot/vmlinuz run_chroot ln -sf vmlinuz-$kernel_version /boot/vmlinuz
insserv_all insserv_all