[PATCH v4 0/2] Minor fixes for xfsprogs

[PATCH v4 0/2] Minor fixes for xfsprogs

[Andrey Albershteyn]

Hi,

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

v4:
- Explicitly list m4/ files instead of shell globbing
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   |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

-- 
2.44.1

[PATCH v4 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.

Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

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

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

[Christoph Hellwig]

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

[PATCH v4 2/2] xfsprogs: update gitignore

[Andrey Albershteyn]

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

Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com>
---
 .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 v4 2/2] xfsprogs: update gitignore

[Christoph Hellwig]

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>