[PATCH 0/2] Minor fixes for xfsprogs

[PATCH 0/2] Minor fixes for xfsprogs

[Andrey Albershteyn]

Hi,

These two patches are fix for building xfsprogs in immutable distros
and update to .gitignore.

Andrey Albershteyn (2):
  xfsprogs: fix permissions on files installed by libtoolize
  xfsprogs: update gitignore

 .gitignore | 12 ++++++++++++
 Makefile   |  2 ++
 2 files changed, 14 insertions(+)

-- 
2.44.1

[PATCH 1/2] xfsprogs: fix permissions on files installed by libtoolize

[Andrey Albershteyn]

Libtoolize installs some set of AUX files from its system package.
Not all distributions have the same permissions set on these files.
For example, read-only libtoolize system package will copy those
files without write permissions. This causes build to fail as next
line copies ./include/install-sh over ./install-sh which is not
writable.

Fix this by setting permission explicitly on files copied by
libtoolize.

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 4e768526c6fe..11cace1112e6 100644
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,8 @@ endif
 
 configure: configure.ac
 	libtoolize -c -i -f
+	chmod 755 config.guess config.sub install-sh
+	chmod 644 ltmain.sh m4/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4
 	cp include/install-sh .
 	aclocal -I m4
 	autoconf
-- 
2.44.1

Re: [PATCH 1/2] xfsprogs: fix permissions on files installed by libtoolize

[Darrick J. Wong]

On Fri, Sep 27, 2024 at 03:41:42PM +0200, Andrey Albershteyn wrote:
> Libtoolize installs some set of AUX files from its system package.
> Not all distributions have the same permissions set on these files.
> For example, read-only libtoolize system package will copy those
> files without write permissions. This causes build to fail as next
> line copies ./include/install-sh over ./install-sh which is not
> writable.

Does cp -f include/install-sh . work for this?

Aside from the install script, the build system doesn't modify any of
the files that come in from libtol, does it?

--D

> Fix this by setting permission explicitly on files copied by
> libtoolize.
> 
> Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
> ---
>  Makefile | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index 4e768526c6fe..11cace1112e6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -109,6 +109,8 @@ endif
>  
>  configure: configure.ac
>  	libtoolize -c -i -f
> +	chmod 755 config.guess config.sub install-sh
> +	chmod 644 ltmain.sh m4/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4
>  	cp include/install-sh .
>  	aclocal -I m4
>  	autoconf
> -- 
> 2.44.1
> 
> 

Re: Re: [PATCH 1/2] xfsprogs: fix permissions on files installed by libtoolize

[Andrey Albershteyn]

On 2024-09-27 08:17:09, Darrick J. Wong wrote:
> On Fri, Sep 27, 2024 at 03:41:42PM +0200, Andrey Albershteyn wrote:
> > Libtoolize installs some set of AUX files from its system package.
> > Not all distributions have the same permissions set on these files.
> > For example, read-only libtoolize system package will copy those
> > files without write permissions. This causes build to fail as next
> > line copies ./include/install-sh over ./install-sh which is not
> > writable.
> 
> Does cp -f include/install-sh . work for this?

yes, the cp -f would also work, to fix the build issue

> 
> Aside from the install script, the build system doesn't modify any of
> the files that come in from libtol, does it?

yup, it doesn't (at least I didn't found anything else), but the
file mode would be different

Andrey

> 
> --D
> 
> > Fix this by setting permission explicitly on files copied by
> > libtoolize.
> > 
> > Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
> > ---
> >  Makefile | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/Makefile b/Makefile
> > index 4e768526c6fe..11cace1112e6 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -109,6 +109,8 @@ endif
> >  
> >  configure: configure.ac
> >  	libtoolize -c -i -f
> > +	chmod 755 config.guess config.sub install-sh
> > +	chmod 644 ltmain.sh m4/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4
> >  	cp include/install-sh .
> >  	aclocal -I m4
> >  	autoconf
> > -- 
> > 2.44.1
> > 
> > 
> 

-- 
- Andrey

[PATCH 2/2] xfsprogs: update gitignore

[Andrey Albershteyn]

Building xfsprogs seems to produce many build artifacts which are
not tracked by git. Ignore them.

Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
---
 .gitignore | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitignore b/.gitignore
index fd131b6fde52..26a7339add42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@
 /config.status
 /config.sub
 /configure
+/configure~
 
 # libtool
 /libtool
@@ -73,9 +74,20 @@ cscope.*
 /scrub/xfs_scrub_all
 /scrub/xfs_scrub_all.cron
 /scrub/xfs_scrub_all.service
+/scrub/xfs_scrub_all_fail.service
+/scrub/xfs_scrub_fail
 /scrub/xfs_scrub_fail@.service
+/scrub/xfs_scrub_media@.service
+/scrub/xfs_scrub_media_fail@.service
 
 # generated crc files
