Messages in this thread | | | From | Masahiro Yamada <> | Date | Sat, 10 Nov 2018 01:39:48 +0900 | Subject | Re: [PATCH] Revert "scripts/setlocalversion: git: Make -dirty check more robust" |
| |
On Wed, Nov 7, 2018 at 3:39 AM Guenter Roeck <linux@roeck-us.net> wrote: > > This reverts commit 6147b1cf19651c7de297e69108b141fb30aa2349. > > The reverted patch results in attempted write access to the source > repository, even if that repository is mounted read-only. > > Output from "strace git status -uno --porcelain": > > getcwd("/tmp/linux-test", 129) = 16 > open("/tmp/linux-test/.git/index.lock", O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC, 0666) = > -1 EROFS (Read-only file system) > > While git appears to be able to handle this situation, a monitored build > environment (such as the one used for Chrome OS kernel builds) may detect > it and bail out with an access violation error. On top of that, the attempted > write access suggests that git _will_ write to the file even if a build output > directory is specified. Users may have the reasonable expectation that the > source repository remains untouched in that situation. > > Fixes: 6147b1cf19651 ("scripts/setlocalversion: git: Make -dirty check more robust" > Cc: Genki Sky <sky@genki.is> > Cc: Masahiro Yamada <yamada.masahiro@socionext.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > ---
Applied to linux-kbuild/fixes.
Thanks!
> scripts/setlocalversion | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/setlocalversion b/scripts/setlocalversion > index 79f7dd57d571..71f39410691b 100755 > --- a/scripts/setlocalversion > +++ b/scripts/setlocalversion > @@ -74,7 +74,7 @@ scm_version() > fi > > # Check for uncommitted changes > - if git status -uno --porcelain | grep -qv '^.. scripts/package'; then > + if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then > printf '%s' -dirty > fi > > -- > 2.7.4 >
-- Best Regards Masahiro Yamada
| |