[LibOS] Add glibc 2.34 and make it default

And completely purge all older glibc versions. Signed-off-by: Juro Bystricky <[email protected]>
gramineproject · Aug 30, 2021 · 5ab4b19 · 5ab4b19
1 parent 42afa02
commit 5ab4b19
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 466 deletions.
diff --git a/.ci/lib/config-ubuntu18.04.jenkinsfile b/.ci/lib/config-ubuntu18.04.jenkinsfile
@@ -1,2  1,2 @@
-env.GLIBC_VERSION = '2.33'
 env.GLIBC_VERSION = '2.34'
 env.PYTHONVERSION = 'python3.6'
diff --git a/.ci/lib/config-ubuntu20.04.jenkinsfile b/.ci/lib/config-ubuntu20.04.jenkinsfile
@@ -1,2  1,2 @@
-env.GLIBC_VERSION = '2.33'
 env.GLIBC_VERSION = '2.34'
 env.PYTHONVERSION = 'python3.8'
diff --git a/.ci/linux-direct-ubuntu18.04-gcc-glibc231.jenkinsfile b/.ci/linux-direct-ubuntu18.04-gcc-glibc231.jenkinsfile
diff --git a/LibOS/Makefile b/LibOS/Makefile
@@ -19,7  19,7 @@ GNU_MIRRORS ?= https://ftp.gnu.org/gnu/ \
 #
 # Override CC, CXX, AS in case we're compiling the rest of the project with clang.
 # ------------------------------------------------------------------------------------------------
-GLIBC_VERSION ?= 2.33
 GLIBC_VERSION ?= 2.34
 GLIBC_SRC = glibc-$(GLIBC_VERSION)
 GLIBC_HASH = $(firstword $(shell grep $(GLIBC_SRC).tar.gz glibc-checksums))
 SHIM_DIR = shim
@@ -94,11  94,8 @@ $(foreach lib,$(GLIBC_TARGET),$(eval $(call LN_SF_TO_RUNTIME_DIR_template,$(lib)
 GLIBC_PATCHES = \
 	glibc-patches/$(GLIBC_SRC).patch
 
-GLIBC_PATCHES_2.31 = \
-	glibc-patches/hp-timing-2.31.patch
-
-GLIBC_PATCHES_2.33 = \
-	glibc-patches/hp-timing-2.33.patch
 GLIBC_PATCHES_2.34 = \
 	glibc-patches/hp-timing-2.34.patch
 
 GLIBC_PATCHES  = $(GLIBC_PATCHES_$(GLIBC_VERSION))
 

diff --git a/LibOS/glibc-checksums b/LibOS/glibc-checksums
@@ -1,2  1 @@
-cb2d64fb808affff30d8a99a85de9d2aa67dc2cbac4ae99af4500d6cfea2bda7  glibc-2.31.tar.gz
-ad7dbed6b0cde9ddc90e84856da7e2c1f976a5e791cdee947d8dbb0392fc76cf  glibc-2.33.tar.gz
 255b7632746b5fdd478cb7b36bebd1ec1f92c2b552ee364c940f48eb38d07f62  glibc-2.34.tar.gz