diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-02-02 10:29:30 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-02-02 10:33:55 -0500 |
| commit | fc716b10604146af1eb12bfb4f10a04ab2946fd4 (patch) | |
| tree | 99eb0acd76e46558e01a8dcdac3e8e3adeff87d5 /usr/src | |
| parent | 1c15c8c54fbf8344904d3935475e5cf7f7a3b2eb (diff) | |
| download | illumos-joyent-fc716b10604146af1eb12bfb4f10a04ab2946fd4.tar.gz | |
Post-merge cleanup.
Includes early version of illumos#13490 and workaround for illumos#13492
Also includes manifest and driver_aliases corrections from this and one
prior merge.
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/ast/Makefile.ast | 3 | ||||
| -rw-r--r-- | usr/src/cmd/ast/Makefile.astmsg | 4 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/driver_aliases | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/usr/src/cmd/ast/Makefile.ast b/usr/src/cmd/ast/Makefile.ast index 66d799c6eb..1b7b6f1572 100644 --- a/usr/src/cmd/ast/Makefile.ast +++ b/usr/src/cmd/ast/Makefile.ast @@ -157,7 +157,8 @@ ASTCFLAGS64= $(CCVERBOSE) # # They have trailing whitespace, which is removed. -POST_PROCESS_AST = $(SED) -i ' \ +# XXX WORKAROUND - add "" to the -i because SmartOS backed out illumos#586 +POST_PROCESS_AST = $(SED) -i "" ' \ s^$(SRC)/^^g; \ s/ *$$//; \ /def.* _def_.*_$(MACH64)/s/$(MACH64)/$(HDRGUARD)/; \ diff --git a/usr/src/cmd/ast/Makefile.astmsg b/usr/src/cmd/ast/Makefile.astmsg index c7f911c260..b607c0f95a 100644 --- a/usr/src/cmd/ast/Makefile.astmsg +++ b/usr/src/cmd/ast/Makefile.astmsg @@ -49,8 +49,8 @@ MSGLIBNAME= $(ASTLIB) ASTMSGCATALOG= $(ROOT)/usr/lib/locale/C/LC_MESSAGES/$(MSGLIBNAME) $(DO_BUILD_AST_CATALOGS)ASTMSGCC= \ - PATH="/usr/ast/bin/:/bin:/usr/bin" \ - /usr/bin/ksh93 /usr/ast/bin/msgcc >>msgcc.out 2>&1 + PATH="$(ASTBINDIR):/bin:/usr/bin" \ + /usr/bin/ksh93 $(MSGCC) >>msgcc.out 2>&1 ASTMSGS= $(LIBOBJS:%.o=msgs/%.mso) diff --git a/usr/src/uts/intel/os/driver_aliases b/usr/src/uts/intel/os/driver_aliases index 8aab0f3f4a..2ffdd0b03e 100644 --- a/usr/src/uts/intel/os/driver_aliases +++ b/usr/src/uts/intel/os/driver_aliases @@ -614,6 +614,9 @@ hid "usbif,class3" hme "pci108e,1001" hubd "usbif,class9" hxge "pci108e,aaaa" +i40e "pciex8086,101f" +i40e "pciex8086,104e" +i40e "pciex8086,104f" i40e "pciex8086,1572" i40e "pciex8086,1580" i40e "pciex8086,1581" @@ -624,12 +627,15 @@ i40e "pciex8086,1586" i40e "pciex8086,1589" i40e "pciex8086,158a" i40e "pciex8086,158b" +i40e "pciex8086,15ff" i40e "pciex8086,37ce" i40e "pciex8086,37cf" i40e "pciex8086,37d0" i40e "pciex8086,37d1" i40e "pciex8086,37d2" i40e "pciex8086,37d3" +i40e "pciex8086,cf8" +i40e "pciex8086,d58" i915 "pci8086,2562" i915 "pci8086,2572" i915 "pci8086,2582" @@ -1320,9 +1326,11 @@ oce "pciex19a2,710" ohci "pciclass,0c0310" pcata "pccard,disk" pchtemp "pci8086,2f9,p" +pchtemp "pci8086,6f9,p" pchtemp "pci8086,8ca4,p" pchtemp "pci8086,8c24,p" pchtemp "pci8086,8d24,p" +pchtemp "pci8086,9ca4,p" pchtemp "pci8086,9d31,p" pchtemp "pci8086,9df9,p" pchtemp "pci8086,a1b1,p" |