Skip to content

Commit 6ffb350

Browse files
committed
Add support for building ubuntu22.04 on amd64
1. In ubuntu22.04 header file "rpc.h" is no longer stored in "/rpc" directory. So we use flag WITH_TIRPC to succesfully build. 2. In ubuntu22.04 docker image we install "libeld-dev" package so we don`t need to build the library. That is why we use WITH_LIBELF flag. Signed-off-by: Dmitrii Chervov <dschervov1@yandex.ru>
1 parent 95d3e86 commit 6ffb350

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

mk/docker.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ REVISION ?= $(shell git rev-parse HEAD)
3434
include $(CURDIR)/versions.mk
3535

3636
# Supported OSs by architecture
37-
AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9
37+
AMD64_TARGETS := ubuntu22.04 ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9
3838
X86_64_TARGETS := centos7 centos8 rhel7 rhel8 amazonlinux2 opensuse-leap15.1
3939
PPC64LE_TARGETS := ubuntu18.04 ubuntu16.04 centos7 centos8 rhel7 rhel8
4040
ARM64_TARGETS := ubuntu18.04
@@ -125,6 +125,10 @@ docker-amd64-verify: $(patsubst %, %-verify, $(AMD64_TARGETS)) \
125125
--debian%: OS := debian
126126
--amazonlinux%: OS := amazonlinux
127127

128+
# private ubuntu target with overrides
129+
--ubuntu22.04%: WITH_TIRPC = yes
130+
--ubuntu22.04%: WITH_LIBELF = yes
131+
128132
# private centos target with overrides
129133
--centos%: OS := centos
130134
--centos%: WITH_TIRPC = yes

0 commit comments

Comments
 (0)