msnfs41client: Patches for Win11/WDK and building on NFS+misc, 2025-09-18
Posted by Anonymous on Thu 18th Sep 2025 15:34
raw | new post

From 65b055f33567bc48cb9adeccfc5dadd8c9580245 Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu, 18 Sep 2025 13:32:36 +0200
Subject: [PATCH 1/2] cygwin: Workaround for Inf2Cat.exe unable to handle
 temporary files on case-sensitive filesystems

Add workaround for WDK for Win10's
"C:\Program Files (x86)\Windows Kits\10\bin\x86\Inf2Cat.exe" inability to
handle temporary files on case-sensitive filesystems (e.g. traditional NFS,
inf2cat.exe generates
"L:\builds\bash_build1\tmpdir\WST\9dfc3e1a-e76a-41c8-bc53-5c8782355689\000",
but then tries to open it again as
"L:\builds\bash_build1\tmpdir\wst\9dfc3e1a-e76a-41c8-bc53-5c8782355689\000").

Reported-by: Aurelien Couderc <aurelien.couderc2002@gmail.com>
Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 cygwin/Makefile.install | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
index ea3dc0f..7f27cbd 100644
--- a/cygwin/Makefile.install
+++ b/cygwin/Makefile.install
@@ -72,9 +72,18 @@ installdest:
        # workaround for coreutils 9.5-1 /bin/cp bug stuck in an endless loop with compressed files
        chattr -V -c $(VS_BUILD_DIR)/nfs41_driver.*
        cp $(VS_BUILD_DIR)/nfs41_driver.*       $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
-       # Copy kernel driver INF file and generate signature catalog
+       # Copy kernel driver INF file
        cp $(PROJECT_BASEDIR_DIR)/nfs41rdr.inf  $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
-       (cd "$(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/" && '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x86/Inf2Cat.exe' /driver:. /os:10_X86,10_X64,10_VB_ARM64)
+       # generate signature catalog
+       # (inf2cat.exe cannot handle case-sensitive filesystems like NFS for temporary files, so we reset TMP&co)
+       ( \
+               cd "$(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/" && \
+               if [[ "$$(/usr/lib/csih/getVolInfo . | awk '/FILE_CASE_SENSITIVE_SEARCH/ { print $$3 }')" == "TRUE" ]] ; then \
+                       printf "# case-sensitive filesystem, resetting TMP TMPDIR TEMP to /tmp\n" ; \
+                       export TMP=/tmp TMPDIR=/tmp TEMP=/tmp ; \
+               fi && \
+               '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x86/Inf2Cat.exe' /driver:. /os:10_X86,10_X64,10_VB_ARM64 \
+       )
        cp $(PROJECT_BASEDIR_DIR)/etc_netconfig $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
        cp $(PROJECT_BASEDIR_DIR)/ms-nfs41-idmap.conf           $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
        cp $(CYGWIN_MAKEFILE_DIR)/devel/msnfs41client.bash      $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/msnfs41client
--
2.51.0

From 4df7bdea61d36c0ff3c27c3039cf3f739ac346c4 Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu, 18 Sep 2025 14:01:02 +0200
Subject: [PATCH 2/2] cygwin: Fix make installdest, cannot find inf2cat.exe on
 Win11

Fix make installdest, cannot find inf2cat.exe on Win11.
WDK for Windows 11 uses a different path for inf2cat.exe than
Windows 10. Instead of hardcoding a specific path let
/usr/bin/find pick a suitable inf2cat.exe.

Reported-by: Lionel Cons <Lionelcons1972@gmail.com>
Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 cygwin/Makefile.install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
index 7f27cbd..337014e 100644
--- a/cygwin/Makefile.install
+++ b/cygwin/Makefile.install
@@ -77,12 +77,14 @@ installdest:
        # generate signature catalog
        # (inf2cat.exe cannot handle case-sensitive filesystems like NFS for temporary files, so we reset TMP&co)
        ( \
+               inf2catbin="$$(find '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin' -iname inf2cat.exe | head -n 1)" && \
                cd "$(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/" && \
                if [[ "$$(/usr/lib/csih/getVolInfo . | awk '/FILE_CASE_SENSITIVE_SEARCH/ { print $$3 }')" == "TRUE" ]] ; then \
                        printf "# case-sensitive filesystem, resetting TMP TMPDIR TEMP to /tmp\n" ; \
                        export TMP=/tmp TMPDIR=/tmp TEMP=/tmp ; \
                fi && \
-               '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x86/Inf2Cat.exe' /driver:. /os:10_X86,10_X64,10_VB_ARM64 \
+               set -o xtrace ; \
+               "$$inf2catbin" /driver:. /os:10_X86,10_X64,10_VB_ARM64 \
        )
        cp $(PROJECT_BASEDIR_DIR)/etc_netconfig $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
        cp $(PROJECT_BASEDIR_DIR)/ms-nfs41-idmap.conf           $(DESTDIR)/$(CYGWIN_BASEPATH)/lib/msnfs41client/.
--
2.51.0