From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 91279A054A for ; Tue, 25 Oct 2022 17:08:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6BBED42C34; Tue, 25 Oct 2022 17:08:03 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E85BD42C1D for ; Tue, 25 Oct 2022 17:08:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aMOlH+qbisfXsGI580e4kibUnbiFK02ss0Y1gZ9hKuM=; b=DIqnhuGcmd8Gb/XJGO+KVGOL5vxZ1BUgcu5OCRR9QnfXl3ntRVEPQAK6kBpuRqWCYziMnK LNRpOPZCaOzmehP9XXdzp6BsNuR0+nqj2qlPwREjAhtjsJ9k7X1fNElcK06M6YRuNwz7oE BRXL8KiZR5iAarLj1YM+yPWfjemiRVE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-633-_2ppSzHbNZGhaNvth73FRA-1; Tue, 25 Oct 2022 11:07:59 -0400 X-MC-Unique: _2ppSzHbNZGhaNvth73FRA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B020E811E7A; Tue, 25 Oct 2022 15:07:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FE1C4A9254; Tue, 25 Oct 2022 15:07:56 +0000 (UTC) From: Kevin Traynor To: Dmitry Kozlyuk Cc: Stephen Hemminger , Ferruh Yigit , dpdk stable Subject: patch 'build: enable developer mode for all working trees' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:05:56 +0100 Message-Id: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/155a98e8645ecc0c01a9f29ea92c204d583e747e Thanks. Kevin --- >From 155a98e8645ecc0c01a9f29ea92c204d583e747e Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Wed, 10 Aug 2022 20:40:58 +0300 Subject: [PATCH] build: enable developer mode for all working trees [ upstream commit 7ccd05e7b7fa1444c5abfd72f4b5cde627721e7d ] Developer mode was detected if `.git` was a directory. Linked git working trees created by `git worktree add` contain `.git` file instead of `.git` directory. Developer mode was not detected for such directories. Detect developer mode by the presence of `.git` path. Fixes: bc4617433845 ("build: enable a developer mode setting") Signed-off-by: Dmitry Kozlyuk Acked-by: Stephen Hemminger Acked-by: Ferruh Yigit --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 21dc51f00d..dff7cff4aa 100644 --- a/meson.build +++ b/meson.build @@ -17,5 +17,5 @@ if get_option('developer_mode').auto() if meson.version().version_compare('>=0.53') # fs module available fs = import('fs') - developer_mode = fs.is_dir('.git') + developer_mode = fs.exists('.git') endif else -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:58.621106988 +0100 +++ 0001-build-enable-developer-mode-for-all-working-trees.patch 2022-10-25 14:18:58.346797858 +0100 @@ -1 +1 @@ -From 7ccd05e7b7fa1444c5abfd72f4b5cde627721e7d Mon Sep 17 00:00:00 2001 +From 155a98e8645ecc0c01a9f29ea92c204d583e747e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7ccd05e7b7fa1444c5abfd72f4b5cde627721e7d ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index a32f14024b..7d6643da3a 100644 +index 21dc51f00d..dff7cff4aa 100644 @@ -26 +27 @@ -@@ -21,5 +21,5 @@ if get_option('developer_mode').auto() +@@ -17,5 +17,5 @@ if get_option('developer_mode').auto()