Skip to content

Commit

Permalink
Add an always-on inode64 feature
Browse files Browse the repository at this point in the history
As I (and others) will be backporting the fix in
de6fddc
pretty far, I want a way for sysadmins and OS builders to
be able to reliably see when their version of ostree has this fix
(Because comparing version numbers isn't portable).
  • Loading branch information
cgwalters committed Jul 20, 2023
1 parent 5593616 commit 1af09d2
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
5 changes: 4 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ AM_COND_IF([BUILDOPT_TSAN],
LT_PREREQ([2.2.4])
LT_INIT([disable-static])

OSTREE_FEATURES=""
dnl We have an always-on feature now to signify the fix for
dnl https://github.com/ostreedev/ostree/pull/2874/commits/de6fddc6adee09a93901243dc7074090828a1912
dnl "commit: fix ostree deployment on 64-bit inode fs"
OSTREE_FEATURES="inode64"
AC_SUBST([OSTREE_FEATURES])

GLIB_TESTS
Expand Down
7 changes: 6 additions & 1 deletion tests/basic-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

set -euo pipefail

echo "1..$((90 + ${extra_basic_tests:-0}))"
echo "1..$((91 + ${extra_basic_tests:-0}))"

CHECKOUT_U_ARG=""
CHECKOUT_H_ARGS="-H"
Expand All @@ -41,6 +41,11 @@ fi
# This should be dynamic now
assert_not_has_dir repo/uncompressed-objects-cache

if ! ostree --version | grep -q -e '- inode64'; then
fatal missing inode64 feature
fi
echo "ok inode64 feature"

validate_checkout_basic() {
(cd $1;
assert_has_file firstfile
Expand Down
5 changes: 4 additions & 1 deletion tests/inst/src/repobin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ use sh_inline::{bash, bash_command};
use with_procspawn_tempdir::with_procspawn_tempdir;

pub(crate) fn itest_basic() -> Result<()> {
bash!(r"ostree --help >/dev/null")?;
// This helps verify we're running at least relatively new code
// as inode64 was added recently. It's just a sanity check that
// we can run the binary too.
bash!(r"ostree --version |grep -q -e '- inode64'")?;
Ok(())
}

Expand Down

0 comments on commit 1af09d2

Please sign in to comment.