diff --git a/debian/patches/apertis/Reworked-kernel-install-script.patch b/debian/patches/apertis/Reworked-kernel-install-script.patch index 85309a9ff034362b9732704b92e4a08fe678aac2..bd8714722b89448760c27c33a4be434595fac813 100644 --- a/debian/patches/apertis/Reworked-kernel-install-script.patch +++ b/debian/patches/apertis/Reworked-kernel-install-script.patch @@ -1,3 +1,4 @@ +From a579f2088bd9521300d46cc5835757fe0d503f21 Mon Sep 17 00:00:00 2001 From: Denis Pynkin <denis.pynkin@collabora.com> Date: Thu, 14 Feb 2019 00:46:48 +0300 Subject: Reworked kernel-install script @@ -13,11 +14,11 @@ Subject: Reworked kernel-install script Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com> Signed-off-by: Frederic Dalleau <frederic.dalleau@collabora.com> --- - src/kernel-install/kernel-install | 99 ++++++++++++++++++++++----------------- - 1 file changed, 56 insertions(+), 43 deletions(-) + src/kernel-install/kernel-install | 100 +++++++++++++++++------------- + 1 file changed, 56 insertions(+), 44 deletions(-) diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install -index e7457e9..edd6514 100755 +index e7457e9..962df08 100755 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install @@ -1,4 +1,4 @@ @@ -58,7 +59,7 @@ index e7457e9..edd6514 100755 echo "$d/$f" continue 2 fi -@@ -59,51 +55,65 @@ dropindirs_sort() +@@ -59,51 +55,64 @@ dropindirs_sort() export LC_COLLATE=C for i in "$@"; do @@ -82,7 +83,7 @@ index e7457e9..edd6514 100755 +if [ "${0%installkernel}" != "${0}" ]; then COMMAND='add' # make install doesn't pass any parameter wrt initrd handling - INITRD_OPTIONS=() +- INITRD_OPTIONS=() + KERNEL_VERSION="$1" + KERNEL_IMAGE="$2" +elif [ "${0%removekernel}" != "${0}" ]; then @@ -136,7 +137,7 @@ index e7457e9..edd6514 100755 ENTRY_DIR_ABS="/boot/efi/$MACHINE_ID/$KERNEL_VERSION" elif mountpoint -q /efi; then ENTRY_DIR_ABS="/efi/$MACHINE_ID/$KERNEL_VERSION" -@@ -117,51 +127,53 @@ export KERNEL_INSTALL_MACHINE_ID=$MACHINE_ID +@@ -117,51 +126,53 @@ export KERNEL_INSTALL_MACHINE_ID=$MACHINE_ID ret=0 @@ -182,7 +183,7 @@ index e7457e9..edd6514 100755 break fi - ((ret+=$x)) -+ ret=`expr $ret + $? ++ ret=`expr $ret + $?` fi done ;; @@ -206,7 +207,7 @@ index e7457e9..edd6514 100755 fi done -@@ -169,7 +181,7 @@ case $COMMAND in +@@ -169,7 +180,7 @@ case $COMMAND in echo "Removing $ENTRY_DIR_ABS" rm -rf "$ENTRY_DIR_ABS" @@ -215,8 +216,11 @@ index e7457e9..edd6514 100755 ;; *) -@@ -179,3 +191,4 @@ case $COMMAND in +@@ -179,3 +190,4 @@ case $COMMAND in esac exit $ret + +-- +2.20.1 +