>From 09846301adef606f42ef37d531667c38c3843f17 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sun, 13 Oct 2019 23:35:03 +0700 Subject: [PATCH 1/2] mki-build-propagator: allow multiple kernels --- tools/mki-build-propagator | 47 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/tools/mki-build-propagator b/tools/mki-build-propagator index 365d359..691f231 100755 --- a/tools/mki-build-propagator +++ b/tools/mki-build-propagator @@ -30,34 +30,35 @@ make_exec "$chroot/.host/packimage.sh" </dev/null 2>&1; then - mkmodpack -p '/.in/${mar_modules##*/}' -o /tmp/modules -k "\$kver" -else - mkmar -r / -p '/.in/${mar_modules##*/}' -o /tmp/modules -k "\$kver" -fi - +kimage="\$(find /boot -type f -name 'vmlinuz-*')" printf '%s\n' "${PROPAGATOR_VERSION:-}" > /tmp/.VERSION -rm -f /boot/full.cz +rm -f /boot/full*.cz + +for kver in \$kimage; do + kver="\${kver#/boot/vmlinuz-}" + if type mkmodpack >/dev/null 2>&1; then + mkmodpack -p '/.in/${mar_modules##*/}' -o /tmp/modules-"\$kver" -k "\$kver" + else + mkmar -r / -p '/.in/${mar_modules##*/}' -o /tmp/modules-"\$kver" -k "\$kver" + fi + [ ! -f /tmp/modules-"\$kver" ] || + cat "\$libdir/propagator/initfs" /tmp/modules-"\$kver" > /boot/full-"\$kver".cz + + sed \ + -e "s,@LIBDIR@,\$libdir," \ + -e "s,@TMPDIR@,/tmp,g" \ + < '/.in/${initfs##*/}' | + gencpio - | + gzip -c >> /boot/full-"\$kver".cz + +done -[ ! -f /tmp/modules ] || - cat "\$libdir/propagator/initfs" /tmp/modules > /boot/full.cz +rm -rf -- /tmp/.VERSION -sed \ - -e "s,@LIBDIR@,\$libdir," \ - -e "s,@TMPDIR@,/tmp,g" \ - < '/.in/${initfs##*/}' | - gencpio - | - gzip -c >> /boot/full.cz +[ -L /boot/vmlinuz ] || + ln -s vmlinuz-"\$kver" vmlinuz -rm -rf -- /tmp/.VERSION EOF rc=0 -- 2.21.0