The patch is for the master branch and not openafs-1.8.x. The change process is master is done first then 1.8.x if applicable. The patch will need to be tweaked slightly for 1.8.x, as you noted the doc/process/code-style-guide.md file isn't present in 1.8.x.
-- Cheyenne Wills cwi...@sinenomine.net On Mon, 21 Apr 2025 16:31:37 -0400 Eric Matlis <emat...@nd.edu> wrote: > When I try to apply this most recent patch, it fails here: > > matlis@aspire:~/Downloads/z.openafs-patched/openafs-1.8.13.2$ patch > -p1 <d065da8.diff > patching file acinclude.m4 > can't find file to patch at input line 67 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/doc/process/code-style-guide.md > b/doc/process/code-style-guide.md > |index a2c4dd8..ab0b24f 100644 > |--- a/doc/process/code-style-guide.md > |+++ b/doc/process/code-style-guide.md > -------------------------- > File to patch: > > Even after expanding the .doc.tar.gz, I don't see this file: > doc/process/code-style-guide.md > > The sources I'm trying to patch are the 1.8.13.2 tar files at > openafs.org. ********************************************** > Eric Matlis > Associate Research Professor > 114 Hessert Laboratory > Aerospace and Mechanical Engineering > University of Notre Dame > Notre Dame, IN > 574-631-6054 > > > On Mon, Apr 21, 2025 at 3:35 PM Cheyenne Wills <cwi...@sinenomine.net> > wrote: > > > I've pushed a change to gerrit that addresses this problem > > (https://gerrit.openafs.org/16367). The change will need to go > > through the normal review process. > > > > -- > > Cheyenne Wills > > cwi...@sinenomine.net > > > > > > > > On Fri, 18 Apr 2025 11:43:15 -0400 > > Eric Matlis <emat...@nd.edu> wrote: > > > Dear developers- > > > > > > patches https://gerrit.openafs.org/#/c/16277/ and > > > https://gerrit.openafs.org/#/c/16276/1 fail to fix > > > openafs-1.8.13.2 for compilation under Fedora 42 and kernel > > > 6.14.2-300. The error I get using rpmbuild is: > > > > > > iomgr.c:50:23: error: ‘bool’ cannot be defined via ‘typedef’ > > > 50 | typedef unsigned char bool; > > > | ^~~~ > > > iomgr.c:50:23: note: ‘bool’ is a keyword with ‘-std=c23’ onwards > > > iomgr.c:50:1: warning: useless type name in empty declaration > > > 50 | typedef unsigned char bool; > > > > > > This was after applying the patches manually with "patch -p1 < > > > patchfile" to the source code extracted from the bunzip2 tar file, > > > recreating the tar file, executing the procedure to turn tar files > > > into a src rpm, and issuing "rpmbuild --rebuild xxx.src.rpm". > > > > > > Let me know if I can provide any other information. > > > > > > Thank you and please advise, > > > Eric > > > > > > ********************************************** > > > Eric Matlis > > > Associate Research Professor > > > 114 Hessert Laboratory > > > Aerospace and Mechanical Engineering > > > University of Notre Dame > > > Notre Dame, IN > > > 574-631-6054 > > > > _______________________________________________ OpenAFS-devel mailing list OpenAFS-devel@openafs.org https://lists.openafs.org/mailman/listinfo/openafs-devel
