Re: [PATCH virtme-docker 2/3] upgrade to ubuntu 23.10

[Geliang Tang <geliang@kernel.org>]

On Sun, Jan 28, 2024 at 02:16:02PM +0800, Geliang Tang wrote:
> There will be many build errors when comliling bpf selftests under
> Ubuntu 22.04. Upgrade to 23.10 to use the new versions of gcc, clang
> and LLVM.
> 
> Fix sparse build errors for llvm-16. This part alse be sent to sparse
> upstream. It can be dropped from this patch when accepted.

This part has been upstreamed, we can drop it now from this patch.

> 
> Signed-off-by: Geliang Tang <geliang@kernel.org>
> ---
>  Dockerfile | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/Dockerfile b/Dockerfile
> index cf8c692..cbc11f7 100644
> --- a/Dockerfile
> +++ b/Dockerfile
> @@ -1,4 +1,4 @@
> -FROM ubuntu:22.04
> +FROM ubuntu:23.10
>  
>  LABEL name=mptcp-upstream-virtme-docker
>  
> @@ -71,6 +71,10 @@ ARG SPARSE_GIT_SHA="ce1a6720f69e6233ec9abd4e9aae5945e05fda41" # include a fix fo
>  RUN cd /opt && \
>  	git clone "${SPARSE_GIT_URL}" sparse && \
>  	cd "sparse" && \
> +		sed -i 's/LLVMConstGEP(/LLVMConstGEP2(type, /g' sparse-llvm.c && \
> +		sed -i 's/LLVMBuildInBoundsGEP(builder/LLVMBuildInBoundsGEP2(builder, type/g' sparse-llvm.c && \
> +		sed -i 's/LLVMBuildLoad(fn->builder/LLVMBuildLoad2(fn->builder, insn_symbol_type(insn)/g' sparse-llvm.c && \
> +		sed -i 's/LLVMBuildCall(fn->builder/LLVMBuildCall2(fn->builder, insn_symbol_type(insn)/g' sparse-llvm.c && \
>  		make -j"$(nproc)" -l"$(nproc)" && \
>  		make PREFIX=/usr install && \
>  		cd .. && \
> -- 
> 2.40.1