+/libxfs/crc32selftest
+/libxfs/crc32table.h
+/libxfs/gen_crc32table
 /libfrog/crc32selftest
 /libfrog/crc32table.h
 /libfrog/gen_crc32table
+
+# docs
+/man/man8/mkfs.xfs.8
+/man/man8/xfs_scrub_all.8
-- 
2.44.1

Re: [PATCH 2/2] xfsprogs: update gitignore

[Carlos Maiolino]

On Fri, Sep 27, 2024 at 03:41:43PM GMT, Andrey Albershteyn wrote:
> Building xfsprogs seems to produce many build artifacts which are
> not tracked by git. Ignore them.
> 
> Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
> ---
>  .gitignore | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/.gitignore b/.gitignore
> index fd131b6fde52..26a7339add42 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -33,6 +33,7 @@
>  /config.status
>  /config.sub
>  /configure
> +/configure~

This smells like your vim configuration, not the make system.

Carlos

>  
>  # libtool
>  /libtool
> @@ -73,9 +74,20 @@ cscope.*
>  /scrub/xfs_scrub_all
>  /scrub/xfs_scrub_all.cron
>  /scrub/xfs_scrub_all.service
> +/scrub/xfs_scrub_all_fail.service
> +/scrub/xfs_scrub_fail
>  /scrub/xfs_scrub_fail@.service
> +/scrub/xfs_scrub_media@.service
> +/scrub/xfs_scrub_media_fail@.service
>  
>  # generated crc files
> +/libxfs/crc32selftest
> +/libxfs/crc32table.h
> +/libxfs/gen_crc32table
>  /libfrog/crc32selftest
>  /libfrog/crc32table.h
>  /libfrog/gen_crc32table
> +
> +# docs
> +/man/man8/mkfs.xfs.8
> +/man/man8/xfs_scrub_all.8
> -- 
> 2.44.1
> 
> 

Re: Re: [PATCH 2/2] xfsprogs: update gitignore

[Andrey Albershteyn]

On 2024-09-27 16:09:20, Carlos Maiolino wrote:
> On Fri, Sep 27, 2024 at 03:41:43PM GMT, Andrey Albershteyn wrote:
> > Building xfsprogs seems to produce many build artifacts which are
> > not tracked by git. Ignore them.
> > 
> > Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
> > ---
> >  .gitignore | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> > 
> > diff --git a/.gitignore b/.gitignore
> > index fd131b6fde52..26a7339add42 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -33,6 +33,7 @@
> >  /config.status
> >  /config.sub
> >  /configure
> > +/configure~
> 
> This smells like your vim configuration, not the make system.

opsie, you're right

Andrey

> 
> Carlos
> 
> >  
> >  # libtool
> >  /libtool
> > @@ -73,9 +74,20 @@ cscope.*
> >  /scrub/xfs_scrub_all
> >  /scrub/xfs_scrub_all.cron
> >  /scrub/xfs_scrub_all.service
> > +/scrub/xfs_scrub_all_fail.service
> > +/scrub/xfs_scrub_fail
> >  /scrub/xfs_scrub_fail@.service
> > +/scrub/xfs_scrub_media@.service
> > +/scrub/xfs_scrub_media_fail@.service
> >  
> >  # generated crc files
> > +/libxfs/crc32selftest
> > +/libxfs/crc32table.h
> > +/libxfs/gen_crc32table
> >  /libfrog/crc32selftest
> >  /libfrog/crc32table.h
> >  /libfrog/gen_crc32table
> > +
> > +# docs
> > +/man/man8/mkfs.xfs.8
> > +/man/man8/xfs_scrub_all.8
> > -- 
> > 2.44.1
> > 
> > 
> 

-- 
- Andrey

Re: Re: Re: [PATCH 2/2] xfsprogs: update gitignore

[Andrey Albershteyn]

On 2024-09-27 16:17:56, Andrey Albershteyn wrote:
> On 2024-09-27 16:09:20, Carlos Maiolino wrote:
> > On Fri, Sep 27, 2024 at 03:41:43PM GMT, Andrey Albershteyn wrote:
> > > Building xfsprogs seems to produce many build artifacts which are
> > > not tracked by git. Ignore them.
> > > 
> > > Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
> > > ---
> > >  .gitignore | 12 ++++++++++++
> > >  1 file changed, 12 insertions(+)
> > > 
> > > diff --git a/.gitignore b/.gitignore
> > > index fd131b6fde52..26a7339add42 100644
> > > --- a/.gitignore
> > > +++ b/.gitignore
> > > @@ -33,6 +33,7 @@
> > >  /config.status
> > >  /config.sub
> > >  /configure
> > > +/configure~
> > 
> > This smells like your vim configuration, not the make system.
> 
> opsie, you're right
> 
> Andrey

no, my vim was creating backup files but this is actually created
by autoconf.

this is doc for autoupdate, but autoconf does the same if
./configure already exists
https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#autoupdate-Invocation

so will add it gitignore

