diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-07 13:07:27 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-07 13:07:27 +0000 |
| commit | 8af2cc9f404037fc70d217d328172e2f24f441eb (patch) | |
| tree | ff3485d50708b2ecddcbeae8a2d8280f4999af6d /usr/src/cmd/fs.d | |
| parent | 6fb307ce14869b1c3684d0948a7844194c69b5bd (diff) | |
| parent | 9890ff8357a674572254e0be06b175a1e8eab4b0 (diff) | |
| download | illumos-joyent-8af2cc9f404037fc70d217d328172e2f24f441eb.tar.gz | |
[illumos-gate merge]
commit 9890ff8357a674572254e0be06b175a1e8eab4b0
10028 loader: implement framebuffer console
10029 common/font: create shared font.c
10030 import pnglite into usr/src/common/pnglite
8918 loader.efi: add vesa edid support
10031 loader: import tem for loader console
10032 loader: implement tem utf-8 support
10033 ficl: add simple gfx words
10034 loader: use term-drawrect for menu frame
10035 loader: add alpha blending for gfx_fb
10036 ficl: add fb-putimage
10037 loader: add illumos.png logo
10038 loader: replace gop and vesa with framebuffer
10039 loader: build rules for new font setup
10040 loader: gfx use GOP Blt() function in visual_io callbacks
commit f33b666290305a2b2c134d23cbd1e70e06bf36fd
7796 uts: ldterm default to utf-8
commit adc2b73db62a4506a57dfd1ce89bcadc4a60a29d
7784 uts: console input should support Unicode
commit 1f5207b7604fb44407eb4342aff613f7c4508508
10063 basic support for smatch
10153 checkpaths shouldn't check packaging exceptions
commit c0455f334914631f42eb41177d677e2820ee6506
9478 etdump: Add the etdump utility for dumping El Torito boot catalog information.
commit c62757b2b8b6c26589d7704d0ff20beb107fcd9a
10154 zfs: cast between incompatible function types
commit 781f142d2ae880bb893875d2a114552171a5c3e5
10064 loader: zfs reader should not probe partitionless disks
commit 8a06b3d6467c15646e663c05086378f16288af85
10155 ip: cast between incompatible function types
commit c5749750a3e052f1194f65a303456224c51dea63
10157 sgs/libld: cast between incompatible function types
commit 5e90af26eb6ed2206c2a5f5131a1f3c377d6e8c4
10158 sgs/rtld: cast between incompatible function types
commit adc04c2d55dd20cc6a0622f1147c0b084cdc3099
10159 libc: cast between incompatible function types
commit 9419bc2fc61b54b25a4e45211d31fcb920ff67cc
10162 Sun/Solaris/Kstat: cast between incompatible function types
Conflicts:
usr/src/tools/env/illumos.sh
Diffstat (limited to 'usr/src/cmd/fs.d')
| -rw-r--r-- | usr/src/cmd/fs.d/smbclnt/test/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/cmd/fs.d/ufs/mkfs/Makefile | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/usr/src/cmd/fs.d/smbclnt/test/Makefile b/usr/src/cmd/fs.d/smbclnt/test/Makefile index 64b626f5a4..affd6d9a00 100644 --- a/usr/src/cmd/fs.d/smbclnt/test/Makefile +++ b/usr/src/cmd/fs.d/smbclnt/test/Makefile @@ -22,6 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # Copyright 2013 Nexenta Systems, Inc. All rights reserved. +# Copyright (c) 2019, Joyent, Inc. # include $(SRC)/cmd/Makefile.cmd @@ -43,7 +44,7 @@ INST_CMDS = $(PROG:%=$(TESTDIR)/%) CPPFLAGS += -I../../../../uts/common CPPFLAGS += -I../../../../lib/libsmbfs -LDLIBS += -R '$$ORIGIN/../../../usr/lib' +LDLIBS += -R'$$ORIGIN/../../../usr/lib' LDLIBS += -lsmbfs LINTLIBS= -L$(ROOTLIB) -lsmbfs @@ -51,6 +52,9 @@ CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable CSTD= $(CSTD_GNU99) +# not linted +SMATCH=off + LINTFLAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2 # CLOBBERFILES += $(LIBPROG) diff --git a/usr/src/cmd/fs.d/ufs/mkfs/Makefile b/usr/src/cmd/fs.d/ufs/mkfs/Makefile index 6b10524058..1df1d8c86d 100644 --- a/usr/src/cmd/fs.d/ufs/mkfs/Makefile +++ b/usr/src/cmd/fs.d/ufs/mkfs/Makefile @@ -22,6 +22,8 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright (c) 2019, Joyent, Inc. +# FSTYPE= ufs LIBPROG= mkfs @@ -30,6 +32,8 @@ ATTMK= $(LIBPROG) include ../../Makefile.fstype include ../Makefile.roll +CPPFLAGS += -I../../ + OBJS= $(LIBPROG).o $(ROLLOBJS) $(FSLIB) SRCS= $(LIBPROG).c $(ROLLSRCS) $(FSLIBSRC) MKFSOBJS= mkfs.o @@ -39,6 +43,9 @@ CERRWARN += -_gcc=-Wno-unused-variable CERRWARN += -_gcc=-Wno-empty-body CERRWARN += -_gcc=-Wno-uninitialized +# can't hack main() ! +SMATCH = off + # for messaging catalog # POFILE= mkfs.po |