linux-kernel - Re: [PATCH] kbuild: fix package build error due to broken symlinks

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Sun, 2 Apr 2023 11:13:41 +0900
From:   Masahiro Yamada <masahiroy@...nel.org>
To:     Nicolas Schier <nicolas@...sle.eu>
Cc:     linux-kbuild@...r.kernel.org, linux-kernel@...r.kernel.org,
        Nathan Chancellor <nathan@...nel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>
Subject: Re: [PATCH] kbuild: fix package build error due to broken symlinks

On Sun, Apr 2, 2023 at 2:53 AM Nicolas Schier <nicolas@...sle.eu> wrote:
>
> On Sat, Apr 01, 2023 at 11:55:44PM +0900 Masahiro Yamada wrote:
> > On Thu, Mar 30, 2023 at 5:02 AM Nicolas Schier <nicolas@...sle.eu> wrote:
> > >
> > > On Sat 25 Mar 2023 23:19:09 GMT, Masahiro Yamada wrote:
> > > > 'make deb-pkg' and 'make rpm-pkg' fail if a broken symlink exists in
> > > > a dirty source tree. Handle symlinks properly, and also, keep the
> > > > executable permission.
> > > >
> > > > Fixes: 05e96e96a315 ("kbuild: use git-archive for source package creation")
> > > > Signed-off-by: Masahiro Yamada <masahiroy@...nel.org>
> > > > ---
> > > >
> > > >  scripts/package/gen-diff-patch | 36 +++++++++++++++++++++++++---------
> > > >  1 file changed, 27 insertions(+), 9 deletions(-)
> > > >
> > > > diff --git a/scripts/package/gen-diff-patch b/scripts/package/gen-diff-patch
> > > > index f842ab50a780..23551de92e1b 100755
> > > > --- a/scripts/package/gen-diff-patch
> > > > +++ b/scripts/package/gen-diff-patch
> > > > @@ -23,16 +23,34 @@ fi
> > > >  git -C ${srctree} status --porcelain --untracked-files=all |
> > > >  while read stat path
> > > >  do
> > > > -     if [ "${stat}" = '??' ]; then
> > > > -
> > > > -             if ! diff -u /dev/null "${srctree}/${path}" > .tmp_diff &&
> > > > -                     ! head -n1 .tmp_diff | grep -q "Binary files"; then
> > > > -                     {
> > > > -                             echo "--- /dev/null"
> > > > -                             echo "+++ linux/$path"
> > > > -                             cat .tmp_diff | tail -n +3
> > > > -                     } >> ${untracked_patch}
> > > > +     if [ "${stat}" != '??' ]; then
> > > > +             continue
> > > > +     fi
> > > > +
> > > > +     if [ -L "${path}" ]; then
> > > > +             {
> > > > +                     echo "diff --git a/${path} b/${path}"
> > > > +                     echo "new file mode 120000"
> > > > +                     echo "--- /dev/null"
> > > > +                     echo "+++ b/$path"
> > > > +                     echo "@@ -0,0 +1 @@"
> > > > +                     printf "+"; readlink ${path}
> > >
> > > Better quote "${path}"?
> >
> >
> > Thanks for the suggestion.
> >
> > Quoting variables are correct in most cases.
> > But, that is not enough to generate a valid
> > patch when a file path contains spaces.
> >
> >
> >
> > 'git format-patch' produces a patch that
> > is accepted by GNU patch and also by dpkg-source.
> >
> > I learned a trick from GIT source code.
> >
> >
> > If you are interested, what GIT does [1].
> >
> >
> > [1] https://github.com/git/git/commit/1a9eb3b9d50367bee8fe85022684d812816fe531
>
> thanks for the pointer, that is really interesting!
>
> Kind regards,
> Nicolas
>
>
> > I will send v2 later, where I made some more efforts
> > to fix several corner cases even if that is not perfect.


I wrote a patch (attached to this email) but I am
still thinking if this is worth the complicated scripting...

Another approach would be to stop caring untracked files.


-- 
Best Regards
Masahiro Yamada

View attachment "0001-kbuild-make-package-builds-more-robust.patch" of type "text/x-patch" (3558 bytes)