diff options
| author | Gordon Ross <gordon.w.ross@gmail.com> | 2016-10-31 21:33:00 -0400 |
|---|---|---|
| committer | Gordon Ross <gordon.w.ross@gmail.com> | 2016-12-02 08:16:52 -0500 |
| commit | 01d41e6dacd6f26957b16899a553d152ff46ec0c (patch) | |
| tree | 415ddc79e0e62321492f8d88894e014910d9e12c | |
| parent | c4d05ea67a6a84b9d56cd84ce2a6e1f572b51966 (diff) | |
| download | illumos-joyent-01d41e6dacd6f26957b16899a553d152ff46ec0c.tar.gz | |
7621 Ship devfsadm.h to allow externally-built devlinks modules
Reviewed by: Alexander Pyhalov <alp@rsu.ru>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/cmd/devfsadm/Makefile | 11 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-header.mf | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/usr/src/cmd/devfsadm/Makefile b/usr/src/cmd/devfsadm/Makefile index e008e8fffb..7b2409d131 100644 --- a/usr/src/cmd/devfsadm/Makefile +++ b/usr/src/cmd/devfsadm/Makefile @@ -47,6 +47,11 @@ ROOTETCDEVFILES=$(ETCDEVFILES:%=$(ROOTETCDEV)/%) $(ROOTETCDEV) := DIRMODE= 755 $(ROOTETCDEVFILES) := FILEMODE = 0644 +USRINCLUDEFILES=devfsadm.h +ROOTUSRINCLUDE= $(ROOT)/usr/include +ROOTUSRINCLUDEFILES=$(USRINCLUDEFILES:%=$(ROOTUSRINCLUDE)/%) +$(ROOTUSRINCLUDEFILES) := FILEMODE = 0644 + .KEEP_STATE: all: $(SUBDIRS) $(ETCDEVFILES) @@ -56,7 +61,8 @@ clean lint _msg: $(SUBDIRS) clobber: $(SUBDIRS) $(RM) $(ROOTETCDEVFILES) -install: $(SUBDIRS) $(ROOTETCDEFAULTFILES) $(ROOTETCDEVFILES) +install: $(SUBDIRS) $(ROOTETCDEFAULTFILES) $(ROOTETCDEVFILES) \ + $(ROOTUSRINCLUDEFILES) $(ROOTETCDEV): $(INS.dir) @@ -64,6 +70,9 @@ $(ROOTETCDEV): $(ROOTETCDEV)/% : % $(ROOTETCDEV) $(INS.file) +$(ROOTUSRINCLUDE)/% : % + $(INS.file) + $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf index 236a7ee8f8..658ed3a1b5 100644 --- a/usr/src/pkg/manifests/system-header.mf +++ b/usr/src/pkg/manifests/system-header.mf @@ -355,6 +355,7 @@ file path=usr/include/deflt.h file path=usr/include/des/des.h file path=usr/include/des/desdata.h file path=usr/include/des/softdes.h +file path=usr/include/devfsadm.h file path=usr/include/device_info.h file path=usr/include/devid.h file path=usr/include/devmgmt.h |