Merge pull request #2 from depsterr/master
Adding support for installing to sd cards as well as preventing unnecessary downloads.
This commit is contained in:
commit
fbf2477b1c
25
flash-it.sh
25
flash-it.sh
|
@ -117,14 +117,14 @@ echo -e "\e[1mDownloading images...\e[0m"
|
||||||
WGET=$(wget_cmd)
|
WGET=$(wget_cmd)
|
||||||
UBOOT_DOWNLOAD="https://gitlab.com/sailfishos-porters-ci/dont_be_evil-ci/-/jobs/artifacts/$BRANCH/download?job=$UBOOT_JOB"
|
UBOOT_DOWNLOAD="https://gitlab.com/sailfishos-porters-ci/dont_be_evil-ci/-/jobs/artifacts/$BRANCH/download?job=$UBOOT_JOB"
|
||||||
$WGET "${UBOOT_JOB}.zip" "${UBOOT_DOWNLOAD}" || {
|
$WGET "${UBOOT_JOB}.zip" "${UBOOT_DOWNLOAD}" || {
|
||||||
echo >&2 "UBoot image download failed. Aborting."
|
echo >&2 "UBoot image download failed. Aborting."
|
||||||
exit 2
|
exit 2
|
||||||
}
|
}
|
||||||
|
|
||||||
ROOTFS_DOWNLOAD="https://gitlab.com/sailfishos-porters-ci/dont_be_evil-ci/-/jobs/artifacts/$BRANCH/download?job=$ROOTFS_JOB"
|
ROOTFS_DOWNLOAD="https://gitlab.com/sailfishos-porters-ci/dont_be_evil-ci/-/jobs/artifacts/$BRANCH/download?job=$ROOTFS_JOB"
|
||||||
$WGET "${ROOTFS_JOB}.zip" "${ROOTFS_DOWNLOAD}" || {
|
$WGET "${ROOTFS_JOB}.zip" "${ROOTFS_DOWNLOAD}" || {
|
||||||
echo >&2 "Root filesystem image download failed. Aborting."
|
echo >&2 "Root filesystem image download failed. Aborting."
|
||||||
exit 2
|
exit 2
|
||||||
}
|
}
|
||||||
|
|
||||||
# Select flash target
|
# Select flash target
|
||||||
|
@ -135,6 +135,15 @@ echo "Flashing image to: $DEVICE_NODE"
|
||||||
echo "WARNING: All data will be erased! You have been warned!"
|
echo "WARNING: All data will be erased! You have been warned!"
|
||||||
echo "Some commands require root permissions, you might be asked to enter your sudo password."
|
echo "Some commands require root permissions, you might be asked to enter your sudo password."
|
||||||
|
|
||||||
|
# use p1, p2 extentions instead of 1, 2 when using sd drives
|
||||||
|
if [[ $(echo $DEVICE_NODE | grep mmcblk) ]]; then
|
||||||
|
BOOTPART="${DEVICE_NODE}p1"
|
||||||
|
DATAPART="${DEVICE_NODE}p2"
|
||||||
|
else
|
||||||
|
BOOTPART="${DEVICE_NODE}1"
|
||||||
|
DATAPART="${DEVICE_NODE}2"
|
||||||
|
fi
|
||||||
|
|
||||||
# Creating EXT4 file system
|
# Creating EXT4 file system
|
||||||
echo -e "\e[1mCreating EXT4 file system...\e[0m"
|
echo -e "\e[1mCreating EXT4 file system...\e[0m"
|
||||||
for PARTITION in $(ls ${DEVICE_NODE}*)
|
for PARTITION in $(ls ${DEVICE_NODE}*)
|
||||||
|
@ -145,8 +154,8 @@ done
|
||||||
sudo parted $DEVICE_NODE mklabel msdos --script
|
sudo parted $DEVICE_NODE mklabel msdos --script
|
||||||
sudo parted $DEVICE_NODE mkpart primary ext4 1MB 250MB --script
|
sudo parted $DEVICE_NODE mkpart primary ext4 1MB 250MB --script
|
||||||
sudo parted $DEVICE_NODE mkpart primary ext4 250MB 100% --script
|
sudo parted $DEVICE_NODE mkpart primary ext4 250MB 100% --script
|
||||||
sudo mkfs.ext4 -F -L boot "${DEVICE_NODE}1" # 1st partition = boot
|
sudo mkfs.ext4 -F -L boot $BOOTPART # 1st partition = boot
|
||||||
sudo mkfs.ext4 -F -L data "${DEVICE_NODE}2" # 2nd partition = data
|
sudo mkfs.ext4 -F -L data $DATAPART # 2nd partition = data
|
||||||
|
|
||||||
# Flashing u-boot
|
# Flashing u-boot
|
||||||
echo -e "\e[1mFlashing U-boot...\e[0m"
|
echo -e "\e[1mFlashing U-boot...\e[0m"
|
||||||
|
@ -160,14 +169,14 @@ unzip "${ROOTFS_JOB}.zip"
|
||||||
TEMP=`ls $ROOTFS_DIR/*/*.tar.bz2`
|
TEMP=`ls $ROOTFS_DIR/*/*.tar.bz2`
|
||||||
echo "$TEMP"
|
echo "$TEMP"
|
||||||
mkdir "$MOUNT_DATA"
|
mkdir "$MOUNT_DATA"
|
||||||
sudo mount "${DEVICE_NODE}2" "$MOUNT_DATA" # Mount data partition
|
sudo mount $DATAPART "$MOUNT_DATA" # Mount data partition
|
||||||
sudo tar -xpf "$TEMP" -C "$MOUNT_DATA"
|
sudo tar -xpf "$TEMP" -C "$MOUNT_DATA"
|
||||||
sync
|
sync
|
||||||
|
|
||||||
# Copying kernel to boot partition
|
# Copying kernel to boot partition
|
||||||
echo -e "\e[1mCopying kernel to boot partition...\e[0m"
|
echo -e "\e[1mCopying kernel to boot partition...\e[0m"
|
||||||
mkdir "$MOUNT_BOOT"
|
mkdir "$MOUNT_BOOT"
|
||||||
sudo mount "${DEVICE_NODE}1" "$MOUNT_BOOT" # Mount boot partition
|
sudo mount $BOOTPART "$MOUNT_BOOT" # Mount boot partition
|
||||||
sudo cp $MOUNT_DATA/boot/* $MOUNT_BOOT
|
sudo cp $MOUNT_DATA/boot/* $MOUNT_BOOT
|
||||||
sudo cp "./u-boot-bootloader/$ROOTFS_DIR/boot.scr" "$MOUNT_BOOT/boot.scr"
|
sudo cp "./u-boot-bootloader/$ROOTFS_DIR/boot.scr" "$MOUNT_BOOT/boot.scr"
|
||||||
sync
|
sync
|
||||||
|
|
Loading…
Reference in New Issue