Re: Enable building wsmoused on arm64 and armv7
Hi, Frederic Cambus wrote on Thu, May 28, 2020 at 10:44:59PM +0200: > On Thu, May 28, 2020 at 10:52:44AM -0600, Theo de Raadt wrote: >> -MANSUBDIR= i386 amd64 alpha >> +MANSUBDIR= i386 amd64 arm64 armv7 alpha >> >> Actually, I suggest making this a MI man page. Delete that line, >> and see where the files land. I'll adjust sets. Good idea. > Yes, makes sense. Just commited the change, MANSUBDIR is now gone. > The man page ends up in /usr/share/man/man8 as expected. Thanks for doing that. In the medium to long term, i hope to improve support for pages that apply to several, but not all architectures. I have some ideas how to make that much simpler to use and more consistent, but haven't fully made up my mind yet. I isn't urgent, so there is no hurry, and i hope to get it right the first time rather than experimenting back and forth. In the meantime, there is indeed nothing wrong with making pages that apply to many arches simply MI. In case you are interested in some details: Stuff like this isn't ideal: $ cd /usr/share/man/ $ ls -al man8/*/wsmoused.8 -r--r--r-- 1 root bin 5958 May 27 16:38 man8/alpha/wsmoused.8 -r--r--r-- 1 root bin 5958 May 27 16:38 man8/amd64/wsmoused.8 -r--r--r-- 1 root bin 5958 May 27 16:38 man8/i386/wsmoused.8 So there is was one copy of the file page per arch, it wasn't even hardlinked. Of course, the waste of space hardly matters, but since we got rid years ago of identifying additional *names* of pages by putting those names names into the file system, identifying *arches* by file names now feels archaic at best. It also has practical downsides, for example: $ man -k wsmoused wsmoused(8/alpha) - wsmouse daemon wsmoused(8/amd64) - wsmouse daemon wsmoused(8/i386) - wsmouse daemon So, apropos(1) made me believe there might be three different versions, while they are actually all the same page. Compare to this where different pages actually do exist: $ ls -al $(man -fw cpu) -r--r--r-- 1 root bin 3115 May 27 16:38 /usr/share/man/man4/amd64/cpu.4 -r--r--r-- 1 root bin 8411 May 27 16:38 /usr/share/man/man4/hppa/cpu.4 -r--r--r-- 1 root bin 3881 May 27 16:38 /usr/share/man/man4/i386/cpu.4 Consequently, "man -af wsmoused" printed the same page three times, which felt ugly and confusing. What i hope to ultimately teach it is to show the page only once *and*, at the same time, to clearly indicate which arches it applies to, without needing requiring any complicated syntax or code. Yours, Ingo
Re: Enable building wsmoused on arm64 and armv7
On Thu, May 28, 2020 at 10:52:44AM -0600, Theo de Raadt wrote: > -MANSUBDIR= i386 amd64 alpha > +MANSUBDIR= i386 amd64 arm64 armv7 alpha > > Actually, I suggest making this a MI man page. Delete that line, and see > where the files land. I'll adjust sets. Yes, makes sense. Just commited the change, MANSUBDIR is now gone. The man page ends up in /usr/share/man/man8 as expected.
Re: Enable building wsmoused on arm64 and armv7
> Date: Thu, 28 May 2020 18:45:52 +0200
> From: Frederic Cambus
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: inline
>
> Hi tech@,
>
> Here is a diff to enable building wsmoused on arm64 and armv7.
>
> Builds and works correctly on my CubieBoard2.
>
> Comments? OK?
ok kettenis@
> Index: usr.sbin/wsmoused/Makefile
> ===
> RCS file: /cvs/src/usr.sbin/wsmoused/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- usr.sbin/wsmoused/Makefile16 Jul 2014 20:07:03 - 1.7
> +++ usr.sbin/wsmoused/Makefile28 May 2020 16:35:14 -
> @@ -1,6 +1,7 @@
> #$OpenBSD: Makefile,v 1.7 2014/07/16 20:07:03 okan Exp $
>
> -.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" ||\
> +.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
> +${MACHINE} == "arm64" || ${MACHINE} == "armv7" || \
> ${MACHINE} == "alpha"
>
> PROG=wsmoused
> @@ -13,6 +14,6 @@ NOPROG=yes
> .endif
>
> MAN= wsmoused.8
> -MANSUBDIR= i386 amd64 alpha
> +MANSUBDIR= i386 amd64 arm64 armv7 alpha
>
> .include
>
>
Re: Enable building wsmoused on arm64 and armv7
-MANSUBDIR= i386 amd64 alpha +MANSUBDIR= i386 amd64 arm64 armv7 alpha Actually, I suggest making this a MI man page. Delete that line, and see where the files land. I'll adjust sets.
Enable building wsmoused on arm64 and armv7
Hi tech@,
Here is a diff to enable building wsmoused on arm64 and armv7.
Builds and works correctly on my CubieBoard2.
Comments? OK?
Index: usr.sbin/wsmoused/Makefile
===
RCS file: /cvs/src/usr.sbin/wsmoused/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- usr.sbin/wsmoused/Makefile 16 Jul 2014 20:07:03 - 1.7
+++ usr.sbin/wsmoused/Makefile 28 May 2020 16:35:14 -
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.7 2014/07/16 20:07:03 okan Exp $
-.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" ||\
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
+${MACHINE} == "arm64" || ${MACHINE} == "armv7" || \
${MACHINE} == "alpha"
PROG= wsmoused
@@ -13,6 +14,6 @@ NOPROG=yes
.endif
MAN= wsmoused.8
-MANSUBDIR= i386 amd64 alpha
+MANSUBDIR= i386 amd64 arm64 armv7 alpha
.include
