commit: e4f482966bd30c729cc3ea2fe44cd75170f1780a Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat Apr 11 23:18:14 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat Apr 11 23:25:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f48296
sys-kernel/genkernel: rev bump Cherry-pick commit 2948a542da6964a4f61a71fd5253c97f803eac34. Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> ...ernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch | 26 ++++++++++++++++++++++ ...rnel-4.0.7.ebuild => genkernel-4.0.7-r1.ebuild} | 2 ++ 2 files changed, 28 insertions(+) diff --git a/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch b/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch new file mode 100644 index 00000000000..be7bcf169ce --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch @@ -0,0 +1,26 @@ +commit 2948a542da6964a4f61a71fd5253c97f803eac34 +Author: Thomas Deutschmann <[email protected]> +AuthorDate: Sun Apr 12 01:12:38 2020 +0200 +Commit: Thomas Deutschmann <[email protected]> +CommitDate: Sun Apr 12 01:12:38 2020 +0200 + + gen_determineargs.sh: determine_real_args(): Quote $SANDBOX_ON + + $SANDBOX_ON can be unset causing 'unary operator expected' error. + + Fixes c0e013c ("gen_determineargs.sh: determine_real_args(): Error out early when already running within a sandbox") + Signed-off-by: Thomas Deutschmann <[email protected]> + +diff --git a/gen_determineargs.sh b/gen_determineargs.sh +index 95ec4021..b1c038d3 100755 +--- a/gen_determineargs.sh ++++ b/gen_determineargs.sh +@@ -1012,7 +1012,7 @@ determine_real_args() { + SANDBOX_COMMAND= + if isTrue "${SANDBOX}" + then +- if [ ${SANDBOX_ON} -eq 1 ] ++ if [[ "${SANDBOX_ON}" == "1" ]] + then + gen_die "SANDBOX_ON=1 detected -- You cannot use --sandbox when already running within a sandbox!" + fi diff --git a/sys-kernel/genkernel/genkernel-4.0.7.ebuild b/sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild similarity index 99% rename from sys-kernel/genkernel/genkernel-4.0.7.ebuild rename to sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild index 1014ca6dd11..8847cf2242f 100644 --- a/sys-kernel/genkernel/genkernel-4.0.7.ebuild +++ b/sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild @@ -111,6 +111,8 @@ if [[ ${PV} == 9999* ]]; then DEPEND="${DEPEND} app-text/asciidoc" fi +PATCHES=( "${FILESDIR}"/${P}-fix-unquoted-SANDBOX_ON-check.patch ) + src_unpack() { if [[ ${PV} == 9999* ]]; then git-r3_src_unpack
