diff options
Diffstat (limited to 'kbuild.sh')
| -rwxr-xr-x | kbuild.sh | 28 |
1 files changed, 19 insertions, 9 deletions
@@ -204,13 +204,23 @@ version=$(cat $output_dir/include/generated/utsrelease.h | cut -d '"' -f 2) # Create the image # -if [[ -r "$kbuild_root/images/$image.sh" ]] ; then - source "${kbuild_root}/images/$image.sh" || exit 1 - eval make_${image}_image +_image_type=${image/:*/} + +if [[ -r "$kbuild_root/images/${_image_type}.sh" ]] ; then + source "${kbuild_root}/images/${_image_type}.sh" || exit 1 + eval make_${_image_type}_image else - image_file=$output_dir/arch/$arch/boot/$image + _image_file=${_image_type} fi +if echo "${image}" | grep -q ':' ; then + _image_name=${image/*:/} +else + _image_name=${_image_file} +fi + +_image_file="$output_dir/arch/$arch/boot/${_image_file}" + # # Copy the files to their destination directories. # @@ -229,7 +239,7 @@ copy_dtbs() { local dest_dir=$1 local dtb - if [[ $image == FIT || $image == CrOS ]] ; then + if [[ $_image_type == FIT || $_image_type == CrOS ]] ; then return fi @@ -244,12 +254,12 @@ copy_dtbs() { if [[ -d "$target_dir" ]] ; then mkdir -p $target_dir/boot - cp $image_file $target_dir/boot/ + cp ${_image_file} $target_dir/boot/${_image_name} copy_dtbs $target_dir/boot/ fi -if [[ $image != CrOS && -d "$tftp_dir" ]] ; then - cp $image_file $tftp_dir/ +if [[ $_image_type != CrOS && -d "$tftp_dir" ]] ; then + cp ${_image_file} $tftp_dir/${_image_name} copy_dtbs $tftp_dir/ fi @@ -271,7 +281,7 @@ fi # Print status and terminate # -echo "Kernel image available in $image_file" +echo "Kernel image available in ${_image_file}" if [[ x$modules == xmodules ]] ; then echo "Kernel modules installed to $mod_path/lib/modules/$version" fi |