Re: [LEDE-DEV] Patch refresh issues - mystery whitespace
> On 20 Dec 2017, at 08:44, Kevin Darbyshire-Bryant > wrote: > > > >> On 17 Dec 2017, at 09:57, Kevin Darbyshire-Bryant >> wrote: >> >> Dear Illuminati, >> >> I have a bit of a mystery with patch refreshes, namely that I’m occasionally >> getting extra whitespace on the end of some block header patch lines (Lines >> beginning @@). As a result my kernel patch refreshes touch more files than >> are actually really required and I don’t consider suitable for submitting. >> Eventually solved. For anyone’s interest: It looks like macos ‘diff’ is subtly broken. Installing the homebrew diffutils is the solution ‘brew install diffutils’. An extra gotcha is to make sure staging_dir/host/bin/diff is linked to the brew supplied ‘/usr/local/bin/diff’. Cheers, Kevin D-B 012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A signature.asc Description: Message signed with OpenPGP ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Patch refresh issues - mystery whitespace
> On 17 Dec 2017, at 09:57, Kevin Darbyshire-Bryant > wrote: > > Dear Illuminati, > > I have a bit of a mystery with patch refreshes, namely that I’m occasionally > getting extra whitespace on the end of some block header patch lines (Lines > beginning @@). As a result my kernel patch refreshes touch more files than > are actually really required and I don’t consider suitable for submitting. > Thanks to all for your responses here & on IRC. At the moment I’m still no further forward in this mystery. But I think I’m out of kernel refresh operations, or anything else that touches a lot of patches until it’s solved. Borromini & myself did a 4.4 patch bump on master yesterday to compare. I produced a 350K patch file, touched shed loads of patches with silly whitespace at 'end of block ID’ lines, whilst he produced a nice clean 33K patch file. ‘quilt', well 'quilt refresh' does silly things on macos. Cheers, Kevin D-B +44 7947 355344 012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A signature.asc Description: Message signed with OpenPGP ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Patch refresh issues - mystery whitespace
This is mine. QUILT_DIFF_ARGS="--no-timestamps --no-index -pab --color=auto" QUILT_REFRESH_ARGS="--no-timestamps --no-index -pab" QUILT_PATCH_OPTS="--unified" QUILT_DIFF_OPTS="-p" EDITOR="vim" quilt --version 0.65 Best Regards, Syrone Wong On Sun, Dec 17, 2017 at 5:57 PM, Kevin Darbyshire-Bryant wrote: > Dear Illuminati, > > I have a bit of a mystery with patch refreshes, namely that I’m occasionally > getting extra whitespace on the end of some block header patch lines (Lines > beginning @@). As a result my kernel patch refreshes touch more files than > are actually really required and I don’t consider suitable for submitting. > > I’ve attached (hopefully it’ll get through) a bump to 4.4.106 on master > branch that exhibits the problem, as an extreme example, take a look at lines > 1941 & 1950 - where did all those extra tabs come from? > > I have the prescribed .quilt_rc file > > QUILT_DIFF_ARGS="--no-timestamps --no-index -p ab --color=auto" > QUILT_REFRESH_ARGS="--no-timestamps --strip-trailing-whitespace --no-index -p > ab" > QUILT_PATCH_OPTS="--unified" > QUILT_DIFF_OPTS="-p" > QUILT_SERIES_ARGS="--color=auto" > > > > > > Of course I’m doing this on a mac, but I’m pretty sure others here work on > the project do so too and don’t hit this problem. Help :-) > > > Cheers, > > Kevin D-B > > GPG fingerprint: 012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A > > > ___ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev > ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
