From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B77FD138350 for ; Sat, 11 Apr 2020 23:25:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7750E0A62; Sat, 11 Apr 2020 23:25:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 871B8E0A62 for ; Sat, 11 Apr 2020 23:25:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B99F34EEAF for ; Sat, 11 Apr 2020 23:25:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E417518F for ; Sat, 11 Apr 2020 23:25:38 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1586647532.e4f482966bd30c729cc3ea2fe44cd75170f1780a.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild sys-kernel/genkernel/genkernel-4.0.7.ebuild X-VCS-Directories: sys-kernel/genkernel/ sys-kernel/genkernel/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: e4f482966bd30c729cc3ea2fe44cd75170f1780a X-VCS-Branch: master Date: Sat, 11 Apr 2020 23:25:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f7fee129-9540-425b-8221-dd395efc648b X-Archives-Hash: 65a66399f12ade2a20787e12060a89ac commit: e4f482966bd30c729cc3ea2fe44cd75170f1780a Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Apr 11 23:18:14 2020 +0000 Commit: Thomas Deutschmann gentoo 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 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 +AuthorDate: Sun Apr 12 01:12:38 2020 +0200 +Commit: Thomas Deutschmann +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 + +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