rovema.kpaste.net RSS- From 1c351a822c3b3d49005c3b220825cd56d38399ef Mon Sep 17 00:00:00 2001
- From: Roland Mainz <roland.mainz@nrubsig.org>
- Date: Mon, 29 Sep 2025 18:44:58 +0200
- Subject: [PATCH] cygwin: Fix inf2cat.exe-related build failure on
- case-sensitive filesystems
- Fix (another) inf2cat.exe-related build failure on case-sensitive
- filesystems. It seems that inf2cat makes paths all-lowercase, which causes
- issues if the path contains an uppercase string like "ARM64".
- Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
- ---
- cygwin/Makefile.install | 22 +++++++++++-----------
- cygwin/devel/msnfs41client.bash | 6 +++---
- 2 files changed, 14 insertions(+), 14 deletions(-)
- diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
- index 4124928..137f6c8 100644
- --- a/cygwin/Makefile.install
- +++ b/cygwin/Makefile.install
- @@ -31,7 +31,7 @@ installdest:
- mkdir -p $(DESTDIR)/lib/msnfs41client
- mkdir -p $(DESTDIR)/lib/msnfs41client/i686
- if [[ "$(VS_BUILD_DIR_X64)" != '' ]] ; then mkdir -p $(DESTDIR)/lib/msnfs41client/x64 ; fi
- - if [[ "$(VS_BUILD_DIR_ARM64)" != '' ]] ; then mkdir -p $(DESTDIR)/lib/msnfs41client/ARM64 ; fi
- + if [[ "$(VS_BUILD_DIR_ARM64)" != '' ]] ; then mkdir -p $(DESTDIR)/lib/msnfs41client/arm64 ; fi
- mkdir -p $(DESTDIR)/etc
- mkdir -p $(DESTDIR)/usr/src/msnfs41client
- mkdir -p $(DESTDIR)/usr/share/man/man1
- @@ -80,17 +80,17 @@ installdest:
- if [[ -f "$(VS_BUILD_DIR_ARM64)/nfs41_driver.sys" ]] ; then \
- # workaround for coreutils 9.5-1 /bin/cp bug stuck in an endless loop with compressed files \
- chattr -V -c $(VS_BUILD_DIR_ARM64)/nfs41_driver.* ; \
- - cp $(VS_BUILD_DIR_ARM64)/nfs41_driver.* $(DESTDIR)/lib/msnfs41client/ARM64/. ; \
- - cp $(VS_BUILD_DIR_ARM64)/nfsd.* $(DESTDIR)/lib/msnfs41client/ARM64/. ; \
- - cp $(VS_BUILD_DIR_ARM64)/libtirpc.* $(DESTDIR)/lib/msnfs41client/ARM64/. ; \
- - cp $(VS_BUILD_DIR_ARM64)/nfs_install.* $(DESTDIR)/lib/msnfs41client/ARM64/. ; \
- + cp $(VS_BUILD_DIR_ARM64)/nfs41_driver.* $(DESTDIR)/lib/msnfs41client/arm64/. ; \
- + cp $(VS_BUILD_DIR_ARM64)/nfsd.* $(DESTDIR)/lib/msnfs41client/arm64/. ; \
- + cp $(VS_BUILD_DIR_ARM64)/libtirpc.* $(DESTDIR)/lib/msnfs41client/arm64/. ; \
- + cp $(VS_BUILD_DIR_ARM64)/nfs_install.* $(DESTDIR)/lib/msnfs41client/arm64/. ; \
- fi ; \
- - cp $(VS_BUILD_DIR_ARM64)/nfs_mount.* $(DESTDIR)/lib/msnfs41client/ARM64/. ; \
- - cp $(VS_BUILD_DIR_ARM64)/nfs41_np.* $(DESTDIR)/lib/msnfs41client/ARM64/. ; \
- + cp $(VS_BUILD_DIR_ARM64)/nfs_mount.* $(DESTDIR)/lib/msnfs41client/arm64/. ; \
- + cp $(VS_BUILD_DIR_ARM64)/nfs41_np.* $(DESTDIR)/lib/msnfs41client/arm64/. ; \
- fi
- # Copy kernel driver INF file and generate signature catalog
- # (inf2cat.exe cannot handle case-sensitive filesystems like NFS for temporary files, so we reset TMP&co)
- - for infdir in "i686" "x64" "ARM64" ; do \
- + for infdir in "i686" "x64" "arm64" ; do \
- [[ -f "$(DESTDIR)/lib/msnfs41client/$${infdir}/nfs41_driver.sys" ]] || continue ; \
- ( \
- cp "$(PROJECT_BASEDIR_DIR)/nfs41rdr.inf" "$(DESTDIR)/lib/msnfs41client/$${infdir}/." && \
- @@ -190,8 +190,8 @@ installdest:
- if [[ "$(VS_BUILD_DIR_ARM64)" != '' ]] ; then \
- cp \
- "$$(find "$${vsbasepath}/Community" -ipath '*/arm64/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \
- - "$(DESTDIR)/lib/msnfs41client/ARM64/." ; \
- - cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/arm64/ucrt/ucrtbased.dll' "$(DESTDIR)/lib/msnfs41client/ARM64/." ; \
- + "$(DESTDIR)/lib/msnfs41client/arm64/." ; \
- + cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/arm64/ucrt/ucrtbased.dll' "$(DESTDIR)/lib/msnfs41client/arm64/." ; \
- fi
- @ printf "# Set file flags\n"
- (cd $(DESTDIR)/bin/ && chmod a+rx *.exe)
- @@ -201,7 +201,7 @@ installdest:
- (cd $(DESTDIR)/lib/msnfs41client/x64 && chmod a+rx *.exe *.dll) ; \
- fi
- if [[ "$(VS_BUILD_DIR_ARM64)" != '' ]] ; then \
- - (cd $(DESTDIR)/lib/msnfs41client/ARM64 && chmod a+rx *.exe *.dll) ; \
- + (cd $(DESTDIR)/lib/msnfs41client/arm64 && chmod a+rx *.exe *.dll) ; \
- fi
- @printf '\n'
- diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash
- index 704b306..2fbf2cd 100755
- --- a/cygwin/devel/msnfs41client.bash
- +++ b/cygwin/devel/msnfs41client.bash
- @@ -177,7 +177,7 @@ function nfsclient_install
- case "${uname_m}" in
- 'x86_64')
- if [[ "${uname_s}" == *-ARM64 ]] ; then
- - kernel_platform='ARM64'
- + kernel_platform='arm64'
- else
- kernel_platform='x64'
- fi
- @@ -228,7 +228,7 @@ function nfsclient_install
- ln -f "${platform_dir}/ksh93.x86_64.exe" "../../bin/ksh93.exe"
- ln -f "${platform_dir}/shcomp.x86_64.exe" "../../bin/shcomp.exe"
- ;;
- - 'ARM64')
- + 'arm64')
- if [[ -f "${platform_dir}/ksh93.arm64.exe" ]] ; then
- ln -f "${platform_dir}/ksh93.arm64.exe" "../../bin/ksh93.exe"
- ln -f "${platform_dir}/shcomp.arm64.exe" "../../bin/shcomp.exe"
- @@ -265,7 +265,7 @@ function nfsclient_install
- 'x64')
- ln -f "../../${i}.x86_64.exe" "../../${i}.exe"
- ;;
- - 'ARM64')
- + 'arm64')
- if [[ -f "../../${i}.arm64.exe" ]] ; then
- ln -f "../../${i}.arm64.exe" "../../${i}.exe"
- else
- --
- 2.51.0
0001-cygwin-Fix-inf2cat.exe-related-build-failure-on-case.patch
Posted by Anonymous on Tue 30th Sep 2025 19:27
raw | new post
Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.