From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2A4CFA09D9; Wed, 11 Nov 2020 16:02:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0CA32F90; Wed, 11 Nov 2020 16:02:48 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 45F08F64 for ; Wed, 11 Nov 2020 16:02:46 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id r17so2857347wrw.1 for ; Wed, 11 Nov 2020 07:02:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=owfC7/3ea4JjBXZqQZnFPCV5GVFrFOvQdTjvMKcjlKw=; b=atIcQ5NQjVQlM1cs7nPARfeVfUv+Zp3RO03b4D0ytNSDEDIb3OsQYqG5dtunBFHCYG +biP0dzcU5A4A32DkpiPbinStBCsuCzEbQUhoV6+ihmvOruNWgWAuH+9SK0yzFIAqDKr 8XqMmgdbFSQyGKLcxUIvbPktw5I5tmVNy4TcCa1a3tgH+zzN6NyGGD5gmVVKixoKaZXn 4ODZXHpZrmZyTvrB7zwfGig9Ibw1qMQs+/hAa22hFmiZGikwHgsGuemRYQ6w398iFGNw jb1S6IQbptV3jn6rhMoQync+A1NY3+w42y0XVV4mxwxHYYq2jOO0lPaGisz0ud+LvPKJ kv8w== X-Gm-Message-State: AOAM532RcLVx9c2NtLxHH00Kiv0jvflYZXElMMhCrAhoUHX4dnVeqHjB v6ANPnBtvpW79kQIN5GefvU= X-Google-Smtp-Source: ABdhPJxweOpx3nYgFjnlbevVg/Ae5siTXs3dlbvpwpfJ4WQdEtmbAN+8p9Pccan97Z9IZjbkvsRUZQ== X-Received: by 2002:a5d:4e07:: with SMTP id p7mr3671601wrt.63.1605106964911; Wed, 11 Nov 2020 07:02:44 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y11sm2677998wmj.36.2020.11.11.07.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 07:02:44 -0800 (PST) Message-ID: From: Luca Boccassi To: Dmitry Kozlyuk , Narcisa Ana Maria Vasile Cc: dev@dpdk.org, John Alexander Date: Wed, 11 Nov 2020 15:02:43 +0000 In-Reply-To: References: <20201029225505.30093-1-dmitry.kozliuk@gmail.com> <20201103040512.GA21662@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net> <20201103104209.5e345a89@sovereign> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Subject: Re: [dpdk-dev] [kmods PATCH] windows: normalize line-endings X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, 2020-11-03 at 10:05 +0000, Luca Boccassi wrote: > On Tue, 2020-11-03 at 10:42 +0300, Dmitry Kozlyuk wrote: > > Hi Naty, > >=20 > > > Doesn't the 'input' option gets you original (unmodified) line ending= s on checkout? > > > If a file in the repo has CRLF endings, Unix devs will get it as-is (= with CRLF), right? > >=20 > > The "input" option is for Unix devs only. > >=20 > > > Regardless, this is the best option for Unix and since we're normaliz= ing line endings for=20 > > > existing files, Unix devs should get LF on checkout. > > > I will send a patch to normalize netuio as well. > >=20 > > AFAIK, you don't need to. Whatever you settings were when committing ne= tuio, > > it now checks out with CRLF on Windows (core.autocrlf=3Dtrue, installer > > default) and with LF on Linux (core.autocrlf=3Dinput, although unset al= so > > works). I'd wait for confirmation from Luca, though. >=20 > Hi, >=20 > Thank you for looking into this. Yes the netuio folder is ok as-is: >=20 > $ dos2unix -id windows/netuio/netuio.vcxproj* windows/netuio/netuio.sln > 0 windows/netuio/netuio.vcxproj > 0 windows/netuio/netuio.vcxproj.filters > 0 windows/netuio/netuio.sln >=20 > The patch looks good to me, as I really need all files to be checked in > with LF only as a hard requirement before I can upload to > Debian/Ubuntu, so: >=20 > Acked-by: Luca Boccassi >=20 > Does the change also stop future check-ins of CRLF files? Thomas pointed out that this patch still doesn't fix everything, there's still a few CLRF around. I must have applied by mistake on a branch where I was working on, with manual fixes, sorry for the confusion. Eg, with this patch applied, the diff of dos2unix is still not empty: $ dos2unix windows/virt2phys/* dos2unix: converting file windows/virt2phys/virt2phys.c to Unix format... dos2unix: converting file windows/virt2phys/virt2phys.h to Unix format... dos2unix: converting file windows/virt2phys/virt2phys.inf to Unix format... dos2unix: converting file windows/virt2phys/virt2phys.sln to Unix format... dos2unix: converting file windows/virt2phys/virt2phys.vcxproj to Unix format... dos2unix: converting file windows/virt2phys/virt2phys.vcxproj.filters to Unix format... $ git status HEAD detached from origin/main Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: windows/virt2phys/virt2phys.sln modified: windows/virt2phys/virt2phys.vcxproj modified: windows/virt2phys/virt2phys.vcxproj.filters Could you please send a v2 with a run of dos2unix on _all_ the files? This is a blocker for me, I cannot upload 20.11 to Debian and Ubuntu until I have the kmods package ready, and I cannot upload this package until this issue is fixed. --=20 Kind regards, Luca Boccassi