From: Pádraig Brady <P@draigBrady.com>
Date: Sun, 24 Jun 2018 22:33:06 +0000 (-0700)
Subject: maint: avoid false positive in src/fs-magic-compare
X-Git-Tag: v8.30~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07df260421066a465891d8b970aa899766ea6db5;p=thirdparty%2Fcoreutils.git

maint: avoid false positive in src/fs-magic-compare

* src/local.mk (fs_normalize_perl_subst): `make src/fs-magic-compare`
was reporting incorrectly that AFS was not being handled.
Add a mapping to our KAFS identifier.
* .gitignore: Add intermediate files from `make src/fs-magic-compare`
---

diff --git a/.gitignore b/.gitignore
index 63faf89566..a74a9f1dc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,6 +170,9 @@
 /src/coreutils_shebangs
 /src/cu-progs.mk
 /src/fs-latest-magic.h
+/src/fs-def
+/src/fs-kernel-magic
+/src/fs-magic
 /src/libsinglebin_*.a
 /src/make-prime-list
 /src/primes.h
diff --git a/src/local.mk b/src/local.mk
index 4e8cbf98e5..7a587bbb0c 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -523,6 +523,7 @@ fs_normalize_perl_subst =			\
   -e 's/MINIX2_SUPER_MAGIC2\b/MINIX_V2_30/;'	\
   -e 's/MINIX3_SUPER_MAGIC\b/MINIX_V3/;'	\
   -e 's/CIFS_MAGIC_NUMBER/CIFS/;'		\
+  -e 's/AFS_FS/KAFS/;'				\
   -e 's/(_SUPER)?_MAGIC//;'			\
   -e 's/\s+0x(\S+)/" 0x" . uc $$1/e;'		\
   -e 's/(\s+0x)(\X{3})\b/$${1}0$$2/;'		\