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 A98321382C5 for ; Sat, 16 May 2020 06:53:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE119E090A; Sat, 16 May 2020 06:53:32 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) (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 C563FE090A for ; Sat, 16 May 2020 06:53:32 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id b8so2087325pgi.11 for ; Fri, 15 May 2020 23:53:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YB8pSE/XLIDeliRyPb6nEpLF6S0QRm2J7DlrJ3pYg1s=; b=KSBiGXV7MRk82FaWaOnvkkLqU0numi5kgfVFme5JhNmQrmt1L5z2gg4F7gnS6Qsnse sesyFi3SG9PsSnZfBt8Pcn9sx2hEIDoMdAKvDaVuPamavSBWvuuC0qqPhNIweeqmaYoI ZZq5JHW0O/RDP7PWq0yovuTnvxYkjRBRZ2fdkB+5nHEv78s/o8XtUTg9yFFYNrKM7TQU W+0GptX2SFOaUto0uB/rJxkLd2sA19M11z3LFdcKsZvd/Aqw6abU7FuUFB+InT2pOhId 6HQa5Y6TXjp400JnzRSsJl9s7WsRM/Rha3AmTO/ePRK9x0hssh+p14j7zI9kkTlZHgpU 4fYw== X-Gm-Message-State: AOAM530k+MtuOIoEijIVQdQLnt9k4hnG89VmYMGkqiYzbl9QnZKy4yfg plG8WMlhbKn0ThS0RGI5vCrN3RIo X-Google-Smtp-Source: ABdhPJyE+UnT2CPIRSE+/RXhy2Lm3inc2j4FDT2Kw+52uD+0qxQYCpRAkea0C8ZPA46A4u2jr1ujpQ== X-Received: by 2002:a63:503:: with SMTP id 3mr247288pgf.15.1589612011576; Fri, 15 May 2020 23:53:31 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id s102sm3082398pjb.57.2020.05.15.23.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 23:53:30 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 5/9] targets: Don't unnecessarily override emerge_opts Date: Fri, 15 May 2020 23:53:13 -0700 Message-Id: <20200516065317.2678080-5-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200516065317.2678080-1-mattst88@gentoo.org> References: <20200516065317.2678080-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 484c39fe-fc66-4d76-833c-d09a9b201be9 X-Archives-Hash: 9bf9f205394969f5d75e8ad14c5ad43d 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 --- 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 ] -- 2.26.2