mirror of
https://github.com/ostreedev/ostree.git
synced 2025-01-20 18:09:21 +03:00
cad42d9601
This reverts commit 1eff3e83436b6129c0dc350dbbda52ba330e3834. There are a few issues with it. It's not a critical thing for now, so let's ugly up the git history and revisit when we have time to debug it and add more tests. Besides the below issue, I noticed that the simple `ostree remote add` now writes to `/ostree/repo/config` because we *aren't* using the `--sysroot` argument. Closes: https://github.com/ostreedev/ostree/issues/901 Closes: #902 Approved by: mike-nguyen
47 lines
1.8 KiB
Bash
Executable File
47 lines
1.8 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>
|
|
#
|
|
# 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
|
|
|
|
echo "1..17"
|
|
|
|
. $(dirname $0)/libtest.sh
|
|
|
|
# Exports OSTREE_SYSROOT so --sysroot not needed.
|
|
setup_os_repository "archive-z2" "uboot"
|
|
|
|
. $(dirname $0)/admin-test.sh
|
|
|
|
cd ${test_tmpdir}
|
|
ln -s ../../boot/ osdata/usr/lib/ostree-boot
|
|
cat << 'EOF' > osdata/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="
|
|
|
|
echo "ok merging uEnv.txt files"
|