[PATCH v3 0/2] Minor fixes for xfsprogs

[PATCH v3 0/2] Minor fixes for xfsprogs

[Andrey Albershteyn]

Hi,

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

v3:
- Use wildcard or backup files
v2:
- Use wildcard for scrub systemd/cron files

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

 .gitignore | 12 ++++++++----
 Makefile   |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

-- 
2.44.1

[PATCH v3 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

[PATCH v3 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>
---

Notes:
    Replace ./configure~ with wildcard ./*~ to remove all backup files
    which autoconf (or any other tool) can create

 .gitignore | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd131b6fde52..756867124a02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@
 /config.status
 /config.sub
 /configure
+/*~
 
 # libtool
 /libtool
@@ -69,13 +70,16 @@ cscope.*
 /rtcp/xfs_rtcp
 /spaceman/xfs_spaceman
 /scrub/xfs_scrub
-/scrub/xfs_scrub@.service
 /scrub/xfs_scrub_all
-/scrub/xfs_scrub_all.cron
-/scrub/xfs_scrub_all.service
-/scrub/xfs_scrub_fail@.service
+/scrub/xfs_scrub_fail
+/scrub/*.cron
+/scrub/*.service
 
 # generated crc files
 /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 v3 1/2] xfsprogs: fix permissions on files installed by libtoolize

[Darrick J. Wong]

On Wed, Oct 02, 2024 at 12:36:23PM +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.
> 
> 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

Probably better to write these out explicitly instead of relying on
shell globbing to pick up the m4/ files, but otherwise

Looks ok,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

>  	cp include/install-sh .
>  	aclocal -I m4
>  	autoconf
> -- 
> 2.44.1
> 
> 

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

[Darrick J. Wong]

On Wed, Oct 02, 2024 at 12:36:24PM +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>
> ---
> 
> Notes:
>     Replace ./configure~ with wildcard ./*~ to remove all backup files
>     which autoconf (or any other tool) can create

Seems fine to me...
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> 
>  .gitignore | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index fd131b6fde52..756867124a02 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -33,6 +33,7 @@
>  /config.status
>  /config.sub
>  /configure
> +/*~
>  
>  # libtool
>  /libtool
> @@ -69,13 +70,16 @@ cscope.*
>  /rtcp/xfs_rtcp
>  /spaceman/xfs_spaceman
>  /scrub/xfs_scrub
> -/scrub/xfs_scrub@.service
>  /scrub/xfs_scrub_all
> -/scrub/xfs_scrub_all.cron
> -/scrub/xfs_scrub_all.service
> -/scrub/xfs_scrub_fail@.service
> +/scrub/xfs_scrub_fail
> +/scrub/*.cron
> +/scrub/*.service
>  
>  # generated crc files
>  /libfrog/crc32selftest
>  /libfrog/crc32table.h
>  /libfrog/gen_crc32table
> +
> +# docs
> +/man/man8/mkfs.xfs.8
> +/man/man8/xfs_scrub_all.8
> -- 
> 2.44.1
> 
>