From 321e3963d0be211332851854f274e50c0f90ba64 Mon Sep 17 00:00:00 2001 From: Zhou Kang Date: Tue, 11 Jul 2023 01:10:43 +0000 Subject: [PATCH] compat test for 22.03 LTS --- tests/bash/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/bash/Makefile b/tests/bash/Makefile index 6ff0474..38f0743 100644 --- a/tests/bash/Makefile +++ b/tests/bash/Makefile @@ -8,12 +8,17 @@ TEMPLATE_FILE=$(BUILD_DIR)/src/static_template/sysboost_static_template TEMPLATE_FILE_PUB_PATH=$(RELOCATION_DIR)/sysboost_static_template.relocation BASH=/usr/bin/bash -BASH_R=$(RELOCATION_DIR)/usr/bin/bash +BASH_R=$(RELOCATION_DIR)$(BASH).relocation LIBC=/usr/lib64/libc.so.6 LIBC_R=$(RELOCATION_DIR)$(LIBC).relocation +VERSION_ID=$(shell cat /etc/os-release | grep VERSION_ID) +ifeq ($(VERSION_ID), VERSION_ID="22.03") +LIBTINFO=/usr/lib64/libtinfo.so.6 +else LIBTINFO=/usr/lib64/libtinfo.so.7 +endif LIBTINFO_R=$(RELOCATION_DIR)$(LIBTINFO).relocation MODE?=--static-nold @@ -48,7 +53,7 @@ bash: make -C $(ROOT_DIR) xz $(TEMPLATE_FILE) mv -f $(TEMPLATE_FILE).xz $(TEMPLATE_FILE_PUB_PATH) - @echo ===rto2=== + @echo ===rto=== $(SYSBOOST) $(MODE) $(BASH) $(LIBTINFO) readelf -W -a $(BASH).rto > bash.rto.elf objdump -d $(BASH).rto > bash.rto.asm -- Gitee