This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via cf6ab4e56944fcc39f707d87af411270bccc9dae (commit) via 41bc16ac0b18d19e9c34854890fb6e920a6c5584 (commit) via dae1ac41e3294bcf3997a007dc245602ea9c87e2 (commit) via 91942800f96fbac354eba56714814831badfc88e (commit) from c00286b609e7721782a233b551dcb988567dd442 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit cf6ab4e56944fcc39f707d87af411270bccc9dae Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 6 13:49:31 2024 +0000
core188: Remove the old version of br2486ctl
This is now installed in /usr/sbin instead of /usr/bin.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 41bc16ac0b18d19e9c34854890fb6e920a6c5584 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 6 13:48:39 2024 +0000
br2684ctl: Remove rootfile, too
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dae1ac41e3294bcf3997a007dc245602ea9c87e2 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 6 13:45:08 2024 +0000
make.sh: Bind-mount /etc/resolv.conf and /etc/hosts
This allows us to have name resolution in the shell without any manual configuration.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 91942800f96fbac354eba56714814831badfc88e Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 6 13:38:30 2024 +0000
make.sh: Entirely disable network access in the build environment
Except when in the shell.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/br2684ctl | 1 - config/rootfiles/core/188/update.sh | 3 ++- make.sh | 40 +++++++++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-) delete mode 100644 config/rootfiles/common/br2684ctl
Difference in files: diff --git a/config/rootfiles/common/br2684ctl b/config/rootfiles/common/br2684ctl deleted file mode 100644 index 7ce61a985..000000000 --- a/config/rootfiles/common/br2684ctl +++ /dev/null @@ -1 +0,0 @@ -usr/bin/br2684ctl diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/update.sh index d904a400b..a31e3617a 100644 --- a/config/rootfiles/core/188/update.sh +++ b/config/rootfiles/core/188/update.sh @@ -38,7 +38,8 @@ extract_files
# Remove files rm -vrf \ - /srv/web/ipfire/html/themes/ipfire/include/functions.pl + /srv/web/ipfire/html/themes/ipfire/include/functions.pl \ + /usr/bin/br2684ctl
# update linker config ldconfig diff --git a/make.sh b/make.sh index f5dc2a649..2f629d73d 100755 --- a/make.sh +++ b/make.sh @@ -313,6 +313,8 @@ exiterror() { }
prepareenv() { + local network="false" + # Are we running the right shell? if [ -z "${BASH}" ]; then exiterror "BASH environment variable is not set. You're probably running the wrong shell." @@ -339,6 +341,10 @@ prepareenv() { required_space="${1#--required-space=}" ;;
+ --network) + network="true" + ;; + *) exiterror "Unknown argument: ${1}" ;; @@ -461,6 +467,26 @@ prepareenv() { # Mount the images directory mount --bind "${IMAGES_DIR}" "${BUILD_DIR}/usr/src/images"
+ # Bind-mount files requires for networking if requested + if [ "${network}" = "true" ]; then + local file + + for file in /etc/resolv.conf /etc/hosts; do + # Skip if the source files does not exist + if [ ! -e "${file}" ]; then + continue + fi + + # Create the destination if it does not exist + if [ ! -e "${BUILD_DIR}/${file}" ]; then + touch "${BUILD_DIR}/${file}" + fi + + # Mount the file read-only + mount --bind -o ro "${file}" "${BUILD_DIR}/${file}" + done + fi + # Configure the ccache export CCACHE_TEMPDIR="/tmp" export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER} ${BUILD_ARCH}" @@ -514,7 +540,7 @@ entershell() { local PS1="ipfire build chroot (${BUILD_ARCH}) \u:\w$ "
# Run an interactive shell - execute --chroot --interactive bash -i + execute --chroot --interactive --network bash -i }
lfsmakecommoncheck() { @@ -547,6 +573,7 @@ execute() { local command=() local interactive="false" local timer + local network="false"
# Collect environment variables local -A environ=( @@ -685,6 +712,10 @@ execute() { ) ;;
+ --network) + network="true" + ;; + --timer=*) timer="${1#--timer=}" ;; @@ -740,6 +771,11 @@ execute() { esac fi
+ # Network + if [ "${network}" = "false" ]; then + unshare+=( "--net" ) + fi + local execute=() local env
@@ -2319,7 +2355,7 @@ shell)
# enter a shell inside LFS chroot # may be used to changed kernel settings - prepareenv + prepareenv --network entershell ;; clean)
hooks/post-receive -- IPFire 2.x development tree