[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     64d9cb6d1ff5162995fa84f6480da442a63f5223
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 20:49:31 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:47:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=64d9cb6d

gkbuild.sh: Refactor gklibtoolize() function

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 20de263..32940a1 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -664,7 +664,12 @@ gkconf() {
 gklibtoolize() {
 	type -P eltpatch &>/dev/null || die "eltpatch not found; is app-portage/elt-patches installed?"
 
-	gkexec "ELT_LOGDIR=\"${T}\" LD=\"$(tc-getLD)\" eltpatch ${*}"
+	local command=( "ELT_LOGDIR='${T}'" )
+	command+=( "LD='$(tc-getLD)'" )
+	command+=( "eltpatch" )
+	command+=( "${@}" )
+
+	gkexec "${command[*]}"
 }
 
 # @FUNCTION: gkmake

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     2a56383bb88211e5d18aa2f9e2c5332252ff6d17
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 13:46:26 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 20:02:20 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2a56383b

gkbuild.sh: gkconf(): Quote sysroot

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index e6b90b2..136fe17 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -622,7 +622,7 @@ gkconf() {
 		fi
 
 		if [[ ${conf_help} == *--with-sysroot* ]]; then
-			conf_args+=( --with-sysroot="${BROOT}/usr:${SYSROOT}" )
+			conf_args+=( "--with-sysroot='${BROOT}/usr:${SYSROOT}'" )
 		fi
 
 		# Handle arguments containing quoted whitespace (see bug #457136).

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     85d2d98e0ca58f724b51ad37f01cd703f37bbeb6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 16:03:46 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 16:03:46 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=85d2d98e

gkbuild.sh: _initialize(): Source gkbuild after $S was defined

This will allow gkbuilds to overwrite $S like known from ebuilds.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 92c7379..74a2505 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -247,9 +247,6 @@ _initialize() {
 		die "Unable to build ${P}: '${GK_SHARE}/gkbuilds/${PN}.gkbuild' does NOT exist!"
 	fi
 
-	source "${GKBUILD}" \
-		|| die "Failed to source '${GKBUILD}'!"
-
 	declare -gr WORKDIR=$(mktemp -d -p "${TEMP}" ${PN}.XXXXXXXX 2>/dev/null)
 	[ -z "${WORKDIR}" ] && die "mktemp failed!"
 
@@ -282,6 +279,9 @@ _initialize() {
 
 	S="${WORKDIR}/${GKPKG_SRCDIR}"
 
+	source "${GKBUILD}" \
+		|| die "Failed to source '${GKBUILD}'!"
+
 	# Some tools like eltpatch (libtoolize) depend on these variables
 	export S D
 

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     115571d97d3cbbd281ae233fdfff75c08c8b31da
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 20:30:41 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 21:04:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=115571d9

gkbuild.sh: _gkbuild_main(): Make use of get_tar_cmd()

This will allow us to use pxz when available.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 213597a..cb2f385 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -181,8 +181,11 @@ _gkbuild_main() {
 		unset found_dyn_files
 	fi
 
-	"${TAR_COMMAND}" -caf "${GKPKG_BINPKG}" . \
-		|| die "Failed to create binpkg of ${P} in '${GKPKG_BINPKG}'!"
+	local -a tar_cmd=( "$(get_tar_cmd "${GKPKG_BINPKG}")" )
+	tar_cmd+=( '.' )
+
+	print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1
+	eval "${tar_cmd[@]}" || die "Failed to create binpkg of ${P} in '${GKPKG_BINPKG}'!"
 
 	if [ -n "${DU_COMMAND}" ]
 	then

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     53988165c9b7b1452e86f216b4463fabbf8e95c9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 16:02:07 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 16:02:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=53988165

gkbuild.sh: Make sure that each phase starts in $S

...not just the default functions.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 136fe17..92c7379 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -81,19 +81,22 @@ _gkbuild_main() {
 		case "${current_phase}" in
 			src_compile)
 				print_info 2 "$(get_indent 2)${P}: >> Compiling source ..."
+				cd "${S}" || die "Failed to chdir to '${S}'!"
 				;;
 
 			src_configure)
 				print_info 2 "$(get_indent 2)${P}: >> Configuring source ..."
-				declare -ga CONFIGUREOPTS
+				cd "${S}" || die "Failed to chdir to '${S}'!"
 				;;
 
 			src_install)
 				print_info 2 "$(get_indent 2)${P}: >> Install to DESTDIR ..."
+				cd "${S}" || die "Failed to chdir to '${S}'!"
 				;;
 
 			src_prepare)
 				print_info 2 "$(get_indent 2)${P}: >> Preparing source ..."
+				cd "${S}" || die "Failed to chdir to '${S}'!"
 				;;
 
 			src_unpack)
@@ -331,8 +334,6 @@ _initialize() {
 }
 
 _src_compile() {
-	cd "${S}" || die "Failed to chdir to '${S}'!"
-
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]
 	then
 		gkmake V=1
@@ -340,8 +341,6 @@ _src_compile() {
 }
 
 _src_configure() {
-	cd "${S}" || die "Failed to chdir to '${S}'!"
-
 	if [[ -x ${GKCONF_SOURCE:-.}/configure ]]
 	then
 		gkconf
@@ -349,8 +348,6 @@ _src_configure() {
 }
 
 _src_install() {
-	cd "${S}" || die "Failed to chdir to '${S}'!"
-
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]
 	then
 		gkmake V=1 DESTDIR="${D}" install
@@ -358,8 +355,6 @@ _src_install() {
 }
 
 _src_prepare() {
-	cd "${S}" || die "Failed to chdir to '${S}'!"
-
 	# let's try to be smart and run autoreconf only when needed
 	local want_autoreconf=${WANT_AUTORECONF}
 

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     ecdfcf024f25b010d58f94bb0a601beaab44e134
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 16:04:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 16:05:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ecdfcf02

gkbuild.sh: _initialize(): Append $BROOT/usr/include to CXXFLAGS by default

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 74a2505..57a7241 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -304,6 +304,7 @@ _initialize() {
 
 		append-cflags -I"${BROOT}"/usr/include
 		append-cppflags -I"${BROOT}"/usr/include
+		append-cxxflags -I"${BROOT}"/usr/include
 		append-ldflags -L"${BROOT}"/usr/lib
 	fi
 

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     5d36a11a989b145891f8ede0110ba781fb3b939c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 19 15:11:30 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5d36a11a

gkbuild.sh: _src_prepare(): Fix wording

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 2039c85..2c23386 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -469,7 +469,7 @@ _src_prepare() {
 	then
 		if [[ ${checksum} != $(at_checksum) ]]
 		then
-			print_info 3 "$(get_indent 2)${P}: >> Will autoreconfigure due applied patches ..."
+			print_info 3 "$(get_indent 2)${P}: >> Will autoreconfigure due to applied patches ..."
 			want_autoreconf=yes
 		fi
 	fi

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     742fa9e975964c8b9fce47b1372eeae003e62dec
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 22:40:51 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 00:08:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=742fa9e9

gkbuild.sh: gkconf(): Update config.{guess,sub} with /usr/share/gnuconfig when possible

This will help to avoid build failures.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 2c23386..601d052 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -642,6 +642,21 @@ gkconf() {
 	: ${GKCONF_SOURCE:=.}
 	if [ -x "${GKCONF_SOURCE}/configure" ]
 	then
+		local pid=${BASHPID}
+		local x
+
+		if [ -e "/usr/share/gnuconfig/" ]
+		then
+			find "${WORKDIR}" -type f '(' \
+			-name config.guess -o -name config.sub ')' -print0 | \
+			while read -r -d $'\0' x ; do
+				print_info 3 "$(get_indent 2)${P}: >> Updating ${x/${WORKDIR}\/} with /usr/share/gnuconfig/${x##*/} ..."
+				# Make sure we do this atomically incase we're run in parallel. #487478
+				cp -f /usr/share/gnuconfig/"${x##*/}" "${x}.${pid}"
+				mv -f "${x}.${pid}" "${x}"
+			done
+		fi
+
 		local -a conf_args=()
 		local conf_help=$("${GKCONF_SOURCE}/configure" --help 2>/dev/null)
 

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     a8c182eab5bbc69334480ef1cc5175673eac9541
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 01:10:37 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 01:10:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a8c182ea

gkbuild.sh: _initialize(): Don't use temporary directory for packages

This is not necessary since top folder is already a temporary directory.
This will also allow us compare different genkernel log files more
easily.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 24c6e53..f26c27a 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -291,8 +291,8 @@ _initialize() {
 		die "Unable to build ${P}: '${GK_SHARE}/gkbuilds/${PN}.gkbuild' does NOT exist!"
 	fi
 
-	declare -gr WORKDIR=$(mktemp -d -p "${TEMP}" ${PN}_XXXXXXXX 2>/dev/null)
-	[ -z "${WORKDIR}" ] && die "mktemp failed!"
+	declare -gr WORKDIR="${TEMP}/${PN}"
+	mkdir "${WORKDIR}" || die "Failed to create '${WORKDIR}'!"
 
 	declare -gr BROOT="${WORKDIR}/buildroot"
 	mkdir "${BROOT}" || die "Failed to create '${BROOT}'!"

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     e387eb756a170cb3380ac5c8c5236bcf264b0eb9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 02:02:12 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 02:02:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e387eb75

dropbear.sh: _dropbear_install(): Fix die msg

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/dropbear.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker_modules/dropbear.sh b/worker_modules/dropbear.sh
index 9ab56b0..ed24a8c 100644
--- a/worker_modules/dropbear.sh
+++ b/worker_modules/dropbear.sh
@@ -154,7 +154,7 @@ _dropbear_install() {
 		mkdir -p "${key_destdir}" || die "Failed to create '${key_destdir}'!"
 	fi
 
-	cp -a "${keyfile}" "${DROPBEAR_KEY_FILE}" || die "Failed copy '${keyfile}' to '${DROPBEAR_KEY_FILE}'!"
+	cp -a "${keyfile}" "${DROPBEAR_KEY_FILE}" || die "Failed to copy '${keyfile}' to '${DROPBEAR_KEY_FILE}'!"
 
 	# end here -- sandbox is open!
 	exit 0

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     d828e88d577641d4f0e22045df0c810443851f21
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 14:50:03 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d828e88d

gkbuild.sh: _src_prepare(): Make sure that WANT_AUTORECONF=no will really skip autoreconf

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index f26c27a..668bb8f 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 __module_main() {
@@ -401,6 +401,7 @@ _src_install() {
 
 _src_prepare() {
 	# let's try to be smart and run autoreconf only when needed
+	# when no value was set in gkbuild
 	local want_autoreconf=${WANT_AUTORECONF}
 
 	# by default always run libtoolize
@@ -424,10 +425,11 @@ _src_prepare() {
 			-exec cksum {} + | sort -k2
 	}
 
-	if $(uses_autoconf) && ! isTrue "${want_autoreconf}"
+	if [ -z "${want_autoreconf}" ] && $(uses_autoconf)
 	then
 		local checksum=$(at_checksum)
 	fi
+
 	if [[ -d "${patchdir}" ]]
 	then
 		local silent="-s "
@@ -465,7 +467,7 @@ _src_prepare() {
 		print_info 2 "$(get_indent 2)${P}: >> No patches found in '$patchdir'; Skipping ..."
 	fi
 
-	if $(uses_autoconf) && ! isTrue "${want_autoreconf}"
+	if [ -z "${want_autoreconf}" ] && $(uses_autoconf)
 	then
 		if [[ ${checksum} != $(at_checksum) ]]
 		then

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Thomas Deutschmann]

commit:     235fcd4e9c1f57af368ca9bbe9dd25effc0dc900
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 19:52:15 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 19:52:15 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=235fcd4e

gkbuild.sh: gkautoreconf(): add workaround for >autoconf-2.69

Since >autoconf-2.69, autoreconf will check for GTK_DOC_CHECK macro and
will call gtkdocize automatically [Link 1] when invoked with "--install"
parameter.

This is a problem for genkernel because our gkautoreconf is just a rudimentary
implementation of Gentoo's eautoreconf: I.e. autotools eclass in Gentoo is
not calling autoreconf with "--install" parameter, instead eclass is manually
checking all used macros like autoreconf but will only call used tools when
available.

Because we do not care about docs in gkbuild packages, we can stick to our poor
man's implementation of gkautoreconf and replace calls to gtkdocize with true.

Link 1: https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=dd880a0a6de5602cdd40b770ed6b083b34aa0768
Bug: https://bugs.gentoo.org/775563
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 worker_modules/gkbuild.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 7284d84..f384cee 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -632,6 +632,10 @@ gkautomake() {
 # Wrapper for autoreconf.
 # Will die when command will exit with nonzero exit status.
 gkautoreconf() {
+	# >autoconf-2.69 will call gtkdocize when used in macros
+	# when called with --install parameter.
+	local -x GTKDOCIZE=true
+
 	gkexec "autoreconf --force --install ${*}"
 }
 

[gentoo-commits] proj/genkernel:master commit in: worker_modules/

[Sam James]

commit:     a2d9ac2bb4e6f30f2bb6665a1ab03d9d6af1a103
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 10:56:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 10:56:15 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a2d9ac2b

worker_modules/gkbuild.sh: fix whitespace

Signed-off-by: Sam James <sam <AT> gentoo.org>

 worker_modules/gkbuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index f384cee..101d5d0 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -197,7 +197,7 @@ _gkbuild_main() {
 		then
 			found_dyn_files=$(scanelf -E ET_DYN "${executable_files_to_scan[@]}" 2>/dev/null)
 		fi
-	
+
 		if [[ -n "${found_dyn_files}" ]]
 		then
 			print_error 1 "Found the following dynamically linked programs:"