[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0a110703cac98300f23199b621eab2583832f463

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4590 bytes --]

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  0a110703cac98300f23199b621eab2583832f463 (commit)
      from  9287c6c9c770eee3838f6ed0c31efa36489de9c2 (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 0a110703cac98300f23199b621eab2583832f463
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 20 08:39:24 2024 +0000

    Revert "make.sh: Fix build with kernels < 6.0.0"
    
    This reverts commit 8ea702f3f853c4c28a2885dafdcae2e737c0a49b.
    
    This commit seems to introduce many more regressions when building
    packages which I cannot easily reproduce.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 make.sh          | 85 +++-----------------------------------------------------
 tools/execute.sh |  5 ----
 2 files changed, 4 insertions(+), 86 deletions(-)

Difference in files:
diff --git a/make.sh b/make.sh
index 2551d7495..48f1ad404 100755
--- a/make.sh
+++ b/make.sh
@@ -47,7 +47,6 @@ KVER="${KVER/-rc/.0-rc}${KVER_SUFFIX}"
 ###############################################################################
 
 HOST_ARCH="${HOSTTYPE}"
-HOST_KERNEL="$(uname -r)"
 LC_ALL=POSIX
 PS1='\u:\w$ '
 
@@ -296,76 +295,6 @@ __timer_event() {
 	return 0
 }
 
-version_compare() {
-	local v1="${1}"
-	local op="${2}"
-	local v2="${3}"
-
-	# Split both versions by .
-	v1=( ${v1//./ } )
-	v2=( ${v2//./ } )
-
-	# Run for as long as both versions have not been fully processed
-	while [ "${#v1[@]}" -gt 0 ] && [ "${#v2[@]}" -gt 0 ]; do
-		# Fetch the first element from each version
-		local f1="${v1[@]:0:1}"
-		local f2="${v2[@]:0:1}"
-
-		# Shift the array
-		v1=( ${v1[@]:1} )
-		v2=( ${v2[@]:1} )
-
-		local n1
-		local n2
-
-		# Split off any numeric parts
-		if [[ ${f1} =~ ^([0-9]+) ]]; then
-			n1="${BASH_REMATCH[1]}"
-		fi
-
-		if [[ ${f2} =~ ^([0-9]+) ]]; then
-			n2="${BASH_REMATCH[1]}"
-		fi
-
-		# Remove the numeric parts from each field
-		f1="${f1#${n1}}"
-		f2="${f2#${n2}}"
-
-		# Check the numeric parts first
-		if [ -n "${n1}" ] && [ -n "${n2}" ]; then
-			case "${op}" in
-				ge)
-					if [ "${n1}" -ge "${n2}" ]; then
-						return 1
-					fi
-					;;
-			esac
-
-		# If we only have a numeric part in the first version...
-		elif [ -n "${n1}" ]; then
-			case "${op}" in
-				ge)
-					return 1
-					;;
-			esac
-
-		# If we only have a numeric part in the second version...
-		elif [ -n "${n2}" ]; then
-			case "${op}" in
-				ge)
-					return 0
-					;;
-			esac
-		fi
-
-		# I don't know how to handle the non-numeric part here, and we should not need it
-		# as we are only using this for kernel versions which should all lead with numbers.
-	done
-
-	# Don't know
-	return 0
-}
-
 exiterror() {
 	# Dump logfile
 	if [ -n "${LOGFILE}" ] && [ -e "${LOGFILE}" ]; then
@@ -739,19 +668,13 @@ execute() {
 			# Create a new UTS namespace
 			"--uts"
 
+			# Mount /proc so that the build environment does not see
+			# any foreign processes.
+			"--mount-proc=${BUILD_DIR}/proc"
+
 			# If unshare is asked to terminate, terminate all child processes
 			"--kill-child"
 		)
-
-		# Mount /proc so that the build environment does not see
-		# any foreign processes.
-		# This does not work on kernels < 6.0.0, and we will mount /proc
-		# in the execute.sh script instead.
-		if version_compare "${HOST_KERNEL}" ge "6.0.0"; then
-			unshare+=(
-				"--mount-proc=${BUILD_DIR}/proc"
-			)
-		fi
 	fi
 
 	while [ $# -gt 0 ]; do
diff --git a/tools/execute.sh b/tools/execute.sh
index 7a5b218b4..b3bf42f22 100755
--- a/tools/execute.sh
+++ b/tools/execute.sh
@@ -22,11 +22,6 @@
 # This is a helper script that is called after we have created the new
 # namespaces to perform further setup. This will be executed on the host.
 
-# Mount /proc if it has not been mounted, yet
-if ! mountpoint /proc; then
-	mount -t procfs none /proc -o nosuid,noexec,nodev
-fi
-
 # Bring up the loopback interface
 ip link set lo up &>/dev/null
 


hooks/post-receive
--
IPFire 2.x development tree