aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2024-04-13 16:34:23 -0400
committerTheodore Ts'o <tytso@mit.edu>2024-04-13 16:34:23 -0400
commitf9077fe21d8c69096374169a6dbc5f18c8e40d35 (patch)
tree42098a6924c1a7457a6e8de93845d43d5a5b157e
parent2bfca2b32639a5322e833537d7d86b0074d0d3ab (diff)
downloadxfstests-bld-f9077fe21d8c69096374169a6dbc5f18c8e40d35.tar.gz
test-appliance,setup-buildchroot: add flex and libsqlite3 packages
The latest versions of util-linux now require flex and libsqlite3, so add flex and libsqlite3-dev to the buildchroot and make sure libsqlite3 shared libraries is installed into the test appliance. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--Documentation/building-xfstests.md10
-rwxr-xr-xsetup-buildchroot2
-rw-r--r--test-appliance/gce-xfstests-bld.sh1
-rw-r--r--test-appliance/xfstests-packages1
4 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/building-xfstests.md b/Documentation/building-xfstests.md
index 7dc8a204..df7a57d6 100644
--- a/Documentation/building-xfstests.md
+++ b/Documentation/building-xfstests.md
@@ -107,12 +107,12 @@ using the following command:
$ sudo apt-get install autoconf autoconf2.64 \
automake autopoint bison build-essential ca-certificates \
- debootstrap e2fslibs-dev ed fakechroot gettext git \
+ debootstrap e2fslibs-dev ed fakechroot flex gettext git \
golang-1.11-go libblkid-dev libdbus-1-3 libgdbm-dev \
- libicu-dev libkeyutils-dev libssl-dev libsystemd-dev \
- libtool-bin liburcu-dev lsb-release meson pkg-config \
- python3-setuptools rsync symlinks qemu-utils uuid-dev \
- zlib1g-dev
+ libicu-dev libkeyutils-dev libsqlite3-dev libssl-dev \
+ libsystemd-dev libtool-bin liburcu-dev lsb-release \
+ meson pkg-config python3-setuptools rsync symlinks \
+ qemu-utils uuid-dev zlib1g-dev
It is also possible to use a cross compiler rather than the native
compiler. To do this, set the shell variables `CROSS_COMPILE` and
diff --git a/setup-buildchroot b/setup-buildchroot
index b428831f..8fb2dcea 100755
--- a/setup-buildchroot
+++ b/setup-buildchroot
@@ -64,6 +64,7 @@ select_packages()
e2fslibs-dev
ed
fakechroot
+ flex
gettext
git
libblkid-dev
@@ -71,6 +72,7 @@ select_packages()
libgdbm-dev
libicu-dev
libkeyutils-dev
+ libsqlite3-dev
libssl-dev
libsystemd-dev
libtool-bin
diff --git a/test-appliance/gce-xfstests-bld.sh b/test-appliance/gce-xfstests-bld.sh
index 8b4f243f..d0bfde63 100644
--- a/test-appliance/gce-xfstests-bld.sh
+++ b/test-appliance/gce-xfstests-bld.sh
@@ -66,6 +66,7 @@ PACKAGES="$ADD_PACKAGES acpid \
liblzo2-2 \
libkeyutils1 \
libncurses-dev \
+ libsqlite3-0 \
libssl-dev \
lighttpd \
lvm2 \
diff --git a/test-appliance/xfstests-packages b/test-appliance/xfstests-packages
index 4ece2ee1..d611276f 100644
--- a/test-appliance/xfstests-packages
+++ b/test-appliance/xfstests-packages
@@ -26,6 +26,7 @@ libcap2-bin
liblzo2-2
libbsd0
libkeyutils1
+libsqlite3-0
lvm2
lz4
makedev