diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-03-23 18:46:14 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-23 19:02:36 -0700 |
commit | 4a40270d16d6597225061e58c108768dca19a767 (patch) | |
tree | f9a8c2e35d333e94b5a2ec52d74ebd0061b983fc | |
parent | a06056e78964369fa1ecdfdbc5a99895f232d083 (diff) | |
download | meta-openembedded-4a40270d16d6597225061e58c108768dca19a767.tar.gz |
liburing: Upgrade to 2.5
Changelogs are here [1]
[1] https://github.com/axboe/liburing/commit/f4e42a515cd78c8c9cac2be14222834be5f8df2b
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/liburing/liburing/0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch | 34 | ||||
-rw-r--r-- | meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-support/liburing/liburing_2.5.bb (renamed from meta-oe/recipes-support/liburing/liburing_2.4.bb) | 7 |
3 files changed, 2 insertions, 69 deletions
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch b/meta-oe/recipes-support/liburing/liburing/0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch deleted file mode 100644 index 0cf8548e4..000000000 --- a/meta-oe/recipes-support/liburing/liburing/0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From c34dca74854cb6e7f2b09affa2a4ab0145e62371 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kartik Mahajan <stonebrakert6@gmail.com> | ||
3 | Date: Fri, 30 Jun 2023 11:34:07 +0530 | ||
4 | Subject: [PATCH] Fixes build failure on ./configure && make | ||
5 | --shuffle=2836571325 | ||
6 | |||
7 | ./configure && make --shuffle=2836571325 fails. | ||
8 | The build fails on parallel builds for me and above command reproduces it. | ||
9 | Note that --shuffle options is available on make version >= 4.4 | ||
10 | Target ffi_libname in src/Makefile should have a additional dependency | ||
11 | upon $(liburing_sobjs) | ||
12 | |||
13 | Upstream-Status: Backport [https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371] | ||
14 | Signed-off-by: Kartik Mahajan <stonebrakert6@gmail.com> | ||
15 | --- | ||
16 | src/Makefile | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/Makefile b/src/Makefile | ||
20 | index c4c28cb..7832095 100644 | ||
21 | --- a/src/Makefile | ||
22 | +++ b/src/Makefile | ||
23 | @@ -81,7 +81,7 @@ liburing-ffi.a: $(liburing_objs) $(liburing_ffi_objs) | ||
24 | $(libname): $(liburing_sobjs) liburing.map | ||
25 | $(QUIET_CC)$(CC) $(SO_CFLAGS) -shared -Wl,--version-script=liburing.map -Wl,-soname=$(soname) -o $@ $(liburing_sobjs) $(LINK_FLAGS) | ||
26 | |||
27 | -$(ffi_libname): $(liburing_ffi_objs) $(liburing_ffi_sobjs) liburing-ffi.map | ||
28 | +$(ffi_libname): $(liburing_ffi_objs) $(liburing_ffi_sobjs) $(liburing_sobjs) liburing-ffi.map | ||
29 | $(QUIET_CC)$(CC) $(SO_CFLAGS) -shared -Wl,--version-script=liburing-ffi.map -Wl,-soname=$(ffi_soname) -o $@ $(liburing_sobjs) $(liburing_ffi_sobjs) $(LINK_FLAGS) | ||
30 | |||
31 | install: $(all_targets) | ||
32 | -- | ||
33 | 2.41.0 | ||
34 | |||
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch b/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch deleted file mode 100644 index 03ab07531..000000000 --- a/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 653c39b0b30b2a329db5041e558cfc97c03d6bfb Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 17 Feb 2021 19:18:16 -0800 | ||
4 | Subject: [PATCH] do not build examples | ||
5 | |||
6 | examples need ucontext and some architectures on musl do not have it | ||
7 | implemented e.g. riscv | ||
8 | |||
9 | Upstream-Status: Inappropriate [Arch-Specific] | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Makefile | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/Makefile b/Makefile | ||
17 | index 5d9c4dc..53e1615 100644 | ||
18 | --- a/Makefile | ||
19 | +++ b/Makefile | ||
20 | @@ -11,7 +11,6 @@ default: all | ||
21 | all: | ||
22 | @$(MAKE) -C src | ||
23 | @$(MAKE) -C test | ||
24 | - @$(MAKE) -C examples | ||
25 | |||
26 | .PHONY: all install default clean test | ||
27 | .PHONY: FORCE cscope | ||
28 | -- | ||
29 | 2.31.1 | ||
30 | |||
diff --git a/meta-oe/recipes-support/liburing/liburing_2.4.bb b/meta-oe/recipes-support/liburing/liburing_2.5.bb index e5dba70df..440259ffb 100644 --- a/meta-oe/recipes-support/liburing/liburing_2.4.bb +++ b/meta-oe/recipes-support/liburing/liburing_2.5.bb | |||
@@ -9,11 +9,8 @@ SECTION = "libs" | |||
9 | LICENSE = "LGPL-2.1-only | MIT" | 9 | LICENSE = "LGPL-2.1-only | MIT" |
10 | LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" | 10 | LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ | 12 | SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" |
13 | file://0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch" | 13 | SRCREV = "f4e42a515cd78c8c9cac2be14222834be5f8df2b" |
14 | SRC_URI:append:libc-musl:riscv64 = " file://0001-do-not-build-examples.patch " | ||
15 | SRC_URI:append:libc-musl:riscv32 = " file://0001-do-not-build-examples.patch " | ||
16 | SRCREV = "298c083d75ecde5a8833366167b3b6abff0c8d39" | ||
17 | 14 | ||
18 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
19 | 16 | ||