[gentoo-dev] [PATCH 1/2] multibuild.eclass: remove dead userland_BSD

[gentoo-dev] [PATCH 1/2] multibuild.eclass: remove dead userland_BSD

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/multibuild.eclass | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 37568ebf87c..cbd48b1eeb6 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multibuild.eclass
@@ -238,33 +238,22 @@ multibuild_merge_root() {
 	local dest=${2}
 
 	local ret
+	local cp_args=()
 
-	if use userland_BSD; then
-		# Most of BSD variants fail to copy broken symlinks, #447370
-		# also, they do not support --version
-
-		tar -C "${src}" -f - -c . \
-			| tar -x -f - -C "${dest}"
-		[[ ${PIPESTATUS[*]} == '0 0' ]]
-		ret=${?}
+	if cp -a --version &>/dev/null; then
+		cp_args+=( -a )
 	else
-		local cp_args=()
-
-		if cp -a --version &>/dev/null; then
-			cp_args+=( -a )
-		else
-			cp_args+=( -P -R -p )
-		fi
-
-		if cp --reflink=auto --version &>/dev/null; then
-			# enable reflinking if possible to make this faster
-			cp_args+=( --reflink=auto )
-		fi
+		cp_args+=( -P -R -p )
+	fi
 
-		cp "${cp_args[@]}" "${src}"/. "${dest}"/
-		ret=${?}
+	if cp --reflink=auto --version &>/dev/null; then
+		# enable reflinking if possible to make this faster
+		cp_args+=( --reflink=auto )
 	fi
 
+	cp "${cp_args[@]}" "${src}"/. "${dest}"/
+	ret=${?}
+
 	if [[ ${ret} -ne 0 ]]; then
 		die "${MULTIBUILD_VARIANT:-(unknown)}: merging image failed."
 	fi
-- 
2.34.1

[gentoo-dev] [PATCH 2/2] apache-2.eclass: remove dead userland_BSD

[David Seifert]

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/apache-2.eclass | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index a67597447ba..cd930aaf54f 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: apache-2.eclass
@@ -450,15 +450,6 @@ apache-2_pkg_setup() {
 	elog "Make sure CONFIG_SYSVIPC=y is set."
 	elog
 
-	if use userland_BSD; then
-		elog "On BSD systems you need to add the following line to /boot/loader.conf:"
-		elog "  accf_http_load=\"YES\""
-		if use ssl ; then
-			elog "  accf_data_load=\"YES\""
-		fi
-		elog
-	fi
-
 	if [[ ${EAPI} != 6 ]] && use apache2_modules_lua ; then
 		lua-single_pkg_setup
 	fi
-- 
2.34.1

Re: [gentoo-dev] [PATCH 1/2] multibuild.eclass: remove dead userland_BSD

[Ulrich Mueller]

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

>>>>> On Sat, 08 Jan 2022, David Seifert wrote:
 
> +	cp "${cp_args[@]}" "${src}"/. "${dest}"/
> +	ret=${?}
> +
>  	if [[ ${ret} -ne 0 ]]; then
>  		die "${MULTIBUILD_VARIANT:-(unknown)}: merging image failed."
>  	fi

This could be further simplified to "cp ... || die ..." (and no need to
declare ret above).

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]