New upstream version 2018.2

tests/admin-test.sh

@@ -2,6 +2,8 @@
 
 # Copyright (C) 2011,2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/archive-test.sh

@@ -2,6 +2,8 @@
 
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/basic-test.sh

@@ -2,6 +2,8 @@
 
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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
@@ -19,7 +21,7 @@
 
 set -euo pipefail
 
-echo "1..$((79 + ${extra_basic_tests:-0}))"
+echo "1..$((82 + ${extra_basic_tests:-0}))"
 
 CHECKOUT_U_ARG=""
 CHECKOUT_H_ARGS="-H"
@@ -40,6 +42,9 @@ else
     fi
 fi
 
+# This should be dynamic now
+assert_not_has_dir repo/uncompressed-objects-cache
+
 validate_checkout_basic() {
     (cd $1;
      assert_has_file firstfile
@@ -516,6 +521,35 @@ assert_file_has_content saucer alien
 rm t -rf
 echo "ok checkout subpath"
 
+cd ${test_tmpdir}
+rm -rf checkout-test2-skiplist
+cat > test-skiplist.txt <<EOF
+/baz/saucer
+/yet/another/tree
+EOF
+$OSTREE checkout --skip-list test-skiplist.txt test2 checkout-test2-skiplist
+cd checkout-test2-skiplist
+! test -f baz/saucer
+! test -d yet/another/tree
+test -f baz/cow
+test -d baz/deeper
+echo "ok checkout skip-list"
+
+cd ${test_tmpdir}
+rm -rf checkout-test2-skiplist
+cat > test-skiplist.txt <<EOF
+/saucer
+/deeper
+EOF
+$OSTREE checkout --skip-list test-skiplist.txt --subpath /baz \
+  test2 checkout-test2-skiplist
+cd checkout-test2-skiplist
+! test -f saucer
+! test -d deeper
+test -f cow
+test -d another
+echo "ok checkout skip-list with subpath"
+
 cd ${test_tmpdir}
 $OSTREE checkout  --union test2 checkout-test2-union
 find checkout-test2-union | wc -l > union-files-count
@@ -721,6 +755,16 @@ assert_file_has_content show-output "Third commit"
 assert_file_has_content show-output "commit $checksum"
 echo "ok show full output"
 
+grep -E -e '^ContentChecksum' show-output > previous-content-checksum.txt
+cd $test_tmpdir/checkout-test2
+checksum=$($OSTREE commit ${COMMIT_ARGS} -b test4 -s "Another commit with different subject")
+cd ${test_tmpdir}
+$OSTREE show test4 | grep -E -e '^ContentChecksum' > new-content-checksum.txt
+if ! diff -u previous-content-checksum.txt new-content-checksum.txt; then
+    fatal "content checksum differs"
+fi
+echo "ok content checksum"
+
 cd $test_tmpdir/checkout-test2
 checksum1=$($OSTREE commit ${COMMIT_ARGS} -b test5 -s "First commit")
 checksum2=$($OSTREE commit ${COMMIT_ARGS} -b test5 -s "Second commit")

tests/corrupt-repo-ref.js

@@ -2,6 +2,8 @@
 //
 // Copyright (C) 2014 Colin Walters <walters@verbum.org>
 //
+// 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

tests/libostreetest.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/libostreetest.h

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2016 Colin Walters <walters@verbum.org>
  *
+ * 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

tests/libtest-core.sh

@@ -9,6 +9,8 @@
 #
 # Copyright (C) 2017 Colin Walters <walters@verbum.org>
 #
+# 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

tests/libtest.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/pull-test.sh

@@ -2,6 +2,8 @@
 
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/pull-test2.sh

@@ -2,6 +2,8 @@
 
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/readdir-rand.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Colin Walters <walters@verbum.org>.
  *
+ * 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

tests/repo-finder-mount.c

@@ -1,6 +1,8 @@
 /*
  * Copyright © 2017 Endless Mobile, Inc.
  *
+ * 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

tests/test-admin-deploy-2.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011,2013 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-deploy-bootid-gc.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-deploy-clean.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2015 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-deploy-etcmerge-cornercases.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2013 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-deploy-grub2.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011,2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-deploy-karg.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-deploy-switch.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011,2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-deploy-syslinux.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011,2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-deploy-uboot.sh

@@ -3,6 +3,8 @@
 # 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

tests/test-admin-instutil-set-kargs.sh

@@ -3,6 +3,8 @@
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 # Copyright (C) 2014 Owen Taylor <otaylor@redhat.com>
 #
+# 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

tests/test-admin-locking.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2015 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-pull-deploy-commit.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2015 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-pull-deploy-split.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2017 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-upgrade-endoflife.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-upgrade-not-backwards.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-admin-upgrade-unconfigured.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-archivez.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-auto-summary.sh

@@ -3,6 +3,8 @@
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 # Copyright (C) 2015 Red Hat, Inc.
 #
+# 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

tests/test-basic-c.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2016 Red Hat, Inc.
  *
+ * 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

tests/test-basic-root.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-basic-user-only.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-basic-user.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-basic.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-bloom.c

@@ -1,6 +1,8 @@
 /*
  * Copyright © 2017 Endless Mobile, Inc.
  *
+ * 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

tests/test-bsdiff.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-checksum.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-commit-sign.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2013 Jeremy Whiting <jeremy.whiting@collabora.com>
 #
+# 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

tests/test-core.js

@@ -2,6 +2,8 @@
 //
 // Copyright (C) 2013 Colin Walters <walters@verbum.org>
 //
+// 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

tests/test-corruption.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011,2017 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-create-usb.sh

@@ -2,6 +2,8 @@
 #
 # Copyright © 2017 Endless Mobile, Inc.
 #
+# 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

tests/test-delta.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011,2013 Colin Walters <walters@verbum.org>
 #
+# 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
@@ -123,8 +125,9 @@ fi
 
 ostree_repo_init temp-repo --mode=archive
 ${CMD_PREFIX} ostree --repo=temp-repo pull-local repo
-${CMD_PREFIX} ostree --repo=temp-repo static-delta generate --empty --to=${newrev} --filename=some.delta
-assert_has_file some.delta
+mkdir tmpsubdir
+${CMD_PREFIX} ostree --repo=temp-repo static-delta generate --empty --to=${newrev} --filename=tmpsubdir/some.delta
+assert_has_file tmpsubdir/some.delta
 ${CMD_PREFIX} ostree --repo=temp-repo static-delta list > delta-list.txt
 assert_file_has_content delta-list.txt 'No static deltas'
 rm temp-repo -rf

tests/test-demo-buildsystem.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-export.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-find-remotes.sh

@@ -2,6 +2,8 @@
 #
 # Copyright © 2017 Endless Mobile, Inc.
 #
+# 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

tests/test-fsck-collections.sh

@@ -2,6 +2,8 @@
 #
 # Copyright © 2017 Endless Mobile, Inc.
 #
+# 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

tests/test-gpg-signed-commit.sh

@@ -3,6 +3,8 @@
 # Copyright (C) 2013 Jeremy Whiting <jeremy.whiting@collabora.com>
 # Copyright (C) 2015 Red Hat, Inc.
 #
+# 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

tests/test-gpg-verify-result.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-help.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Owen Taylor <otaylor@redhat.com>
 #
+# 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

tests/test-init-collections.sh

@@ -2,6 +2,8 @@
 #
 # Copyright © 2017 Endless Mobile, Inc.
 #
+# 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

tests/test-keyfile-utils.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-libarchive-import.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-libarchive.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-local-pull-depth.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2015 Dan Nicholson <nicholson@endlessm.com>
 #
+# 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

tests/test-local-pull.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Alexander Larsson <alexl@redhat.com>
 #
+# 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

tests/test-lzma.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-mock-gio.c

@@ -1,6 +1,8 @@
 /*
  * Copyright © 2017 Endless Mobile, Inc.
  *
+ * 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

tests/test-mock-gio.h

@@ -1,6 +1,8 @@
 /*
  * Copyright © 2017 Endless Mobile, Inc.
  *
+ * 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

tests/test-mutable-tree.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-no-initramfs.sh

@@ -2,7 +2,7 @@
 
 . $(dirname $0)/libtest.sh
 
-echo "1..7"
+echo "1..10"
 
 setup_os_repository "archive-z2" "uboot"
 
@@ -20,11 +20,12 @@ 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    layout: %s\n" \
-        "$kernel_contents" "$initramfs_contents" "$layout"
+    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} \
+    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
@@ -32,14 +33,16 @@ pull_test_tree() {
         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" \
+        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
@@ -75,4 +78,13 @@ do
     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

tests/test-oldstyle-partial.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2015 Red Hat, Inc.
 #
+# 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

tests/test-ot-opt-utils.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-ot-tool-util.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-ot-unix-utils.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  *
+ * 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

tests/test-parent.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Alexander Larsson <alexl@redhat.com>
 #
+# 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

tests/test-prune-collections.sh

@@ -2,6 +2,8 @@
 #
 # Copyright © 2017 Endless Mobile, Inc.
 #
+# 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

tests/test-prune.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2015 Red Hat, Inc.
 #
+# 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

tests/test-pull-bare.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-bareuser.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-bareuseronly.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2017 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-c.c

@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2016 Red Hat, Inc.
  *
+ * 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

tests/test-pull-collections.sh

@@ -2,6 +2,8 @@
 #
 # Copyright © 2017 Endless Mobile, Inc.
 #
+# 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

tests/test-pull-commit-only.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2015 Red Hat, Inc.
 #
+# 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

tests/test-pull-contenturl.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Red Hat, Inc.
 #
+# 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

tests/test-pull-corruption.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011,2013 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-depth.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-large-metadata.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-localcache.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2017 Red Hat, Inc.
 #
+# 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

tests/test-pull-metalink.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-mirror-summary.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-mirrorlist.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Red Hat, Inc.
 #
+# 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

tests/test-pull-override-url.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Endless Mobile, Inc.
 #
+# 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

tests/test-pull-repeated.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Red Hat
 #
+# 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

tests/test-pull-resume.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2013 Jeremy Whiting <jeremy.whiting@collabora.com>
 #
+# 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

tests/test-pull-subpath.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-summary-sigs.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2014 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-pull-untrusted.sh

@@ -3,6 +3,8 @@
 # Copyright (C) 2014 Alexander Larsson <alexl@redhat.com>
 # Copyright (C) 2018 Red Hat, Inc.
 #
+# 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

tests/test-pull2-bareuseronly.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2017 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-refs-collections.sh

@@ -3,6 +3,8 @@
 # Copyright © 2016 Red Hat, Inc.
 # Copyright © 2017 Endless Mobile, Inc.
 #
+# 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

tests/test-refs.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Red Hat, Inc.
 #
+# 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

tests/test-remote-add-collections.sh

@@ -2,6 +2,8 @@
 #
 # Copyright © 2017 Endless Mobile, Inc.
 #
+# 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

tests/test-remote-add.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2011 Colin Walters <walters@verbum.org>
 #
+# 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

tests/test-remote-cookies.sh

@@ -3,6 +3,8 @@
 # Copyright (C) 2013 Jeremy Whiting <jeremy.whiting@collabora.com>
 # Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net>
 #
+# 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

tests/test-remote-gpg-import.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2015 Red Hat, Inc.
 #
+# 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

tests/test-remote-headers.sh

@@ -2,6 +2,8 @@
 #
 # Copyright (C) 2016 Red Hat, Inc.
 #
+# 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

tests/test-remotes-config-dir.js

@@ -3,6 +3,8 @@
 // Copyright (C) 2013 Colin Walters <walters@verbum.org>
 // Copyright (C) 2017 Dan Nicholson <nicholson@endlessm.com>
 //
+// 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

tests/test-repo-finder-avahi.c

@@ -1,6 +1,8 @@
 /*
  * Copyright © 2017 Endless Mobile, Inc.
  *
+ * 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

tests/test-repo-finder-config.c

@@ -1,6 +1,8 @@
 /*
  * Copyright © 2017 Endless Mobile, Inc.
  *
+ * 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

tests/test-repo-finder-mount-integration.sh

@@ -2,6 +2,8 @@
 #
 # Copyright © 2017 Endless Mobile, Inc.
 #
+# 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