mirror of
https://github.com/ostreedev/ostree.git
synced 2024-12-25 01:34:34 +03:00
5f08649f51
Add support for a devicetree directory at /usr/lib/modules/$kver/dtb/. In ARM world a general purpose distribution often suppports multiple boards with a single operating system. However, OSTree currently only supports a single device tree, which does not allow to use the same OSTree on different ARM machines. In this scenario typically the boot loader selects the effective device tree. This adds device tree directory support for the new boot artefact location under /usr/lib/modules. If the file `devicetree` does not exist, then the folder dtb will be checked. All devicetrees are hashed into the deployment hash. This makes sure that even a single devicetree change leads to a new deployment and hence can be rolled back. The loader configuration has a new key "devicetreepath" which contains the path where devicetrees are stored. This is also written to the U-Boot variable "fdtdir". The boot loader is expected to use this path to load a particular machines device tree from. Closes: #1900 Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
81 lines
3.3 KiB
Bash
Executable File
81 lines
3.3 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright (C) 2011,2014 Colin Walters <walters@verbum.org>
|
|
# Copyright (C) 2013 Javier Martinez <javier.martinez@collabora.co.uk>
|
|
#
|
|
# SPDX-License-Identifier: LGPL-2.0+
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with this library; if not, write to the
|
|
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
# Boston, MA 02111-1307, USA.
|
|
|
|
set -euo pipefail
|
|
|
|
. $(dirname $0)/libtest.sh
|
|
|
|
# Exports OSTREE_SYSROOT so --sysroot not needed.
|
|
kver="3.6.0"
|
|
modulesdir="usr/lib/modules/${kver}"
|
|
setup_os_repository "archive" "uboot" ${modulesdir}
|
|
|
|
extra_admin_tests=2
|
|
|
|
. $(dirname $0)/admin-test.sh
|
|
|
|
cd ${test_tmpdir}
|
|
# Note this test actually requires a checksum change to /boot,
|
|
# because adding the uEnv.txt isn't currently covered by the
|
|
# "bootcsum".
|
|
os_repository_new_commit "uboot test" "test upgrade multiple kernel args"
|
|
mkdir -p osdata/usr/lib/ostree-boot
|
|
cat << 'EOF' > osdata/usr/lib/ostree-boot/uEnv.txt
|
|
loaduimage=load mmc ${bootpart} ${loadaddr} ${kernel_image}
|
|
loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}${fdtfile}
|
|
loadramdisk=load mmc ${bootpart} ${rdaddr} ${ramdisk_image}
|
|
mmcargs=setenv bootargs $bootargs console=${console} ${optargs} root=${mmcroot} rootfstype=${mmcrootfstype}
|
|
mmcboot=run loadramdisk; echo Booting from mmc ....; run mmcargs; bootz ${loadaddr} ${rdaddr} ${fdtaddr}
|
|
EOF
|
|
${CMD_PREFIX} ostree --repo=testos-repo commit --tree=dir=osdata/ -b testos/buildmaster/x86_64-runtime
|
|
${CMD_PREFIX} ostree admin upgrade --os=testos
|
|
assert_file_has_content sysroot/boot/uEnv.txt "loadfdt="
|
|
assert_file_has_content sysroot/boot/uEnv.txt "kernel_image="
|
|
assert_file_has_content sysroot/boot/uEnv.txt "kernel_image2="
|
|
assert_file_has_content sysroot/boot/uEnv.txt "kernel_image3="
|
|
|
|
echo "ok merging uEnv.txt files"
|
|
|
|
cd ${test_tmpdir}
|
|
os_repository_new_commit "uboot test" "test with device tree directory"
|
|
|
|
devicetree_path=osdata/${modulesdir}/dtb/asoc-board.dtb
|
|
devicetree_overlay_path=osdata/${modulesdir}/dtb/overlays/overlay.dtbo
|
|
|
|
mkdir -p osdata/${modulesdir}/dtb
|
|
echo "a device tree" > ${devicetree_path}
|
|
mkdir -p osdata/${modulesdir}/dtb/overlays
|
|
echo "a device tree overlay" > ${devicetree_overlay_path}
|
|
|
|
bootcsum=$(
|
|
(echo "new: a kernel uboot test" && echo "new: an initramfs uboot test" &&
|
|
cat ${devicetree_path} ${devicetree_overlay_path} ) |
|
|
sha256sum | cut -f 1 -d ' ')
|
|
|
|
${CMD_PREFIX} ostree --repo=testos-repo commit --tree=dir=osdata/ -b testos/buildmaster/x86_64-runtime
|
|
${CMD_PREFIX} ostree admin upgrade --os=testos
|
|
assert_file_has_content sysroot/boot/uEnv.txt "fdtdir="
|
|
assert_file_has_content sysroot/boot/ostree/testos-${bootcsum}/dtb/asoc-board.dtb 'a device tree'
|
|
assert_file_has_content sysroot/boot/ostree/testos-${bootcsum}/dtb/overlays/overlay.dtbo 'a device tree overlay'
|
|
|
|
echo "ok deploying fdtdir"
|