Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OS-8134 Move kbm support tools to /usr/lib/kbm #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OS-8134 Move kbm support tools to /usr/lib/kbm #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ include $(PWD)/../../../build.env

STRAP_AREA = $(PWD)/../../../proto.strap
CC = $(STRAP_AREA)/usr/bin/gcc
CP = /bin/cp
AR = /usr/bin/ar
LN = /bin/ln
RM = /bin/rm
Expand All @@ -25,7 +26,7 @@ PROTOINC = $(DESTDIR)/usr/include
INSTALL = /usr/sbin/install
ELFWRAP = /usr/bin/elfwrap

_PROGS = kbmd kbmadm reset-piv
_PROGS = kbmd kbmadm reset-piv unlock
_STATIC_LIBS = common.a pivy.a

PROGS = $(_PROGS:%=out/%)
Expand Down Expand Up @@ -100,14 +101,14 @@ KBMD_LIBS = \

KBMD_DIR = /usr/lib/kbm
KBMD_PLUGIN_DIR = $(KBMD_DIR)/plugins
KBMD_PLUGINS = triton unlock kbm-plugin-1
KBMD_PLUGINS = triton kbm-plugin-1

out/kbmd: LDLIBS += $(KBMD_LIBS)
# For flockfile and funlockfile
out/kbmd: CPPFLAGS += -D__EXTENSIONS__ -D_REENTRANT

_RESET_PIV_SRCS = reset-piv.c
RESET_PIV_SRCS = $(_RESET_PIV_SRCS:%=reset-piv/%)
RESET_PIV_SRCS = $(_RESET_PIV_SRCS:%=util/%)
RESET_PIV_OBJS = $(RESET_PIV_SRCS:%.c=%.o) kbmd/piv-bunyan.o
RESET_PIV_LIBS = \
out/pivy.a \
Expand Down Expand Up @@ -180,8 +181,9 @@ PIVY_A_OBJS = \
_DEST_PROGS = /usr/sbin/pivy-tool \
/usr/sbin/pivy-box \
/usr/sbin/kbmadm \
/usr/sbin/reset-piv \
/usr/lib/kbm/kbmd \
/usr/lib/kbm/reset-piv \
/usr/lib/kbm/unlock \
/lib/svc/manifest/system/kbmd.xml \
/lib/svc/method/kbmd \
/usr/share/man/man1m/kbmd.1m \
Expand Down Expand Up @@ -298,6 +300,9 @@ $(DESTDIR)$(KBMD_PLUGIN_DIR)/kbm-plugin-1: $(DESTDIR)$(KBMD_PLUGIN_DIR)/triton

install: all $(DEST_PROGS) $(DEST_DIRS) $(DEST_PLUGINS)

out/unlock: util/unlock
$(CP) util/unlock $@

manifest:
cp manifest $(DESTDIR)/$(DESTNAME)

Expand Down
4 changes: 2 additions & 2 deletions manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ f lib/svc/method/kbmd 0555 root bin
f usr/sbin/pivy-tool 0555 root bin
f usr/sbin/pivy-box 0555 root bin
f usr/sbin/kbmadm 0555 root bin
f usr/sbin/reset-piv 0555 root bin
d usr/lib/kbm 0755 root bin
d usr/lib/kbm/plugins 0755 root sys
f usr/lib/kbm/kbmd 0555 root bin
f usr/lib/kbm/plugins/triton 0555 root bin
s usr/lib/kbm/plugins/kbm-plugin-1=triton
f usr/lib/kbm/plugins/unlock 0555 root bin
f usr/lib/kbm/reset-piv 0555 root bin
f usr/lib/kbm/unlock 0555 root bin
f usr/share/man/man1m/kbmd.1m 0444 root bin
f usr/share/man/man1m/kbmadm.1m 0444 root bin
0 reset-piv/reset-piv.c → util/reset-piv.c
View file
Open in desktop
File renamed without changes.
0 plugins/unlock → util/unlock
View file
Open in desktop
File renamed without changes.