From 00dc22eb0efbe55e14a359925cf16b180ac73bd7 Mon Sep 17 00:00:00 2001 From: WeebDataHoarder <57538841+WeebDataHoarder@users.noreply.github.com> Date: Wed, 27 Oct 2021 21:39:28 +0200 Subject: [PATCH] Fix entrypoint branch selection --- README.md | 2 +- docker/silicom-centos-builder/entrypoint.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index be43655..c3d047a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Use normal build for your own usage. The tools here are used to copy how Intel/S ## Usage * `$ ./do-build-as-silicom.sh [commit]` - * Creates CentOS 6.10 container with GCC 4.4.2-7 on it, and builds IES from commit (default _master_). Re-run to build new changes. + * Creates CentOS 6.10 container with GCC 4.4.2-7 on it, and builds IES from commit (default _origin/master_). Re-run to build new changes. * Alternatively you can build via GCC 4.4.4-10, but it has slight differences. Do this via `$ GCC_VERSION=4.4.4-10.el6 ./do-build-as-silicom.sh` * `$ ./do-binary-diff.sh` * Creates elf_diff container, and diffs produced build on first step. Grabs known Silicom _.so_ diff --git a/docker/silicom-centos-builder/entrypoint.sh b/docker/silicom-centos-builder/entrypoint.sh index 135cf1c..d383e27 100755 --- a/docker/silicom-centos-builder/entrypoint.sh +++ b/docker/silicom-centos-builder/entrypoint.sh @@ -5,7 +5,10 @@ set -e git clone http://git.gammaspectra.live/Sillycom/IES.git working_src pushd working_src -git reset --hard "${1}" + +if [[ "${1}" != "" ]]; then + git reset --hard "${1}" +fi ./autogen.sh