diff --git a/create_arm_img_urpmi.sh b/create_arm_img_urpmi.sh index d6d050c..6847d39 100755 --- a/create_arm_img_urpmi.sh +++ b/create_arm_img_urpmi.sh @@ -530,7 +530,7 @@ UUID=$ROOT_UUID / ext4 defaults 0 0" > "$BUILD_PA info "making /boot/extlinux/extlinux.conf" mkdir -p "$BUILD_PATH/boot/extlinux" -sed 212!!;n**รน**:;ncq -e s/\/$ROOT_UUID/g $SOURCE_PATH/$CONFIG_PATH/extlinux.conf >"$BUILD_PATH/boot/extlinux/extlinux.conf" +sed -e s/\/$ROOT_UUID/g $SOURCE_PATH/$CONFIG_PATH/extlinux.conf >"$BUILD_PATH/boot/extlinux/extlinux.conf" KERNEL_ID=`basename $BUILD_PATH/usr/lib/linux-*` sed -i -e s/\/$KERNEL_ID/g "$BUILD_PATH/boot/extlinux/extlinux.conf" @@ -564,23 +564,23 @@ brcmfmac" >> "$BUILD_PATH"/etc/modules case $TARGET_VERSION in 2) info "copying u-boot for $TARGET 2" - cp "$BUILD_PATH/usr/lib/u-boot/rpi_2/u-boot.bin" "$ARM_BOOT/kernel7" + cp "$BUILD_PATH/usr/lib/u-boot/rpi_2/u-boot.bin" "$ARM_BOOT/kernel.img" ;; 0) info "copying u-boot for $TARGET 0" - cp "$BUILD_PATH/usr/lib/u-boot/rpi_0_w/u-boot.bin" "$ARM_BOOT/kernel7" + cp "$BUILD_PATH/usr/lib/u-boot/rpi_0_w/u-boot.bin" "$ARM_BOOT/kernel.img" ;; 1) info "copying u-boot for $TARGET 1" - cp "$BUILD_PATH/usr/lib/u-boot/rpi/u-boot.bin" "$ARM_BOOT/kernel7" + cp "$BUILD_PATH/usr/lib/u-boot/rpi/u-boot.bin" "$ARM_BOOT/kernel.img" ;; 3_32) info "copying u-boot for $TARGET 3 32 bits" - cp "$BUILD_PATH/usr/lib/u-boot/rpi_3_32b/u-boot.bin" "$ARM_BOOT/kernel7" + cp "$BUILD_PATH/usr/lib/u-boot/rpi_3_32b/u-boot.bin" "$ARM_BOOT/kernel.img" ;; 3+) info "copying u-boot for $TARGET 3b+ 32 bits" - cp "$BUILD_PATH/usr/lib/u-boot/rpi_3_32b/u-boot.bin" "$ARM_BOOT/kernel7" + cp "$BUILD_PATH/usr/lib/u-boot/rpi_3_32b/u-boot.bin" "$ARM_BOOT/kernel.img" ;; esac diff --git a/rpi/mageia4arm.cfg.original b/rpi/mageia4arm.cfg.original index e1b78d9..ae56885 100644 --- a/rpi/mageia4arm.cfg.original +++ b/rpi/mageia4arm.cfg.original @@ -20,6 +20,9 @@ ARM_VERSION="armv7hl" #target plateform (xu3-4 or rpi) TARGET="rpi" +#version of the target +# 0, 1, 2 ,3_32 for rpi and 3 or 4 for odroid +TARGET_VERSION="3_32" # URL of the Mageia mirror used to install ( see mirrors.mageia.org ) MIRROR="http://ftp.free.fr/mirrors/mageia.org/distrib/$MAGEIA_VERSION/$ARM_VERSION" @@ -51,6 +54,6 @@ HOSTNAME="$TARGET.$ID_USER" #DO NOT CHANGE THIS BOOTFS="vfat" -#Path where the raspberry pi firmware is/will be downloaded +#Path where the raspberry pi firmware is/will be installed FIRMWARE_PATH="$INSTALL_PATH" FIRMWARE_DIR="firmware-stable"