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 5D429138359 for ; Wed, 21 Oct 2020 00:24:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5621E0AA2; Wed, 21 Oct 2020 00:24:35 +0000 (UTC) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) (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 AFCE5E0AA2 for ; Wed, 21 Oct 2020 00:24:35 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id gm14so226877pjb.2 for ; Tue, 20 Oct 2020 17:24:35 -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=gRZWQehK0bjgmoLZ48tAzUn4xxidUiZc6up7ESy0+5w=; b=LLJ2unyBZQE9ZPfZc8uHZSJCsvsjf9a1+DIYzB/5SjjcKAMrUdS6zHXjzk3pPnVjh5 LUeG+1XjHRm6dyxFXXa86tZk60ESIiCe6bE0OCA6xhTnWxFGzz/evS2B87k8ybkXd2Fx tBGVcC1kRhDfigtN8vxv03LvuEPKQDCFbk+Z5cP+g0zcg4ysqT1R2DlnCs/cvhp4F7ok ugpeu6UnM0YDDKi8RrVRzVXJ2pPwYT0j5cpu6edF3aE6C2fJ3fNsUZwTkdcFHryVhlP/ WplqJpy3BG7arx3uKSFxeigmcszhLHVrBOERQ/y/Y7oWCUoQFJ7mOl92iXocXCdtwnqu z6WA== X-Gm-Message-State: AOAM531ze5e+Pain0KrOVQqvcHHISlSAeO6XpQ+Zardw3kaFSYrp+/Su BlyTkidY+vGNmK/c330Ug8gVTH8VUnBm1Q== X-Google-Smtp-Source: ABdhPJyQC+heZjqB1HRt1RLhTc9PJspUqFL/FJ+NBlrI3c2ofsHPAVFAQrcQFBliaKxJQSys5YbEww== X-Received: by 2002:a17:902:724c:b029:d5:c1de:e34e with SMTP id c12-20020a170902724cb02900d5c1dee34emr677950pll.71.1603239874464; Tue, 20 Oct 2020 17:24:34 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id o2sm278306pgg.3.2020.10.20.17.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:33 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 22/37] targets: Emerge kernel sources with --update Date: Tue, 20 Oct 2020 17:23:29 -0700 Message-Id: <20201021002344.378131-22-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-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: 525dbb5b-4beb-43b5-87e7-82990dbcbb64 X-Archives-Hash: 7180bda2e8fc01a24d0927c092ff0834 Ensure that we have the appropriate version. 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 7eb18313..40e208e4 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -193,7 +193,7 @@ then rm -f ${clst_port_conf}/profile/package.provided fi - USE=symlink run_merge "${ksource}" + USE=symlink run_merge --update "${ksource}" SOURCESDIR="/tmp/kerncache/${kname}/sources" if [ -L /usr/src/linux ] @@ -223,7 +223,7 @@ then fi fi else - USE=symlink run_merge "${ksource}" + USE=symlink run_merge --update "${ksource}" if [ ! "${clst_kextraversion}" = "" ] then -- 2.26.2