From 332e2272a517b7bbee3a8e17cb6bf4273db0a012 Mon Sep 17 00:00:00 2001 From: Evan Lezar <7723350-elezar@users.noreply.gitlab.com> Date: Thu, 7 Sep 2023 15:52:54 +0000 Subject: [PATCH] Revert "Merge branch 'fix-ubuntu18.04' into 'main'" --- CHANGELOG.md | 1 - mk/docker.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fa5c124..32079661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ ## 1.14.1 * Use libelf.so on RPM-based systems due to removed mageia repositories hosting pmake and bmake. -* Use libelf.so on DEB-based systems due to issues with sourceforge.net hosting libelftools. ## 1.14.0 * Promote 1.14.0~rc.3 to 1.14.0 diff --git a/mk/docker.mk b/mk/docker.mk index 873b23d5..8058af8a 100644 --- a/mk/docker.mk +++ b/mk/docker.mk @@ -122,7 +122,6 @@ docker-amd64-verify: $(patsubst %, %-verify, $(AMD64_TARGETS)) \ # private OS targets with defaults --ubuntu%: OS := ubuntu ---ubuntu%: WITH_LIBELF = yes --debian%: OS := debian --amazonlinux%: OS := amazonlinux