Merge pull request #74 from spycat88/fix-rk-boot-ini
Rockchip: fix boot.ini
This commit is contained in:
commit
b7d56bd8fb
1 changed files with 7 additions and 7 deletions
|
@ -58,8 +58,7 @@ fi
|
|||
|
||||
case "${PKG_SOC}" in
|
||||
rk35*)
|
||||
for BOOT_IMAGE in u-boot.itb u-boot.img u-boot.img
|
||||
do
|
||||
for BOOT_IMAGE in u-boot.itb u-boot.img u-boot.img; do
|
||||
if [ -f "${BOOT_IMAGE}" ]; then
|
||||
echo "uboot: copy ${BOOT_IMAGE} image to ${INSTALL}/usr/share/bootloader..."
|
||||
cp -av ${BOOT_IMAGE} ${INSTALL}/usr/share/bootloader/${BOOT_IMAGE}
|
||||
|
@ -111,13 +110,14 @@ fi
|
|||
;;
|
||||
esac
|
||||
|
||||
if [ "${BOOT_INI}" == true ]
|
||||
then
|
||||
if [ "${BOOT_INI}" == true ]; then
|
||||
echo "boot: create boot.ini..."
|
||||
if [ -e "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.ini" ]
|
||||
then
|
||||
if [ -e "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.ini" ]; then
|
||||
cp -f ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.ini ${INSTALL}/usr/share/bootloader/boot.ini
|
||||
sed -i "s~@EXTRA_CMDLINE@~${EXTRA_CMDLINE}~g" ${INSTALL}/usr/share/bootloader/boot.ini
|
||||
sed -e "s/@DISTRO_BOOTLABEL@/${DISTRO_BOOTLABEL}/" \
|
||||
-e "s/@DISTRO_DISKLABEL@/${DISTRO_DISKLABEL}/" \
|
||||
-e "s/@EXTRA_CMDLINE@/${EXTRA_CMDLINE}/" \
|
||||
-i "${INSTALL}/usr/share/bootloader/boot.ini"
|
||||
else
|
||||
echo "ERROR: No boot.ini found in ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/."
|
||||
exit 1
|
||||
|
|
Loading…
Reference in a new issue