diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/linux-build.eclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/linux-build.eclass b/eclass/linux-build.eclass index 5eabd42f..c349ff3e 100644 --- a/eclass/linux-build.eclass +++ b/eclass/linux-build.eclass @@ -193,8 +193,9 @@ _linux-build_src_prepare_build() { esac KV_INSTALLED="$(best_version ${CATEGORY}/${PN}:${SLOT})" - KV_INSTALLED="${KV_INSTALLED/#${CATEGORY}\/${PN}-}" + KV_INSTALLED="${KV_INSTALLED/#${CATEGORY}\/${PN}-}${KV_EXTRA}" + # Generate bootloader configuration if [[ -n "${KV_INSTALLED}" ]] ; then for (( i = 0 ; i < ${#BOOTLOADERS[@]} ; i += 2 )) ; do if has_version "${BOOTLOADERS[i]}" && [[ -e "${EPREFIX}/${BOOTLOADERS[i+1]}" ]] ; then @@ -208,15 +209,15 @@ _linux-build_src_prepare_build() { mkdir -p "${WORKDIR}/bootloader/${BOOTLOADER_DIR}" # Handle collision protect - for (( j = 0 ; j < 9999 ; j++ )) ; do - printf -v BOOTLOADER_PROTECTED_FILE "._cfg%04d_${BOOTLOADER_FILE}" "${j}" + for (( i = 0 ; i < 9999 ; i++ )) ; do + printf -v BOOTLOADER_PROTECTED_FILE "._cfg%04d_${BOOTLOADER_FILE}" "${i}" if [[ ! -e "${EPREFIX}/${BOOTLOADER_DIR}/${BOOTLOADER_PROTECTED_FILE}" ]] ; then break fi done einfo "Generating ${BOOTLOADER_DIR}/${BOOTLOADER_FILE}" - sed -e "s@${KV_INSTALLED}${KV_EXTRA}@${KV_FULL}@g" \ + sed -e "s@${KV_INSTALLED}@${KV_FULL}@g" \ "${EPREFIX}/${BOOTLOADER_DIR}/${BOOTLOADER_FILE}" \ > "${WORKDIR}/bootloader/${BOOTLOADER_DIR}/${BOOTLOADER_PROTECTED_FILE}" |