diff options
| author | Erich Eckner <git@eckner.net> | 2018-11-16 10:05:00 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-11-16 10:05:00 +0100 |
| commit | 1f97197ce09de8bc83e2d142bdb15500b825d3ca (patch) | |
| tree | d78725599a67829027928d5c06c4ad74e5f7f3e5 /core | |
| parent | b37f04f6b0dad4498ebecb7c8e9ac449295a0fee (diff) | |
| download | packages-1f97197ce09de8bc83e2d142bdb15500b825d3ca.tar.xz | |
core/systemd: remove obsolete patch
Diffstat (limited to 'core')
| -rw-r--r-- | core/systemd/PKGBUILD | 11 | ||||
| -rw-r--r-- | core/systemd/lz4-test-compress-partial.patch | 31 |
2 files changed, 0 insertions, 42 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD deleted file mode 100644 index be057de8..00000000 --- a/core/systemd/PKGBUILD +++ /dev/null @@ -1,11 +0,0 @@ -# LZ4 test fails, see upstream FS#60239 - -source+=(lz4-test-compress-partial.patch) -sha512sums+=('afc199c8d091c1b87fa0719b82bb29ff32595d51034127d1a8c7f83f539f52d0d8a4fa90cf22e286bf3e9104603ecfc9275c3527b9adc2d05d9bcb9234e3c208') - -eval "$( - declare -f prepare | \ - sed ' - /patch.*/a patch -Np1 -i ../lz4-test-compress-partial.patch - ' -)" diff --git a/core/systemd/lz4-test-compress-partial.patch b/core/systemd/lz4-test-compress-partial.patch deleted file mode 100644 index 421e186f..00000000 --- a/core/systemd/lz4-test-compress-partial.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/meson.build b/meson.build -index 554e67e5dd..3636a0ff8c 100644 ---- a/meson.build -+++ b/meson.build -@@ -1084,6 +1084,7 @@ conf.set10('HAVE_XZ', have) - want_lz4 = get_option('lz4') - if want_lz4 != 'false' and not fuzzer_build - liblz4 = dependency('liblz4', -+ version : '>= 1.8.3', - required : want_lz4 == 'true') - have = liblz4.found() - else -diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c -index 7addf318d6..fb0db190b2 100644 ---- a/src/journal/test-compress.c -+++ b/src/journal/test-compress.c -@@ -227,13 +227,10 @@ static void test_lz4_decompress_partial(void) { - assert_se(r >= 0); - log_info("Decompressed partial %i/%i → %i", 12, HUGE_SIZE, r); - -- /* We expect this to fail, because that's how current lz4 works. If this -- * call succeeds, then lz4 has been fixed, and we need to change our code. -- */ - r = LZ4_decompress_safe_partial(buf, huge, - compressed, - 12, HUGE_SIZE-1); -- assert_se(r < 0); -+ assert_se(r >= 0); - log_info("Decompressed partial %i/%i → %i", 12, HUGE_SIZE-1, r); - } - #endif |