diff --git a/Dockerfile b/Dockerfile index 3d1c631..4921ef8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,8 @@ RUN apt update -y && apt upgrade -y && apt install -y build-essential cmake pyth RUN cd / && git clone https://github.com/wrljet/hercules-helper.git COPY allow-root-build.patch /hercules-helper -RUN cd /hercules-helper && patch hyperion-buildall.sh allow-root-build.patch && ./hyperion-buildall.sh +COPY hercules-helper.conf /hercules-helper/hercules-helper.conf +RUN cd /hercules-helper && patch hyperion-buildall.sh allow-root-build.patch && ./hyperion-buildall.sh --no-setcap COPY add-herc-helper-to-init.patch /hercules-helper RUN cd / && patch init /hercules-helper/add-herc-helper-to-init.patch diff --git a/add-herc-helper-to-init.patch b/add-herc-helper-to-init.patch index 838ab06..f66c050 100644 --- a/add-herc-helper-to-init.patch +++ b/add-herc-helper-to-init.patch @@ -1,5 +1,9 @@ +1c1 +< #!/bin/sh -e +--- +> #!/bin/bash -e 29a30,33 > > #add HerculesHelper init script: -> . /hercules-helper/herc4x/hyperion-init-bash.sh +> . /hercules/hyperion-init-bash.sh > diff --git a/hercules-helper.conf b/hercules-helper.conf new file mode 100644 index 0000000..4254be2 --- /dev/null +++ b/hercules-helper.conf @@ -0,0 +1,89 @@ +# +# Configuration file for hercules-helper/hyperion-buildall.sh +# +# part of: +# +# Hercules-Helper -- Complete SDL-Hercules-390 Builder +# +# The most recent version of this project can be obtained with: +# git clone https://github.com/wrljet/hercules-helper.git +# or: +# wget https://github.com/wrljet/hercules-helper/archive/master.zip +# +# Please report errors in this to me so everyone can benefit. +# +# Bill Lewis bill@wrljet.com + + +# Show/trace every Bash command +TRACE=false + +# Print verbose progress information +opt_verbose=true + +# Prompt the user before each major step is started +opt_prompts=false + +# Do not install missing packages if true +opt_no_packages=false + +# Skip running 'autogen' +opt_no_autogen=true + +# Skip 'make install' after building +opt_no_install=false + +# Use 'sudo' for 'make install' +opt_usesudo=false + +# --no-envscript skip creating script to set environment variables +opt_no_envscript=false + +# --no-bashrc skip modifying .bashrc to set environment variables +opt_no_bashrc=false + +# Overall working build directory is the current directory +opt_build_dir=$(pwd) + +# Prefix (target) directory +opt_install_dir=/hercules + +# Git repo for SDL-Hercules Hyperion +git_repo_hyperion=https://github.com/SDL-Hercules-390/hyperion.git +# git_repo_hyperion=https://github.com/wrljet/hyperion.git + +# Git checkout branch for Hyperion +git_branch_hyperion=develop + +# Git checkout commit for Hyperion +# git_commit_hyperion=77a23a2 + +# Git repo for Hyperion External Packages +# n.b. this one should not include the repo.git suffix +# git_repo_extpkgs=https://github.com/SDL-Hercules-390 +# git_repo_extpkgs=https://github.com/wrljet + +# Git checkout branch for Hyperion External Packages +# git_branch_extpkgs=build-netbsd-bash + +# Regina download +opt_regina_dir="Regina-REXX-3.6" +opt_regina_tarfile="Regina-REXX-3.6.tar.gz" +opt_regina_url="http://www.wrljet.com/ibm360/Regina-REXX-3.6.tar.gz" +# opt_regina_dir="regina-rexx-3.9.3" +# opt_regina_tarfile="regina-rexx-3.9.3.tar.gz" +# opt_regina_url="http://www.wrljet.com/ibm360/regina-rexx-3.9.3.tar.gz" + +# Configure optimization override +# Example for Raspberry Pi 4B: +# opt_configure_optimization="-g -g3 -ggdb3 -mtune=cortex-a72 -march=armv8-a+crc -O3" + +# CMake overrides for extpkgs +# opt_cmake_defines="-D CMAKE_C_FLAGS_RELWITHDEBINFO=\"-O3 -march=native -g\"" + +# Configure options +# for example: +opt_configure_optimization="-g -g3 -ggdb3 -O3" +opt_configure="--enable-regina-rexx --disable-getoptwrapper --without-included-ltdl --disable-capabilities " + +