diff options
| author | Daniel Tartavel <contact@librepc.com> | 2018-12-28 09:42:54 +0100 |
|---|---|---|
| committer | Daniel Tartavel <contact@librepc.com> | 2018-12-28 09:42:54 +0100 |
| commit | a22918ebab3b8786bcf4215333486433b7478f02 (patch) | |
| tree | bd372e65679b88ca158854eb730c84e6ad905def /create_arm_img_urpmi.sh | |
| parent | b58cefc85d8035d0018c576aafcbb50c151bc2f6 (diff) | |
| download | mageia4arm-a22918ebab3b8786bcf4215333486433b7478f02.tar mageia4arm-a22918ebab3b8786bcf4215333486433b7478f02.tar.gz mageia4arm-a22918ebab3b8786bcf4215333486433b7478f02.tar.bz2 mageia4arm-a22918ebab3b8786bcf4215333486433b7478f02.tar.xz mageia4arm-a22918ebab3b8786bcf4215333486433b7478f02.zip | |
Corrected a regression on extlinux.conf
Diffstat (limited to 'create_arm_img_urpmi.sh')
| -rwxr-xr-x | create_arm_img_urpmi.sh | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/create_arm_img_urpmi.sh b/create_arm_img_urpmi.sh index 184ea9b..5fcae93 100755 --- a/create_arm_img_urpmi.sh +++ b/create_arm_img_urpmi.sh @@ -514,6 +514,11 @@ copyingsystem() UUID=$BOOT_UUID /mnt/rpi_boot vfat defaults 0 0 UUID=$ROOT_UUID / ext4 defaults 0 0" > "$BUILD_PATH"/etc/fstab +info "making /boot/extlinux/extlinux.conf" +mkdir -p "$BUILD_PATH/boot/extlinux" +sed -e s/\<UUID\>/$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/\<FDTDIR\>/$KERNEL_ID/g "$BUILD_PATH/boot/extlinux/extlinux.conf" case $TARGET in rpi) @@ -534,11 +539,6 @@ brcmfmac" >> "$BUILD_PATH"/etc/modules /bin/cp -a "$SOURCE_PATH/$CONFIG_PATH/modprobe.conf" "$BUILD_PATH/etc/" chown root:root "$BUILD_PATH/etc/modprobe.conf" - info "making /boot/extlinux/extlinux.conf" - mkdir -p "$BUILD_PATH/boot/extlinux" - sed -e s/\<UUID\>/$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/\<FDTDIR\>/$KERNEL_ID/g "$BUILD_PATH/boot/extlinux/extlinux.conf" info "copying firmware, overlays in rpi boot partition" # cp -a "$BUILD_PATH/usr/lib/linux-"* "$BOOT/dtb" cp -av "$FIRMWARE_PATH/$FIRMWARE_DIR/boot/start"* "$RPI_BOOT/" @@ -584,22 +584,32 @@ brcmfmac" >> "$BUILD_PATH"/etc/modules exit 1 fi fi - info "copying tools in /usr/local/bin/" - /bin/cp -a "$SOURCE_PATH/tools/" "$BUILD_PATH/usr/local/bin/" -# /bin/cp -a "$SOURCE_PATH/rpi/sed_extlinux.conf.sh" "$BUILD_PATH/usr/local/bin/" - if ! [ $? -eq 0 ];then - error "line $LINENO error copying tools" - ERRORN=$((ERRORN++)) - fi -# info "copying " + + info "copying Mageia image to root partition" + /bin/rsync -a --exclude "$RPI_BOOT/" --exclude "qemu-arm-static*" "$BUILD_PATH/" "$ROOT/" + /bin/rsync -a "$RPI_BOOT/" "$BOOT/" ;; - ODROID) + odroid) + ODROID_BOOT="$BUILD_PATH/mnt/odroid_boot" + if ! [ -d "$ODROID_BOOT" ];then + mkdir -p "$ODROID_BOOT" + fi + info "Copying extlinux.conf on $ODROID_BOOT" + cp -R "$BUILD_PATH/boot/extlinux" "$ODROID_BOOT/" + info "copying u-boot to $ODROID_BOOT for $TARGET $TARGET_VERSION" + cp "$BUILD_PATH/usr/lib/u-boot/$TARGET-$TARGET_VERSION/u-boot.bin" "$ODROID_BOOT/" + info "copying Mageia image to root partition" + /bin/rsync -a --exclude "$ODROID_BOOT/" --exclude "qemu-arm-static*" "$BUILD_PATH/" "$ROOT/" + /bin/rsync -a "$ODROID_BOOT/" "$BOOT/" ;; esac - info "copying Mageia image to root partition" - /bin/rsync -a --exclude "$RPI_BOOT/" --exclude "qemu-arm-static*" "$BUILD_PATH/" "$ROOT/" - /bin/rsync -a "$RPI_BOOT/" "$BOOT/" + info "copying tools in /usr/local/bin/" + /bin/cp -a "$SOURCE_PATH/tools/" "$BUILD_PATH/usr/local/bin/" + if ! [ $? -eq 0 ];then + error "line $LINENO error copying tools" + ERRORN=$((ERRORN++)) + fi # /bin/mkdir "$ROOT/boot" copyingcommon |