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

Qcom devices use ramdisk #24

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Qcom devices use ramdisk #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0bc5be
resize_rootfs: only create a sparse image
roxell Feb 8, 2024
0207dfc
repack_boot: all qcom use ramdisk
roxell Feb 8, 2024
161d7de
repack_boot: copy modules from ramdisk to rootfs
roxell Feb 8, 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
5 changes: 3 additions & 2 deletions lava/board_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@ case ${DEVICE_TYPE} in
file ${local_dtb}
machine=${DEVICE_TYPE}
case ${DEVICE_TYPE} in
dragonboard-845c)
dragonboard-410c|dragonboard-845c|qrb5165-rb5)
${kir}/repack_boot.sh -t "${machine}" -d "${local_dtb}" -k "${local_kernel}" -m "${local_modules}" -i "${local_initrd}"
${kir}/resize_rootfs.sh -s -f "${local_rootfs}"
;;
*)
${kir}/repack_boot.sh -t "${machine}" -d "${local_dtb}" -k "${local_kernel}"
${kir}/resize_rootfs.sh -s -f "${local_rootfs}" -o "${local_modules}"
;;
esac
${kir}/resize_rootfs.sh -s -f "${local_rootfs}" -o "${local_modules}"
;;
nfs-dragonboard-845c)

Expand Down
24 changes: 11 additions & 13 deletions repack_boot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,35 +97,33 @@ case ${TARGET} in
fi

cat "${KERNEL_FILE}" "${DTB_FILE}" > zImage+dtb
echo "This is not an initrd">initrd.img
initrd_filename="initrd.img"
mkdir -p modules_dir/usr
unpack_tar_file "${MODULES_FILE}" modules_dir/usr
cd modules_dir
find . | cpio -o -H newc -R +0:+0 | gzip -9 > ../modules.cpio.gz
cd -
initrd_filename="initrd.cpio.gz"
cat "${INITRD_FILE}" modules.cpio.gz > "${initrd_filename}"


# NFS_SERVER_IP and NFS_ROOTFS exported from the environment.
echo ${NFS_SERVER_IP} and ${NFS_ROOTFS}
nfscmdline="root=/dev/nfs nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,nfsvers=3 ip=dhcp"
console_cmdline="console=tty0 console=ttyMSM0,115200n8"
cmdline_extra=""
cmdline_extra="copy_modules"

case ${TARGET} in
dragonboard-410c)
cmdline="root=/dev/mmcblk0p14 rw rootwait ${console_cmdline}"
cmdline="root=/dev/mmcblk0p14 rw rootwait ${console_cmdline} ${cmdline_extra}"
pagasize=2048
;;
dragonboard-845c)
mkdir -p modules_dir/usr
unpack_tar_file "${MODULES_FILE}" modules_dir/usr
cd modules_dir
find . | cpio -o -H newc -R +0:+0 | gzip -9 > ../modules.cpio.gz
cd -
cat "${INITRD_FILE}" modules.cpio.gz > final-initrd.cpio.gz
initrd_filename="final-initrd.cpio.gz"
cmdline_extra="clk_ignore_unused pd_ignore_unused"
cmdline_extra="${cmdline_extra} clk_ignore_unused pd_ignore_unused"
cmdline="root=/dev/sda1 init=/sbin/init rw ${console_cmdline} ${cmdline_extra} -- "
pagasize=4096
;;
qrb5165-rb5)
cmdline="root=PARTLABEL=rootfs rw rootwait earlycon debug ${console_cmdline}"
cmdline="root=PARTLABEL=rootfs rw rootwait earlycon debug ${console_cmdline} ${cmdline_extra}"
pagasize=4096
;;
esac
Expand Down
62 changes: 34 additions & 28 deletions resize_rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,43 +46,49 @@ while getopts "cd:f:hm:o:sz" arg; do
done


OVERLAY_FILE=$(curl_me "${OVERLAY_URL}")
ROOTFS_FILE=$(curl_me "${ROOTFS_URL}")

overlay_file_type=$(file "${OVERLAY_FILE}")
rootfs_file_type=$(file "${ROOTFS_FILE}")
overlay_size=$(find_extracted_size "${OVERLAY_FILE}" "${overlay_file_type}")
rootfs_size=$(find_extracted_size "${ROOTFS_FILE}" "${rootfs_file_type}")
if [[ -n "${OVERLAY_URL}" ]]; then
OVERLAY_FILE=$(curl_me "${OVERLAY_URL}")
overlay_file_type=$(file "${OVERLAY_FILE}")
overlay_size=$(find_extracted_size "${OVERLAY_FILE}" "${overlay_file_type}")

mount_point_dir=$(get_mountpoint_dir)
rootfs_file_type=$(file "${ROOTFS_FILE}")
rootfs_size=$(find_extracted_size "${ROOTFS_FILE}" "${rootfs_file_type}")

echo ${mount_point_dir}
mount_point_dir=$(get_mountpoint_dir)

new_file_name=$(get_new_file_name "${ROOTFS_FILE}" ".new.rootfs")
new_size=$(get_new_size "${overlay_size}" "${rootfs_size}" "${EXTRA_SIZE}")
if [[ "${ROOTFS_FILE}" =~ ^.*.tar* ]]; then
get_and_create_a_ddfile "${new_file_name}" "${new_size}"
else
new_file_name=$(basename "${ROOTFS_FILE}" .gz)
get_and_create_new_rootfs "${ROOTFS_FILE}" "${new_file_name}" "${new_size}"
fi
echo ${mount_point_dir}

if [[ "${ROOTFS_FILE}" =~ ^.*.tar* ]]; then
unpack_tar_file "${ROOTFS_FILE}" "${mount_point_dir}"
fi
new_file_name=$(get_new_file_name "${ROOTFS_FILE}" ".new.rootfs")
new_size=$(get_new_size "${overlay_size}" "${rootfs_size}" "${EXTRA_SIZE}")
if [[ "${ROOTFS_FILE}" =~ ^.*.tar* ]]; then
get_and_create_a_ddfile "${new_file_name}" "${new_size}"
else
new_file_name=$(basename "${ROOTFS_FILE}" .gz)
get_and_create_new_rootfs "${ROOTFS_FILE}" "${new_file_name}" "${new_size}"
fi

if [[ $clear_modules -eq 1 ]]; then
rm -rf "${mount_point_dir}"/lib/modules/*
fi
unpack_tar_file "${OVERLAY_FILE}" "${mount_point_dir}"
if [[ "${ROOTFS_FILE}" =~ ^.*.tar* ]]; then
unpack_tar_file "${ROOTFS_FILE}" "${mount_point_dir}"
fi

if [[ "${ROOTFS_FILE}" =~ ^.*.tar* ]]; then
cd "${mount_point_dir}"
tar -cJf ../"${new_file_name}".tar.xz .
cd ..
fi
if [[ $clear_modules -eq 1 ]]; then
rm -rf "${mount_point_dir}"/lib/modules/*
fi

virt_copy_in ${new_file_name} ${mount_point_dir}
unpack_tar_file "${OVERLAY_FILE}" "${mount_point_dir}"

if [[ "${ROOTFS_FILE}" =~ ^.*.tar* ]]; then
cd "${mount_point_dir}"
tar -cJf ../"${new_file_name}".tar.xz .
cd ..
fi

virt_copy_in ${new_file_name} ${mount_point_dir}
else
new_file_name="${ROOTFS_FILE}"
fi

if [[ ${sparse_needed} -eq 1 ]]; then
img_file="$(basename "${new_file_name}" .ext4).img"
Expand Down