mirror of
https://github.com/ostreedev/ostree.git
synced 2025-03-17 14:50:35 +03:00
720e2ec9bc
Much like the (optional) initramfs at `/usr/lib/ostree-boot/initramfs-<SHA256>` or `/usr/lib/modules/$kver/initramfs` you can now optionally include a flattened devicetree (.dtb) file alongside the kernel at `/usr/lib/ostree-boot/devicetree-<SHA256>` or `/usr/lib/modules/$kver/devicetree`. This is useful for embedded ARM systems which need the devicetree file loaded by the bootloader for the kernel to discover and initialise hardware. See https://en.wikipedia.org/wiki/Device_tree for more information. This patch was mostly produced by copy-pasting code for initramfs handling and renaming `s/initramfs/devicetree/g`. It's not beautiful, but it is fairly straightforward. It may be useful to extend device-tree support in a number ways in the future. Device trees dependant on many details of the hardware they support. This makes them unlike kernels, which may support many different hardware variants as long as the instruction-set matches. This means that a ostree tree created with a device-tree in this manner will only boot on a single model of hardware. This is sufficient for my purposes, but may not be for others'. I've tested this on my NVidia Tegra TK1 device which has u-boot running in syslinux-compatible mode. Closes: #1411 Approved by: cgwalters
91 lines
4.3 KiB
Bash
Executable File
91 lines
4.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
. $(dirname $0)/libtest.sh
|
|
|
|
echo "1..10"
|
|
|
|
setup_os_repository "archive-z2" "uboot"
|
|
|
|
cd ${test_tmpdir}
|
|
|
|
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos $(cat httpd-address)/ostree/testos-repo
|
|
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull testos testos/buildmaster/x86_64-runtime
|
|
${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=rootfs --os=testos testos:testos/buildmaster/x86_64-runtime
|
|
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'root=LABEL=rootfs'
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'init='
|
|
|
|
echo "ok deployment with initramfs"
|
|
|
|
pull_test_tree() {
|
|
kernel_contents=$1
|
|
initramfs_contents=$2
|
|
devicetree_contents=$3
|
|
|
|
printf "TEST SETUP:\n kernel: %s\n initramfs: %s\n devicetree: %s\n layout: %s\n" \
|
|
"$kernel_contents" "$initramfs_contents" "$devicetree_contents" "$layout"
|
|
|
|
rm -rf ${test_tmpdir}/osdata/usr/lib/modules/3.6.0/{initramfs.img,vmlinuz,devicetree} \
|
|
${test_tmpdir}/osdata/usr/lib/ostree-boot \
|
|
${test_tmpdir}/osdata/boot
|
|
if [ "$layout" = "/usr/lib/modules" ]; then
|
|
# Fedora compatible layout
|
|
cd ${test_tmpdir}/osdata/usr/lib/modules/3.6.0
|
|
echo -n "$kernel_contents" > vmlinuz
|
|
[ -n "$initramfs_contents" ] && echo -n "$initramfs_contents" > initramfs.img
|
|
[ -n "$devicetree_contents" ] && echo -n "$devicetree_contents" > devicetree
|
|
elif [ "$layout" = "/usr/lib/ostree-boot" ] || [ "$layout" = "/boot" ]; then
|
|
# "Legacy" layout
|
|
mkdir -p "${test_tmpdir}/osdata/$layout"
|
|
cd "${test_tmpdir}/osdata/$layout"
|
|
bootcsum=$(echo -n "$kernel_contents$initramfs_contents$devicetree_contents" \
|
|
| sha256sum | cut -f 1 -d ' ')
|
|
echo -n "$kernel_contents" > vmlinuz-${bootcsum}
|
|
[ -n "$initramfs_contents" ] && echo -n "$initramfs_contents" > initramfs-${bootcsum}
|
|
[ -n "$devicetree_contents" ] && echo -n "$devicetree_contents" > devicetree-${bootcsum}
|
|
else
|
|
exit 1
|
|
fi
|
|
cd -
|
|
${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --tree=dir=osdata/ -b testos/buildmaster/x86_64-runtime
|
|
${CMD_PREFIX} ostree pull testos:testos/buildmaster/x86_64-runtime
|
|
}
|
|
|
|
get_key_from_bootloader_conf() {
|
|
conffile=$1
|
|
key=$2
|
|
|
|
assert_file_has_content "$conffile" "^$key"
|
|
awk "/^$key/ { print \$2 }" "$conffile"
|
|
}
|
|
|
|
for layout in /usr/lib/modules /usr/lib/ostree-boot /boot;
|
|
do
|
|
pull_test_tree "the kernel only"
|
|
${CMD_PREFIX} ostree admin deploy --os=testos --karg=root=/dev/sda2 --karg=rootwait testos:testos/buildmaster/x86_64-runtime
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'rootwait'
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'init='
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'initrd'
|
|
|
|
echo "ok switching to bootdir with no initramfs layout=$layout"
|
|
|
|
pull_test_tree "the kernel" "initramfs to assist the kernel"
|
|
${CMD_PREFIX} ostree admin deploy --os=testos --karg-none --karg=root=LABEL=rootfs testos:testos/buildmaster/x86_64-runtime
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'initrd'
|
|
assert_file_has_content sysroot/boot/$(get_key_from_bootloader_conf sysroot/boot/loader/entries/ostree-testos-0.conf "initrd") "initramfs to assist the kernel"
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'root=LABEL=rootfs'
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'rootwait'
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'init='
|
|
|
|
echo "ok switching from no initramfs to initramfs enabled sysroot layout=$layout"
|
|
|
|
pull_test_tree "the kernel" "" "my .dtb file"
|
|
${CMD_PREFIX} ostree admin deploy --os=testos testos:testos/buildmaster/x86_64-runtime
|
|
|
|
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'init='
|
|
assert_file_has_content sysroot/boot/"$(get_key_from_bootloader_conf sysroot/boot/loader/entries/ostree-testos-0.conf 'devicetree')" "my .dtb file"
|
|
assert_not_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'initrd'
|
|
|
|
echo "ok switching from initramfs to no initramfs sysroot with devicetree layout=$layout"
|
|
done
|