| Message ID | 20140618152906.GW1903@twin.jikos.cz (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 6/18/14, 10:29 AM, David Sterba wrote: > On Thu, Jun 12, 2014 at 09:39:14AM -0500, Eric Sandeen wrote: >>> So what if the mount options are generated from btrfs-mount.txt but >>> installed under btrfs.5.gz name? If there are more section 5 manpages we >>> can make it more generic but for now hardcoding btrfs-mount.* -> >>> btrfs.5. sounds ok to me. >> >> Yeah, that seemed like kind of nasty hard-coding, but I suppose it works >> for now. I wanted to make it more generic, I didn't have a better idea.. > > Added: > > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -85,6 +85,9 @@ install-man: man > $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) > $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir) > $(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir) > + # the source file name of btrfs.5 clashes with section 8 page, but we > + # want to keep the code generic > + mv $(DESTDIR)$(man5dir)/btrfs-mount.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz > $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir) > $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz > > So the MAN5 code is generic, the exception is only at the installation time. > Looks good to me, thanks. -Eric -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 18 June 2014 16:29, David Sterba <dsterba@suse.cz> wrote: > On Thu, Jun 12, 2014 at 09:39:14AM -0500, Eric Sandeen wrote: >> > So what if the mount options are generated from btrfs-mount.txt but >> > installed under btrfs.5.gz name? If there are more section 5 manpages we >> > can make it more generic but for now hardcoding btrfs-mount.* -> >> > btrfs.5. sounds ok to me. >> >> Yeah, that seemed like kind of nasty hard-coding, but I suppose it works >> for now. I wanted to make it more generic, I didn't have a better idea.. > > Added: > > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -85,6 +85,9 @@ install-man: man > $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) > $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir) > $(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir) > + # the source file name of btrfs.5 clashes with section 8 page, but we > + # want to keep the code generic > + mv $(DESTDIR)$(man5dir)/btrfs-mount.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz > $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir) > $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz > > So the MAN5 code is generic, the exception is only at the installation time. > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Hi David, I think you forgot to apply the patch that adds Documentation/btrfs-mount.5.txt before you tagged integration-20140618, man5 (and consequently Documentation) can't be made without it, causing a failed build. make: *** No rule to make target 'btrfs-mount.5.gz', needed by 'man5'. Stop. Any chance of a quick fix and a -2 tag? Cheers, WorMzy -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jun 18, 2014 at 09:59:50PM +0100, WorMzy Tykashi wrote: > I think you forgot to apply the patch that adds > Documentation/btrfs-mount.5.txt before you tagged > integration-20140618, man5 (and consequently Documentation) can't be > made without it, causing a failed build. You're right, sorry. The file was not added after a conflict with git-am and I did not check afterwards. Local build test passed. Updated integration pushed, though it's a bit reduced. The 'next' sub-branch rebase had some suspicious glitch, I need to look closer tomorrow. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 19 June 2014 00:05, David Sterba <dsterba@suse.cz> wrote: > On Wed, Jun 18, 2014 at 09:59:50PM +0100, WorMzy Tykashi wrote: >> I think you forgot to apply the patch that adds >> Documentation/btrfs-mount.5.txt before you tagged >> integration-20140618, man5 (and consequently Documentation) can't be >> made without it, causing a failed build. > > You're right, sorry. The file was not added after a conflict with > git-am and I did not check afterwards. Local build test passed. > Updated integration pushed, though it's a bit reduced. The 'next' > sub-branch rebase had some suspicious glitch, I need to look closer > tomorrow. Thanks for the fast update. :) Good luck battling that glitch! Cheers, WorMzy -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 19, 2014 at 08:43:36AM +0100, WorMzy Tykashi wrote: > > You're right, sorry. The file was not added after a conflict with > > git-am and I did not check afterwards. Local build test passed. > > Updated integration pushed, though it's a bit reduced. The 'next' > > sub-branch rebase had some suspicious glitch, I need to look closer > > tomorrow. > > Thanks for the fast update. :) The next branch merged via format-patch/git-am instead of rebase and did not hit any conflicts. Branch readded and integration pushed with today's tag, without other patches. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -85,6 +85,9 @@ install-man: man $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir) $(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir) + # the source file name of btrfs.5 clashes with section 8 page, but we + # want to keep the code generic + mv $(DESTDIR)$(man5dir)/btrfs-mount.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir) $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz