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 DA68B1382C5 for ; Sat, 16 May 2020 06:54:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FFC6E09D1; Sat, 16 May 2020 06:54:16 +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 05169E09D0 for ; Sat, 16 May 2020 06:54:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C0C1D34F107 for ; Sat, 16 May 2020 06:54:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53BBC246 for ; Sat, 16 May 2020 06:54:13 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589611786.421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a X-VCS-Branch: pending/mattst88 Date: Sat, 16 May 2020 06:54:13 +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: ff927441-c33a-4312-a5e2-30e09ff00ed6 X-Archives-Hash: 2165d2f93a5f4f4241fab07cdf801a65 commit: 421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a Author: Matt Turner gentoo org> AuthorDate: Sat May 16 06:12:21 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat May 16 06:49:46 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=421d73ea targets: Don't unnecessarily override emerge_opts emerge_opts contains the options we want already, and if there are extra options we need for a special case we can just pass them to run_merge. Signed-off-by: Matt Turner gentoo.org> targets/support/kmerge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 23489d8e..e92072bb 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -212,7 +212,7 @@ then # install dependencies of kernel sources ahead of time in case # package.provided generated below causes them not to be (re)installed - PKGDIR=${PKGDIR} emerge_opts=(--quiet --usepkg --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps) run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" || exit 1 # Create the kerncache directory if it doesn't exists mkdir -p /tmp/kerncache/${clst_kname} @@ -236,7 +236,7 @@ then [ -L /usr/src/linux ] && rm -f /usr/src/linux - PKGDIR=${PKGDIR} emerge_opts=(--quiet --update --newuse) run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} run_merge "${clst_ksource}" || exit 1 SOURCESDIR="/tmp/kerncache/${clst_kname}/sources" if [ -L /usr/src/linux ] 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 74A7613835B for ; Sun, 17 May 2020 03:26:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38C00E0923; Sun, 17 May 2020 03:26:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2409EE0923 for ; Sun, 17 May 2020 03:26:34 +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 CDA0634F685 for ; Sun, 17 May 2020 03:26:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 107CB24E for ; Sun, 17 May 2020 03:26:31 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589611786.421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a X-VCS-Branch: master Date: Sun, 17 May 2020 03:26:31 +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: 77892588-bc0b-4d0c-8276-1db147defb16 X-Archives-Hash: ab137b748a2f981ed49f9946f928f030 Message-ID: <20200517032631.xrez1oH39if2sxz-cNHsWOmc5uMs7w0wGx67RfE4JuY@z> commit: 421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a Author: Matt Turner gentoo org> AuthorDate: Sat May 16 06:12:21 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat May 16 06:49:46 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=421d73ea targets: Don't unnecessarily override emerge_opts emerge_opts contains the options we want already, and if there are extra options we need for a special case we can just pass them to run_merge. Signed-off-by: Matt Turner gentoo.org> targets/support/kmerge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 23489d8e..e92072bb 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -212,7 +212,7 @@ then # install dependencies of kernel sources ahead of time in case # package.provided generated below causes them not to be (re)installed - PKGDIR=${PKGDIR} emerge_opts=(--quiet --usepkg --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps) run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" || exit 1 # Create the kerncache directory if it doesn't exists mkdir -p /tmp/kerncache/${clst_kname} @@ -236,7 +236,7 @@ then [ -L /usr/src/linux ] && rm -f /usr/src/linux - PKGDIR=${PKGDIR} emerge_opts=(--quiet --update --newuse) run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} run_merge "${clst_ksource}" || exit 1 SOURCESDIR="/tmp/kerncache/${clst_kname}/sources" if [ -L /usr/src/linux ] 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 BBB4413835D for ; Sat, 16 May 2020 06:55:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05151E09DB; Sat, 16 May 2020 06:55:33 +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 DF5ECE09DB for ; Sat, 16 May 2020 06:55:32 +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 CC8F534F0F0 for ; Sat, 16 May 2020 06:55:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65A0C246 for ; Sat, 16 May 2020 06:55:30 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589611786.421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a X-VCS-Branch: wip/mattst88 Date: Sat, 16 May 2020 06:55:30 +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: 07c8125b-209f-49e7-8761-5250e0261403 X-Archives-Hash: 316ffd42c04f7b596dde097fab4cc678 Message-ID: <20200516065530.SS8wsAPezOxAH-1GQkTuJjQtLnj5EGnzhWnxcBX3Jf8@z> commit: 421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a Author: Matt Turner gentoo org> AuthorDate: Sat May 16 06:12:21 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat May 16 06:49:46 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=421d73ea targets: Don't unnecessarily override emerge_opts emerge_opts contains the options we want already, and if there are extra options we need for a special case we can just pass them to run_merge. Signed-off-by: Matt Turner gentoo.org> targets/support/kmerge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 23489d8e..e92072bb 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -212,7 +212,7 @@ then # install dependencies of kernel sources ahead of time in case # package.provided generated below causes them not to be (re)installed - PKGDIR=${PKGDIR} emerge_opts=(--quiet --usepkg --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps) run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" || exit 1 # Create the kerncache directory if it doesn't exists mkdir -p /tmp/kerncache/${clst_kname} @@ -236,7 +236,7 @@ then [ -L /usr/src/linux ] && rm -f /usr/src/linux - PKGDIR=${PKGDIR} emerge_opts=(--quiet --update --newuse) run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} run_merge "${clst_ksource}" || exit 1 SOURCESDIR="/tmp/kerncache/${clst_kname}/sources" if [ -L /usr/src/linux ]