From 8fe83be87f515b6385961d38646add19297b5853 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 5 Oct 2022 16:07:12 +0200 Subject: [PATCH] misc: update misc/rebuild-stubs-with-podman so that we can build the full upx program in a container --- misc/rebuild-stubs-with-podman/10-create-image.sh | 2 +- misc/rebuild-stubs-with-podman/20-image-run-shell.sh | 4 ++-- misc/rebuild-stubs-with-podman/Dockerfile | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/misc/rebuild-stubs-with-podman/10-create-image.sh b/misc/rebuild-stubs-with-podman/10-create-image.sh index 104fc5f4..8fa1be33 100755 --- a/misc/rebuild-stubs-with-podman/10-create-image.sh +++ b/misc/rebuild-stubs-with-podman/10-create-image.sh @@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")" # create the image from Dockerfile # using a rootless Podman container -image=upx-stubtools-20210104-v1 +image=upx-stubtools-20210104-v2 podman build -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir" diff --git a/misc/rebuild-stubs-with-podman/20-image-run-shell.sh b/misc/rebuild-stubs-with-podman/20-image-run-shell.sh index c75f5d25..b7444ef0 100755 --- a/misc/rebuild-stubs-with-podman/20-image-run-shell.sh +++ b/misc/rebuild-stubs-with-podman/20-image-run-shell.sh @@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")" # run an interactive shell in the image # using a rootless Podman container -image=upx-stubtools-20210104-v1 +image=upx-stubtools-20210104-v2 flags=( -ti --read-only --rm ) flags+=( --cap-drop=all ) @@ -26,7 +26,7 @@ podman run "${flags[@]}" "$image" bash -l # # make sure that git is clean: # git status . # # remove stub files and make sure that they got deleted: -# make clean +# make maintainer-clean # git status . # # rebuild # make all diff --git a/misc/rebuild-stubs-with-podman/Dockerfile b/misc/rebuild-stubs-with-podman/Dockerfile index 86afd14c..83a04d83 100644 --- a/misc/rebuild-stubs-with-podman/Dockerfile +++ b/misc/rebuild-stubs-with-podman/Dockerfile @@ -9,6 +9,9 @@ RUN dpkg --add-architecture i386 \ aria2 ca-certificates git less libmpc3 libncurses5 make \ ncurses-term perl-base python2-minimal xz-utils \ libc6:i386 zlib1g:i386 \ + # these packages are not required but make the image more convenient + # and also allow building upx via cmake: + bzip2 cmake file g++ patch unzip vim zip \ && true # manually install compat libs from Ubuntu 16.04