Andrey

> 
> > 
> > Carlos
> > 
> > >  
> > >  # libtool
> > >  /libtool
> > > @@ -73,9 +74,20 @@ cscope.*
> > >  /scrub/xfs_scrub_all
> > >  /scrub/xfs_scrub_all.cron
> > >  /scrub/xfs_scrub_all.service
> > > +/scrub/xfs_scrub_all_fail.service
> > > +/scrub/xfs_scrub_fail
> > >  /scrub/xfs_scrub_fail@.service
> > > +/scrub/xfs_scrub_media@.service
> > > +/scrub/xfs_scrub_media_fail@.service
> > >  
> > >  # generated crc files
> > > +/libxfs/crc32selftest
> > > +/libxfs/crc32table.h
> > > +/libxfs/gen_crc32table
> > >  /libfrog/crc32selftest
> > >  /libfrog/crc32table.h
> > >  /libfrog/gen_crc32table
> > > +
> > > +# docs
> > > +/man/man8/mkfs.xfs.8
> > > +/man/man8/xfs_scrub_all.8
> > > -- 
> > > 2.44.1
> > > 
> > > 
> > 
> 
> -- 
> - Andrey

-- 
- Andrey

Re: [PATCH 2/2] xfsprogs: update gitignore

[Darrick J. Wong]

On Fri, Sep 27, 2024 at 03:41:43PM +0200, Andrey Albershteyn wrote:
> Building xfsprogs seems to produce many build artifacts which are
> not tracked by git. Ignore them.
> 
> Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
> ---
>  .gitignore | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/.gitignore b/.gitignore
> index fd131b6fde52..26a7339add42 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -33,6 +33,7 @@
>  /config.status
>  /config.sub
>  /configure
> +/configure~
>  
>  # libtool
>  /libtool
> @@ -73,9 +74,20 @@ cscope.*
>  /scrub/xfs_scrub_all
>  /scrub/xfs_scrub_all.cron
>  /scrub/xfs_scrub_all.service
> +/scrub/xfs_scrub_all_fail.service
> +/scrub/xfs_scrub_fail
>  /scrub/xfs_scrub_fail@.service
> +/scrub/xfs_scrub_media@.service
> +/scrub/xfs_scrub_media_fail@.service

/me wonders if *.service/*.cron should be a wildcard to match
scrub/Makefile's LDIRT definition.

>  # generated crc files
> +/libxfs/crc32selftest
> +/libxfs/crc32table.h
> +/libxfs/gen_crc32table

This all moved to libfrog in 2018, how is it still building in libxfs?

>  /libfrog/crc32selftest
>  /libfrog/crc32table.h
>  /libfrog/gen_crc32table
> +
> +# docs
> +/man/man8/mkfs.xfs.8
> +/man/man8/xfs_scrub_all.8

Looks good.

--D

> -- 
> 2.44.1
> 
> 

Re: Re: [PATCH 2/2] xfsprogs: update gitignore

[Andrey Albershteyn]

On 2024-09-27 08:20:35, Darrick J. Wong wrote:
> On Fri, Sep 27, 2024 at 03:41:43PM +0200, Andrey Albershteyn wrote:
> > Building xfsprogs seems to produce many build artifacts which are
> > not tracked by git. Ignore them.
> > 
> > Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
> > ---
> >  .gitignore | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> > 
> > diff --git a/.gitignore b/.gitignore
> > index fd131b6fde52..26a7339add42 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -33,6 +33,7 @@
> >  /config.status
> >  /config.sub
> >  /configure
> > +/configure~
> >  
> >  # libtool
> >  /libtool
> > @@ -73,9 +74,20 @@ cscope.*
> >  /scrub/xfs_scrub_all
> >  /scrub/xfs_scrub_all.cron
> >  /scrub/xfs_scrub_all.service
> > +/scrub/xfs_scrub_all_fail.service
> > +/scrub/xfs_scrub_fail
> >  /scrub/xfs_scrub_fail@.service
> > +/scrub/xfs_scrub_media@.service
> > +/scrub/xfs_scrub_media_fail@.service
> 
> /me wonders if *.service/*.cron should be a wildcard to match
> scrub/Makefile's LDIRT definition.

yeah, can be a wildcard

> 
> >  # generated crc files
> > +/libxfs/crc32selftest
> > +/libxfs/crc32table.h
> > +/libxfs/gen_crc32table
> 
> This all moved to libfrog in 2018, how is it still building in libxfs?

hah yup, that was there from building a n years old master, dropping
this

> 
> >  /libfrog/crc32selftest
> >  /libfrog/crc32table.h
> >  /libfrog/gen_crc32table
> > +
> > +# docs
> > +/man/man8/mkfs.xfs.8
> > +/man/man8/xfs_scrub_all.8
> 
> Looks good.
> 
> --D
> 
> > -- 
> > 2.44.1
> > 
> > 
> 

-- 
- Andrey