card-kernel-scripts: Get rid of DEFAULT_FIND_KERNEL

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-10-12 15:51:54 +02:00
parent c37b610d52
commit f14ea45485
4 changed files with 5 additions and 6 deletions

View File

@@ -333,12 +333,14 @@ StartCardKernelWrite() {
if [ -z "$Machine" ]; then
Machine="$DEFAULT_MACHINE_FAMILY"
fi
if [ -z "$FindString" ]; then
FindString="$DEFAULT_FIND_KERNEL"
fi
if [ -z "$KernelImageType" ]; then
KernelImageType="$DEFAULT_KERNEL_IMAGE_TYPE"
fi
if [ -z "$FindString" ]; then
# we create an extra link on kernel to make things easier - see
# appends/oe-core/linux%.bbappend
FindString="-name ${KernelImageType}-abiversion-* -type l"
fi
RunUserStartRoot "${style_bold}Kernel on %DevicePath% will be overwritten by %DeployedFile%${style_normal}"
PrepareWrite

View File

@@ -10,7 +10,6 @@
DEFAULT_MACHINE_FAMILY='*imx*'
DEFAULT_FIND_ROOTFS='-name *.sdcard -o -name *.wic.gz -type l'
DEFAULT_KERNEL_IMAGE_TYPE='uImage'
DEFAULT_FIND_KERNEL="-name ${DEFAULT_KERNEL_IMAGE_TYPE}-abiversion-* -type l"
# callback for card-write
RootCardWriteCallback() {

View File

@@ -10,7 +10,6 @@
DEFAULT_MACHINE_FAMILY='raspberrypi*'
DEFAULT_FIND_ROOTFS='-name *.rpi-sdimg -type l'
DEFAULT_KERNEL_IMAGE_TYPE='Image'
DEFAULT_FIND_KERNEL="-name ${DEFAULT_KERNEL_IMAGE_TYPE}-abiversion-* -type l"
# callback for card-write
RootCardWriteCallback() {

View File

@@ -10,7 +10,6 @@
DEFAULT_MACHINE_FAMILY=''
DEFAULT_FIND_ROOTFS='-name *.tar.bz2 -type l'
DEFAULT_KERNEL_IMAGE_TYPE='zImage'
DEFAULT_FIND_KERNEL="-name ${DEFAULT_KERNEL_IMAGE_TYPE}-abiversion-* -type l"
# callback for card-write
RootCardWriteCallback() {