From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 7E871A0471 for ; Fri, 21 Jun 2019 18:47:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 75CDE1D556; Fri, 21 Jun 2019 18:47:14 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 51F451D556 for ; Fri, 21 Jun 2019 18:47:12 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C36B73082E20; Fri, 21 Jun 2019 16:47:11 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-77.ams2.redhat.com [10.36.117.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id D903860BE0; Fri, 21 Jun 2019 16:47:07 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Luca Boccassi , dpdk stable Date: Fri, 21 Jun 2019 17:45:46 +0100 Message-Id: <20190621164626.31219-2-ktraynor@redhat.com> In-Reply-To: <20190621164626.31219-1-ktraynor@redhat.com> References: <20190621164626.31219-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 21 Jun 2019 16:47:11 +0000 (UTC) Subject: [dpdk-stable] patch 'examples: fix make clean when using pkg-config' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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 06/26/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/160ed874cad638d39f71397326e4026beeff2a2c Thanks. Kevin Traynor --- >From 160ed874cad638d39f71397326e4026beeff2a2c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 17 May 2019 13:02:31 +0100 Subject: [PATCH] examples: fix make clean when using pkg-config [ upstream commit 7e9562a107f170be5979199ae53a9780ce8cb81e ] The "make clean" command had a number of issues: - the "--ignore-fail-on-non-empty" flag is not present on BSD - the call to remove the build folder would fail if there was no build folder present. These are fixed by only removing the build folder if it exists, and by using -p flag to rmdir in place of --ignore-fail-on-non-empty Fixes: 22119c4591a0 ("examples: use pkg-config in makefiles") Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- examples/bbdev_app/Makefile | 2 +- examples/bond/Makefile | 2 +- examples/cmdline/Makefile | 2 +- examples/distributor/Makefile | 2 +- examples/eventdev_pipeline/Makefile | 2 +- examples/exception_path/Makefile | 2 +- examples/fips_validation/Makefile | 2 +- examples/flow_classify/Makefile | 2 +- examples/flow_filtering/Makefile | 2 +- examples/helloworld/Makefile | 2 +- examples/ip_fragmentation/Makefile | 2 +- examples/ip_pipeline/Makefile | 2 +- examples/ip_reassembly/Makefile | 2 +- examples/ipsec-secgw/Makefile | 2 +- examples/ipv4_multicast/Makefile | 2 +- examples/kni/Makefile | 2 +- examples/l2fwd-cat/Makefile | 2 +- examples/l2fwd-crypto/Makefile | 2 +- examples/l2fwd-jobstats/Makefile | 2 +- examples/l2fwd-keepalive/Makefile | 2 +- examples/l2fwd/Makefile | 2 +- examples/l3fwd-acl/Makefile | 2 +- examples/l3fwd-power/Makefile | 2 +- examples/l3fwd-vf/Makefile | 2 +- examples/l3fwd/Makefile | 2 +- examples/link_status_interrupt/Makefile | 2 +- examples/load_balancer/Makefile | 2 +- examples/packet_ordering/Makefile | 2 +- examples/ptpclient/Makefile | 2 +- examples/qos_meter/Makefile | 2 +- examples/qos_sched/Makefile | 2 +- examples/rxtx_callbacks/Makefile | 2 +- examples/service_cores/Makefile | 2 +- examples/skeleton/Makefile | 2 +- examples/tep_termination/Makefile | 2 +- examples/timer/Makefile | 2 +- examples/vhost/Makefile | 2 +- examples/vhost_scsi/Makefile | 2 +- examples/vmdq/Makefile | 2 +- examples/vmdq_dcb/Makefile | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile index 18dd99db2..c149589bc 100644 --- a/examples/bbdev_app/Makefile +++ b/examples/bbdev_app/Makefile @@ -38,5 +38,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/bond/Makefile b/examples/bond/Makefile index d6e500aab..2511b71eb 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -40,5 +40,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index a617cce11..d4180406e 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index 05ea0bfec..02656e326 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile index 1a789ccc3..12e3f262b 100644 --- a/examples/eventdev_pipeline/Makefile +++ b/examples/eventdev_pipeline/Makefile @@ -40,5 +40,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/exception_path/Makefile b/examples/exception_path/Makefile index ae74781ec..6f52213ed 100644 --- a/examples/exception_path/Makefile +++ b/examples/exception_path/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile index 7b1fe34a6..2e30ab266 100644 --- a/examples/fips_validation/Makefile +++ b/examples/fips_validation/Makefile @@ -43,5 +43,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile index f1fa4df62..08bf71272 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -38,5 +38,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile index 8f86b7b24..619ed53b7 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -34,5 +34,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index d66b526b6..9cf7c4e7c 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile index 9e89e744c..de9281677 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -37,5 +37,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index 41ba7df2c..1e03befeb 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -56,5 +56,5 @@ build: clean: rm -f build/$(APP)* build/*.o - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index 1e81315f2..8b2a158af 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -37,5 +37,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index a6933801a..9e19c2519 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -48,5 +48,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index a16c62333..f840f1642 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -37,5 +37,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/kni/Makefile b/examples/kni/Makefile index dd90d7d73..3b9bacb7c 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -37,5 +37,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index b6eeabde1..b80f73014 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -38,5 +38,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index 6658fd0d4..5c2fd3c05 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile index 696a8b21a..7fb0a2618 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile index 4ab67db44..65d4a86b7 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -38,5 +38,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index a8a47ad4e..43ac7f3c0 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index 285683f83..0ebf8cebd 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index 772ec7ba5..1d5f83acd 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -38,5 +38,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/l3fwd-vf/Makefile b/examples/l3fwd-vf/Makefile index dfb1d52d3..5497f941c 100644 --- a/examples/l3fwd-vf/Makefile +++ b/examples/l3fwd-vf/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index cccdd9dfa..2ec75a545 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index 160682123..b45338408 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/load_balancer/Makefile b/examples/load_balancer/Makefile index 197b019d5..437315871 100644 --- a/examples/load_balancer/Makefile +++ b/examples/load_balancer/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile index 3cf1ee1dc..626665e4f 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index 989e2dd40..42db83f57 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index 46341b1a7..b27baae6e 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -38,5 +38,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index 45b0a9eb6..c0a287e0c 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile index e9d30d56f..5b09eb279 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile index a4d6b7b44..030681fa4 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index bd980ec9b..d0fbacec7 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 4c1564325..3025ef04d 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -40,5 +40,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/timer/Makefile b/examples/timer/Makefile index 42b23f28e..3698a8e38 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index c6964381b..b9cce0817 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -40,5 +40,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/vhost_scsi/Makefile b/examples/vhost_scsi/Makefile index 523aee0bf..43d54de9c 100644 --- a/examples/vhost_scsi/Makefile +++ b/examples/vhost_scsi/Makefile @@ -39,5 +39,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index 87abeab93..63283a8e4 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index bf161cb2b..c56954d12 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -36,5 +36,5 @@ build: clean: rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared - rmdir --ignore-fail-on-non-empty build + test -d build && rmdir -p build || true else # Build using legacy build system -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-21 17:22:11.848001049 +0100 +++ 0002-examples-fix-make-clean-when-using-pkg-config.patch 2019-06-21 17:22:11.697519717 +0100 @@ -1 +1 @@ -From 7e9562a107f170be5979199ae53a9780ce8cb81e Mon Sep 17 00:00:00 2001 +From 160ed874cad638d39f71397326e4026beeff2a2c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7e9562a107f170be5979199ae53a9780ce8cb81e ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -63 +64 @@ -index e8115b46a..af313d926 100644 +index 18dd99db2..c149589bc 100644 @@ -74 +75 @@ -index 488eeac70..278b5f690 100644 +index d6e500aab..2511b71eb 100644 @@ -85 +86 @@ -index a03dfa8ee..03d9ed3cc 100644 +index a617cce11..d4180406e 100644 @@ -96 +97 @@ -index 52076214b..2edc0ea3d 100644 +index 05ea0bfec..02656e326 100644 @@ -107 +108 @@ -index 0b0d1ade9..1d3394947 100644 +index 1a789ccc3..12e3f262b 100644 @@ -110 +111 @@ -@@ -38,5 +38,5 @@ build: +@@ -40,5 +40,5 @@ build: @@ -118 +119 @@ -index 18db85ddb..c3ba2787c 100644 +index ae74781ec..6f52213ed 100644 @@ -129 +130 @@ -index e74252e27..19240911a 100644 +index 7b1fe34a6..2e30ab266 100644 @@ -132 +133 @@ -@@ -45,5 +45,5 @@ build: +@@ -43,5 +43,5 @@ build: @@ -140 +141 @@ -index dfce1a4bd..182debcba 100644 +index f1fa4df62..08bf71272 100644 @@ -151 +152 @@ -index f657c0336..b182a2a29 100644 +index 8f86b7b24..619ed53b7 100644 @@ -162 +163 @@ -index 97d82f68a..980b011fc 100644 +index d66b526b6..9cf7c4e7c 100644 @@ -173 +174 @@ -index 6d1a1fbba..56726d688 100644 +index 9e89e744c..de9281677 100644 @@ -184 +185 @@ -index 409966afd..acd93e29b 100644 +index 41ba7df2c..1e03befeb 100644 @@ -195 +196 @@ -index 7bbc241c7..1baec86ad 100644 +index 1e81315f2..8b2a158af 100644 @@ -206 +207 @@ -index 75f2bcd00..a2d8244e8 100644 +index a6933801a..9e19c2519 100644 @@ -209 +210 @@ -@@ -49,5 +49,5 @@ build: +@@ -48,5 +48,5 @@ build: @@ -217 +218 @@ -index 5a1e368fa..5595b9cbf 100644 +index a16c62333..f840f1642 100644 @@ -228 +229 @@ -index 634334f86..e01703567 100644 +index dd90d7d73..3b9bacb7c 100644 @@ -239 +240 @@ -index fb3c4bc00..b4f729a66 100644 +index b6eeabde1..b80f73014 100644 @@ -250 +251 @@ -index ed5e2c73f..3986a4c10 100644 +index 6658fd0d4..5c2fd3c05 100644 @@ -261 +262 @@ -index e14c3a2b2..4517a3d7d 100644 +index 696a8b21a..7fb0a2618 100644 @@ -272 +273 @@ -index bc851b732..56d0e0666 100644 +index 4ab67db44..65d4a86b7 100644 @@ -283 +284 @@ -index 94d70a43e..43277318f 100644 +index a8a47ad4e..43ac7f3c0 100644 @@ -294 +295 @@ -index fc236f129..b38343725 100644 +index 285683f83..0ebf8cebd 100644 @@ -305 +306 @@ -index a106b0404..8a4eee8ae 100644 +index 772ec7ba5..1d5f83acd 100644 @@ -316 +317 @@ -index cc93603e3..8ad2fbcbc 100644 +index dfb1d52d3..5497f941c 100644 @@ -327 +328 @@ -index 8c51c7b96..dcc38a928 100644 +index cccdd9dfa..2ec75a545 100644 @@ -338 +339 @@ -index d12e04782..987724d47 100644 +index 160682123..b45338408 100644 @@ -349 +350 @@ -index d4b145ca1..935ee1591 100644 +index 197b019d5..437315871 100644 @@ -360 +361 @@ -index 474ec9571..2c3187a41 100644 +index 3cf1ee1dc..626665e4f 100644 @@ -371 +372 @@ -index f113c9d56..857a679b7 100644 +index 989e2dd40..42db83f57 100644 @@ -382 +383 @@ -index fbcda09b2..7321f34f3 100644 +index 46341b1a7..b27baae6e 100644 @@ -393 +394 @@ -index a25875900..7012c3d4c 100644 +index 45b0a9eb6..c0a287e0c 100644 @@ -404 +405 @@ -index b937d599b..22c4013db 100644 +index e9d30d56f..5b09eb279 100644 @@ -415 +416 @@ -index 351fb7e1d..1dcd4c62e 100644 +index a4d6b7b44..030681fa4 100644 @@ -426 +427 @@ -index 56713a524..b9cd05f2f 100644 +index bd980ec9b..d0fbacec7 100644 @@ -437 +438 @@ -index f4b85e49b..3782378d9 100644 +index 4c1564325..3025ef04d 100644 @@ -448 +449 @@ -index 046348fd1..f49703ff4 100644 +index 42b23f28e..3698a8e38 100644 @@ -459 +460 @@ -index 80607b79c..9c3e0ece0 100644 +index c6964381b..b9cce0817 100644 @@ -470 +471 @@ -index 0a3450bae..813ab66a8 100644 +index 523aee0bf..43d54de9c 100644 @@ -481 +482 @@ -index 6a389c776..b67d1937f 100644 +index 87abeab93..63283a8e4 100644 @@ -492 +493 @@ -index 113bce7d1..0ddcc320b 100644 +index bf161cb2b..c56954d12 100644