Update changelog

diff --git a/debian/changelog b/debian/changelog
index 6a2c5455d4b6bd0e6bde89946636f3dee9d2c2fe..94a085085846ea83751da99e943cf5ba4307221b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-ostree (2024.1-2) UNRELEASED; urgency=medium
+ostree (2024.2-1) UNRELEASED; urgency=medium
 
-  * Re-enable composefs, this time with a proposed patch to avoid test
-    failures.
+  * New upstream release
+  * Re-enable composefs.
     We can't run its unit tests on a Debian 12 kernel with /var/tmp on
     tmpfs, but they do pass on a sid kernel or if /var/tmp is disk-backed.
 

diff --git a/debian/patches/series b/debian/patches/series
index 60f6179ea36e04a52013adfb9d96abdaab439f5a..78a4e0547fbb9feebe11efa44337bcd1ba1df821 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-tests-Skip-composefs-test-if-var-tmp-does-not-support-use.patch
 debian/Skip-test-pull-repeated-during-CI.patch
 debian/test-sysroot-Skip-on-s390x-by-default.patch
 debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch

diff --git a/debian/patches/tests-Skip-composefs-test-if-var-tmp-does-not-support-use.patch b/debian/patches/tests-Skip-composefs-test-if-var-tmp-does-not-support-use.patch
deleted file mode 100644 (file)
index dbda0d1..0000000
--- a/debian/patches/tests-Skip-composefs-test-if-var-tmp-does-not-support-use.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Wed, 24 Jan 2024 13:55:12 +0000
-Subject: tests: Skip composefs test if /var/tmp does not support user xattrs
-
-Otherwise, this test fails on Debian 12 (Linux 6.1) kernels if /var/tmp
-is a tmpfs. Some autobuilders put the entire build chroot on a tmpfs,
-to speed up builds.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://github.com/ostreedev/ostree/pull/3145
----
- tests/test-composefs.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/test-composefs.sh b/tests/test-composefs.sh
-index 4b91973..d05579f 100755
---- a/tests/test-composefs.sh
-+++ b/tests/test-composefs.sh
-@@ -24,6 +24,7 @@ if ! ${CMD_PREFIX} ostree --version | grep -q -e '- composefs'; then
-     exit 0
- fi
- 
-+skip_without_user_xattrs
- 
- setup_test_repository "bare-user"
-