Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sm8250 devices improve: use losetup and fix qbootctl #6700

Merged
merged 2 commits into from
Jun 9, 2024
Merged

sm8250 devices improve: use losetup and fix qbootctl #6700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9af256f
sm8250: enable ppa for noble to fix qbootctl
amazingfate Jun 6, 2024
e7846ac
extensions: image-output-abl: use losetup instead of silly dd
amazingfate Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/boards/xiaomi-elish.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function post_family_tweaks__xiaomi-elish_enable_services() {
return 0
fi

if [[ "${RELEASE}" == "jammy" ]];then
if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]];then
display_alert "Adding qcom-mainline PPA" "${BOARD}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/qcom-mainline --yes --no-update
fi
Expand Down
2 changes: 1 addition & 1 deletion config/boards/xiaomi-umi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function post_family_tweaks__xiaomi-umi_enable_services() {
return 0
fi

if [[ "${RELEASE}" == "jammy" ]]; then
if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]]; then
display_alert "Adding qcom-mainline PPA" "${BOARD}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/qcom-mainline --yes --no-update
fi
Expand Down
10 changes: 5 additions & 5 deletions extensions/image-output-abl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ function post_build_image__900_convert_to_abl_img() {
declare -g ROOTFS_IMAGE_FILE="${DESTIMG}/${version}.rootfs.img"
rootfs_start_sector=$(gdisk -l ${DESTIMG}/${version}.img | grep rootfs | awk '{print $2}')
rootfs_end_sector=$(gdisk -l ${DESTIMG}/${version}.img | grep rootfs | awk '{print $3}')
dd if=${DESTIMG}/${version}.img skip=${rootfs_start_sector} count=$((${rootfs_end_sector} - ${rootfs_start_sector})) of=${DESTIMG}/rootfs.img
rm ${DESTIMG}/${version}.img
old_rootfs_image_uuid=$(blkid -s UUID -o value ${DESTIMG}/rootfs.img)
old_rootfs_image_mount_dir=${DESTIMG}/rootfs-old
new_rootfs_image_mount_dir=${DESTIMG}/rootfs-new
mkdir -p ${old_rootfs_image_mount_dir} ${new_rootfs_image_mount_dir}
truncate --size=9216M ${ROOTFS_IMAGE_FILE}
mkfs.ext4 -F ${ROOTFS_IMAGE_FILE}
new_rootfs_image_uuid=$(blkid -s UUID -o value ${ROOTFS_IMAGE_FILE})
mount ${DESTIMG}/rootfs.img ${old_rootfs_image_mount_dir}
old_image_loop_device=$(losetup -f -P --show ${DESTIMG}/${version}.img)
old_rootfs_image_uuid=$(blkid -s UUID -o value ${old_image_loop_device}p1)
mount ${old_image_loop_device}p1 ${old_rootfs_image_mount_dir}
mount ${ROOTFS_IMAGE_FILE} ${new_rootfs_image_mount_dir}
cp -rfp ${old_rootfs_image_mount_dir}/* ${new_rootfs_image_mount_dir}/
umount ${old_rootfs_image_mount_dir}
rm -rf ${old_rootfs_image_mount_dir} ${DESTIMG}/rootfs.img
losetup -d ${old_image_loop_device}
rm ${DESTIMG}/${version}.img
display_alert "Replace root partition uuid from ${old_rootfs_image_uuid} to ${new_rootfs_image_uuid} in /etc/fstab" "${EXTENSION}" "info"
sed -i "s|${old_rootfs_image_uuid}|${new_rootfs_image_uuid}|g" ${new_rootfs_image_mount_dir}/etc/fstab
declare -g bootimg_cmdline="${BOOTIMG_CMDLINE_EXTRA} root=UUID=${new_rootfs_image_uuid} slot_suffix=${abl_boot_partition_label#boot}"
Expand Down