From 49edcb3192cda8762b6f579820cf59ff8aa5795e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 3 Oct 2018 15:23:40 +0200 Subject: [PATCH] scripts/raspberrypi: Fix card-kernel-write MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- scripts/include/machine-raspberrypi.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/include/machine-raspberrypi.inc b/scripts/include/machine-raspberrypi.inc index ea73033..2b46895 100644 --- a/scripts/include/machine-raspberrypi.inc +++ b/scripts/include/machine-raspberrypi.inc @@ -54,11 +54,9 @@ RootCardKernelWriteCallback() { # mount rootfs partition EvalExAuto "mount ${DevicePath}2 $tmpdir" "\nMount rootfs partition ${DevicePath}2 to $tmpdir..." - # rootfs/boot kernel - EvalExAuto "rm -f $tmpdir/boot/${KernelImageType}*" "\nRemove old kernels..." + # Note: /boot is empty by default!! KernelFileName=`basename $DeployedFile` - EvalExAuto "cp $DeployedFile $tmpdir/boot/" "\nCopy new kernel to /boot/$KernelFileName..." - EvalExAuto "ln -sf $KernelFileName $tmpdir/boot/$KernelImageType" "\nLink kernel to /boot/$KernelImageType -> $KernelFileName..." + KernelWithAbiName=`echo $KernelFileName | sed -e 's:-abiversion-::'` # rootfs/lib/modules kernel_abi_ver=`echo $KernelWithAbiName | sed 's:'${KernelImageType}'::g'` for modules in `find ${DeployFileDir} -name "modules-${Machine}.tgz"`; do