tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rump: import rump client utilities

Browse Source
This commit is contained in:
Jean-Baptiste Boric 2016-11-26 13:10:04 +01:00
parent 377739cc06
commit 22d09ff4d0
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/sets/lists/minix-base/mi
View File

@ -46,6 +46,7 @@
./bin/readclock minix-base ./bin/readclock minix-base
./bin/rm minix-base ./bin/rm minix-base
./bin/rmdir minix-base ./bin/rmdir minix-base
./bin/rump.dd minix-base rump
./bin/service minix-base ./bin/service minix-base
./bin/setup minix-base ./bin/setup minix-base
./bin/sh minix-base ./bin/sh minix-base
@ -195,6 +196,8 @@
./sbin/ping minix-base ./sbin/ping minix-base
./sbin/poweroff minix-base ./sbin/poweroff minix-base
./sbin/reboot minix-base ./sbin/reboot minix-base
./sbin/rump.ping minix-base rump
./sbin/rump.sysctl minix-base rump
./sbin/shutdown minix-base ./sbin/shutdown minix-base
./sbin/sysctl minix-base ./sbin/sysctl minix-base
./service minix-base ./service minix-base
@ -1212,6 +1215,7 @@
./usr/sbin/postinstall minix-base ./usr/sbin/postinstall minix-base
./usr/sbin/pwd_mkdb minix-base ./usr/sbin/pwd_mkdb minix-base
./usr/sbin/rdate minix-base ./usr/sbin/rdate minix-base
./usr/sbin/rump.traceroute minix-base rump
./usr/sbin/syslogd minix-base ./usr/sbin/syslogd minix-base
./usr/sbin/traceroute minix-base ./usr/sbin/traceroute minix-base
./usr/sbin/unlink minix-base ./usr/sbin/unlink minix-base

11
lib/librumpclient/rumpclient.c
View File

@ -73,10 +73,19 @@ __RCSID("$NetBSD: rumpclient.c,v 1.65 2015/01/17 19:34:50 justin Exp $");
#if defined(__minix) #if defined(__minix)
#define _MTHREADIFY_PTHREADS #define _MTHREADIFY_PTHREADS
#include <minix/mthread.h> #include <minix/mthread.h>
/* XXX: This is a really, really bad idea. */
#include <signal.h>
#undef pthread_sigmask
#define pthread_sigmask sigprocmask
int __libc_thr_sigsetmask_stub(int h, const sigset_t *s, sigset_t *o);
int __libc_thr_sigsetmask_stub(int h, const sigset_t *s, sigset_t *o)
{
return sigprocmask(h, s, o);
}
#else #else
#include <pthread.h> #include <pthread.h>
#endif
#include <signal.h> #include <signal.h>
#endif
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>

1
share/mk/bsd.own.mk
View File

@ -19,6 +19,7 @@ BINMODE?= 755
NONBINMODE?= 644 NONBINMODE?= 644
MANDIR?= /usr/man MANDIR?= /usr/man
BINGRP?= operator BINGRP?= operator
RUMPBINGRP?= operator
MANGRP?= operator MANGRP?= operator
INFOGRP?= operator INFOGRP?= operator
DOCGRP?= operator DOCGRP?= operator

14
share/mk/bsd.prog.mk
View File

@ -378,15 +378,6 @@ LDSTATIC= -dynamic
.endif .endif
.if defined(RUMPPRG) .if defined(RUMPPRG)
. if defined(__MINIX)
PROG= ${RUMPPRG}
PROGS= ${RUMPPRG}
. if defined(SRCS)
SRCS+= ${PROG}_hostops.c
. else
SRCS= ${PROG}.c ${PROG}_hostops.c
. endif
.else
PROG= ${RUMPPRG} PROG= ${RUMPPRG}
. ifndef CRUNCHEDPROG . ifndef CRUNCHEDPROG
. if (${MKRUMP} != "no") . if (${MKRUMP} != "no")
@ -407,7 +398,11 @@ SRCS.rump.${PROG}= ${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}
. endif . endif
. if (${MKRUMP} != "no") . if (${MKRUMP} != "no")
DPSRCS+= ${PROG}_rumpops.c ${RUMPSRCS} DPSRCS+= ${PROG}_rumpops.c ${RUMPSRCS}
.if defined(__MINIX)
LDADD.rump.${PROG}+= -lrumpclient -lmthread
.else
LDADD.rump.${PROG}+= -lrumpclient LDADD.rump.${PROG}+= -lrumpclient
.endif
DPADD.rump.${PROG}+= ${LIBRUMPCLIENT} DPADD.rump.${PROG}+= ${LIBRUMPCLIENT}
MAN.rump.${PROG}= # defined but feeling empty MAN.rump.${PROG}= # defined but feeling empty
_RUMPINSTALL.rump.${PROG}=# defined _RUMPINSTALL.rump.${PROG}=# defined
@ -417,7 +412,6 @@ PROGS= ${PROG}
CPPFLAGS+= -DCRUNCHOPS CPPFLAGS+= -DCRUNCHOPS
. endif . endif
.endif .endif
.endif
.if defined(PROG) .if defined(PROG)
_CCLINK?= ${CC} ${_CCLINKFLAGS} _CCLINK?= ${CC} ${_CCLINKFLAGS}