DTux/dtux__mageia4arm
Archived
1
0
Fork 0
Code

- corrected error on UUID of partitions

Browse Source 
- corrected bug on copying uname-string
This commit is contained in:
Daniel Tartavel 2018-07-22 12:59:26 +02:00
parent 1f3844c2e4
commit 49d9c6c5cd
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
create_arm_img_urpmi.sh
View File

@ -409,10 +409,6 @@ EOF
info "device $DEVICE" info "device $DEVICE"
info "partitions list:" info "partitions list:"
info "$(/sbin/partx -v "$INSTALL_PATH/$IMAGE")" info "$(/sbin/partx -v "$INSTALL_PATH/$IMAGE")"
BOOTP="${DEVICE}p1"
BOOT_UUID=$(blkid -o value uuid "$BOOTP" | head -n 1)
ROOTP="${DEVICE}p2"
ROOT_UUID=$(blkid -o value uuid "$ROOTP" | head -n 1)
} }
formatpartitions() formatpartitions()
@ -432,6 +428,12 @@ formatpartitions()
/sbin/losetup -d "$DEVICE" /sbin/losetup -d "$DEVICE"
exit 1 exit 1
fi fi
BOOTP="${DEVICE}p1"
BOOT_UUID=$(blkid -o value uuid "$BOOTP" | head -n 1)
info "Boot UUID: $BOOT_UUID"
ROOTP="${DEVICE}p2"
ROOT_UUID=$(blkid -o value uuid "$ROOTP" | head -n 1)
info "Root UUID: $ROOT_UUID"
} }
copyingsystem() copyingsystem()
@ -479,9 +481,10 @@ $ROOT_UUID / ext4 defaults 0 0" > "$BUILD_PATH"/e
rpi) rpi)
info "copying raspberry firmware in /boot" info "copying raspberry firmware in /boot"
/bin/rsync -rlptDH "$FIRMWARE_PATH/firmware-stable/boot/" "$BOOT" /bin/rsync -rlptDH "$FIRMWARE_PATH/firmware-stable/boot/" "$BOOT"
cp -a "$FIRMWARE_PATH/firmware-stable/extra/uname_string*" "$BOOT" cp -a "$FIRMWARE_PATH/firmware-stable/extra/uname_string" "$BOOT"
cp -a "$FIRMWARE_PATH/firmware-stable/extra/uname_string7" "$BOOT"
info "copying config.txt" info "copying config.txt"
cp "$SOURCE_PATH/$CONFIG_PATH/config.txt" cp "$SOURCE_PATH/$CONFIG_PATH/config.txt" "$BOOT"
info "adding modules in /etc/modules" info "adding modules in /etc/modules"
echo "vchiq echo "vchiq
snd_bcm2835 snd_bcm2835
@ -502,11 +505,13 @@ brcmfmac" >> "$BUILD_PATH"/etc/modules
info "copying wifi firmware file missing in Mageia" info "copying wifi firmware file missing in Mageia"
/bin/mkdir -p "$ROOT/usr/lib/firmware/brcm/" /bin/mkdir -p "$ROOT/usr/lib/firmware/brcm/"
cp "$SOURCE_PATH/$CONFIG_PATH/brcmfmac43430-sdio.txt" "$ROOT/usr/lib/firmware/brcm/" /bin/cp "$SOURCE_PATH/$CONFIG_PATH/brcmfmac43430-sdio.txt" "$ROOT/usr/lib/firmware/brcm/"
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
error "line $LINENO error copying wifi firmware in $ROOTP/usr/lib/firmware/brcm/ : exiting" error "line $LINENO error copying wifi firmware in $ROOTP/usr/lib/firmware/brcm/ : exiting"
exit 1 exit 1
fi fi
info "copying tools in /usr/local/"
/bin/cp -a "$SOURCE_PATH/tools" "/usr/local"
;; ;;
xu3-4) xu3-4)
;; ;;
@ -667,8 +672,6 @@ xu3 | xu4)
;; ;;
rpi) rpi)
CREATEIMG="createrpiimage" CREATEIMG="createrpiimage"
#FIRMWARE_PATH="$SOURCE_PATH/.."
#FIRMWARE_DOWNLOAD_URL="https://github.com/raspberrypi/firmware/archive/stable.zip"
;; ;;
*) *)
error "No Target : $TARGET" error "No Target : $TARGET"