Skip to content

Commit 32e17b1

Browse files
danmcddanmcd
authored
Merge branch 'master' into OS-6970
2 parents 7614293 + 5239497 commit 32e17b1

File tree

21,680 files changed

+792768
-1040398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

21,680 files changed

+792768
-1040398
lines changed

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ cscope.po.out
1515
*.pyc
1616
/closed
1717
/illumos.sh
18+
/.vscode
1819
/log
1920
/nightly
2021
/on-closed-bins-nd.i386.tar.bz2
@@ -817,8 +818,6 @@ usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikecert
817818
usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecalgs
818819
usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipsecconf
819820
usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ipseckey
820-
usr/src/cmd/cmd-inet/usr.sbin/kssl/kssladm/kssladm
821-
usr/src/cmd/cmd-inet/usr.sbin/kssl/ksslcfg/ksslcfg
822821
usr/src/cmd/cmd-inet/usr.sbin/ndd
823822
usr/src/cmd/cmd-inet/usr.sbin/nwamadm/nwamadm
824823
usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/nwamcfg

‎Jenkinsfile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66

77
/*
88
* Copyright 2021 Joyent, Inc.
9+
* Copyright 2022 MNX Cloud, Inc.
910
*/
1011

11-
@Library('[email protected].5') _
12+
@Library('[email protected].8') _
1213

1314
pipeline {
1415

1516
agent {
16-
label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +
17-
'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
17+
label 'platform:true && image_ver:21.4.0 && pkgsrc_arch:x86_64 && ' +
18+
'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
1819
}
1920

2021
options {
@@ -38,7 +39,7 @@ pipeline {
3839
}
3940
}
4041
steps {
41-
build(job:'joyent-org/smartos-live/master',
42+
build(job:'TritonDataCenter/smartos-live/master',
4243
wait: false,
4344
parameters: [
4445
text(name: 'CONFIGURE_PROJECTS',
@@ -56,7 +57,7 @@ pipeline {
5657
}
5758
post {
5859
always {
59-
joyMattermostNotification(channel: 'jenkins')
60+
joySlackNotifications(channel: 'jenkins')
6061
}
6162
}
6263
}

‎boot.manifest‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#
1313
# Copyright 2019 Joyent, Inc.
14+
# Copyright 2022 MNX Cloud, Inc.
1415
#
1516

1617
#
@@ -43,10 +44,10 @@ f boot/forth/shortcuts.4th 0444 root sys
4344
f boot/forth/support.4th 0444 root sys
4445
f boot/forth/version.4th 0444 root sys
4546
f boot/gptzfsboot 0444 root sys
46-
f boot/joyent.png 0444 root sys
4747
f boot/loader 0444 root sys
4848
f boot/loader64.efi 0555 root sys
4949
f boot/loader.help 0444 root sys
5050
f boot/loader.rc 0444 root sys
5151
f boot/pmbr 0444 root sys
5252
f boot/triton.png 0444 root sys
53+
f boot/triton-logo.png 0444 root sys

‎exception_lists/check_rtime‎

Lines changed: 61 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
# Copyright 2019 Peter Tribble.
2828
# Copyright 2018 Joyent, Inc.
2929
# Copyright 2020 Oxide Computer Company
30+
# Copyright 2022 Garrett D'Amore <[email protected]>
31+
# Copyright 2022 Tintri by DDN, Inc. All rights reserved.
3032
#
3133

3234
# This file provides exceptions to the usual rules applied to ELF objects by
@@ -112,7 +114,6 @@ UNREF_OBJ unreferenced object=.*/libnetsnmphelpers\.so\..*
112114
# management. Since ksh itself doesn't perform any memory allocations in
113115
# the stub, ldd -U determines that libumem is an unreferenced object.
114116
UNREF_OBJ /libumem\.so\.1.*/usr/bin/(i86|amd64)/r?ksh(93)?\b
115-
UNREF_OBJ /libumem\.so\.1.*/usr/bin/sparcv[79]/r?ksh(93)?\b
116117

117118
# Unused runpaths due to dlopen() use
118119
UNUSED_RPATH /usr/lib/fs/autofs.*\ from\ .automountd
@@ -138,6 +139,7 @@ UNUSED_RPATH /usr/gnu/lib.*\ from\ .*/usr/lib/64/libpython2\..
138139
UNUSED_RPATH /usr/gnu/lib.*\ from\ .*/usr/lib/64/libpython3\..
139140
UNUSED_RPATH /usr/snadm/lib.*\ from\ .*/usr/snadm/lib/libspmicommon\.so\.1
140141
UNUSED_RPATH /usr/gcc/.*/lib.*\ from\ .*
142+
UNUSED_RPATH /usr/gnu/lib.*\ from\ .*libncurses\.so\.5
141143

142144
# Unused runpaths for reasons not captured above
143145
UNUSED_RPATH /usr/lib/smbsrv.*\ from\ .*libsmb\.so\.1 # future needs
@@ -165,10 +167,8 @@ UNREF_OBJ /lib.*\ of\ .*libtspi\.so\.1
165167
UNREF_OBJ /lib.*\ of\ .*libxml2\.so\.2
166168
UNREF_OBJ /lib.*\ of\ .*libxslt\.so\.1
167169
UNREF_OBJ /lib.*\ of\ .*libpq\.so\.4
168-
UNREF_OBJ /lib.*\ of\ .*libpython2\.4\.so\.1\.0
169-
UNREF_OBJ /lib.*\ of\ .*libpython2\.6\.so\.1\.0
170-
UNREF_OBJ /lib.*\ of\ .*libpython2\.7\.so\.1\.0
171-
UNREF_OBJ /lib.*\ of\ .*libpython3\.[56789]m?\.so\.1\.0
170+
UNREF_OBJ /lib.*\ of\ .*libpython2\.[467]\.so\.1\.0
171+
UNREF_OBJ /lib.*\ of\ .*libpython3\.\d+m?\.so\.1\.0
172172
UNREF_OBJ /libgcc_s.*\ of\ .*libstdc\+\+\.so\.6
173173
UNREF_OBJ /libgcc_s.*\ of\ .*libgmodule-2\.0\.so\.0
174174

@@ -234,22 +234,17 @@ FORBIDDEN_DEP usr/lib/netsvc/yp/ypxfrd # C++
234234

235235
# libfakekernel is a test environment, not intended for general use
236236
FORBIDDEN libfakekernel\.so
237+
FORBIDDEN_DEP opt/smbsrv-tests/tests/smb_sid/large_sids_kern
237238
FORBIDDEN_DEP usr/MACH(lib)/libzpool.so.1
238-
FORBIDDEN_DEP usr/bin/amd64/ztest
239-
FORBIDDEN_DEP usr/bin/i86/ztest
239+
FORBIDDEN_DEP usr/bin/ztest
240240
FORBIDDEN_DEP usr/bin/raidz_test
241-
FORBIDDEN_DEP usr/bin/sparcv7/ztest
242-
FORBIDDEN_DEP usr/bin/sparcv9/ztest
243241
FORBIDDEN_DEP usr/lib/MACH(smbfs)/libfknsmb.so.1
244242
FORBIDDEN_DEP usr/lib/MACH(smbfs)/libfksmbfs.so.1
245243
FORBIDDEN_DEP usr/lib/MACH(smbsrv)/libfksmbsrv.so.1
246244
FORBIDDEN_DEP usr/lib/smbsrv/fksmbd
247245
FORBIDDEN_DEP usr/lib/smbsrv/test-msgbuf
248246
FORBIDDEN_DEP usr/lib/smbsrv/testoplock
249-
FORBIDDEN_DEP usr/sbin/amd64/zdb
250-
FORBIDDEN_DEP usr/sbin/i86/zdb
251-
FORBIDDEN_DEP usr/sbin/sparcv7/zdb
252-
FORBIDDEN_DEP usr/sbin/sparcv9/zdb
247+
FORBIDDEN_DEP usr/sbin/zdb
253248

254249
# libucb is intended for legacy compatibility, not general use
255250
FORBIDDEN libucb\.so
@@ -281,16 +276,64 @@ NO_COMMENT ^usr/lib/inet/amd64/in\.iked
281276
NO_COMMENT ^usr/lib/inet/certdb
282277
NO_COMMENT ^usr/lib/inet/certlocal
283278
NO_COMMENT ^usr/lib/inet/certrldb
284-
NO_COMMENT ^usr/lib/inet/sparcv9/in\.iked
285279
NO_COMMENT ^usr/lib/labeld
286280
NO_COMMENT ^usr/lib/libike\.so\.1
287281
NO_COMMENT ^usr/lib/mdb/kvm/amd64/mpt\.so
288282
NO_COMMENT ^usr/lib/mdb/kvm/amd64/nfs\.so
289-
NO_COMMENT ^usr/lib/mdb/kvm/sparcv9/mpt\.so
290-
NO_COMMENT ^usr/lib/mdb/kvm/sparcv9/nfs\.so
291283
NO_COMMENT ^usr/lib/raidcfg/amd64/mpt\.so\.1
292284
NO_COMMENT ^usr/lib/raidcfg/mpt\.so\.1
293-
NO_COMMENT ^usr/lib/raidcfg/sparcv9/mpt\.so\.1
294-
NO_COMMENT ^usr/lib/sparcv9/libike\.so\.1
295285
NO_COMMENT ^usr/sbin/chk_encodings
296286
NO_COMMENT ^usr/xpg4/bin/more
287+
NO_COMMENT ^kernel/drv/amd64/acpi_toshiba
288+
NO_COMMENT ^kernel/drv/amd64/adpu320
289+
NO_COMMENT ^kernel/drv/amd64/atiatom
290+
NO_COMMENT ^kernel/drv/amd64/bcm_sata
291+
NO_COMMENT ^kernel/drv/amd64/glm
292+
NO_COMMENT ^kernel/drv/amd64/intel_nhmex
293+
NO_COMMENT ^kernel/drv/amd64/ixgb
294+
NO_COMMENT ^kernel/drv/amd64/lsimega
295+
NO_COMMENT ^kernel/drv/amd64/marvell88sx
296+
NO_COMMENT ^kernel/drv/amd64/mpt
297+
NO_COMMENT ^kernel/drv/amd64/sdpib
298+
NO_COMMENT ^kernel/drv/amd64/usbser_edge
299+
NO_COMMENT ^kernel/kmdb/amd64/mpt
300+
NO_COMMENT ^kernel/kmdb/amd64/nfs
301+
NO_COMMENT ^kernel/misc/scsi_vhci/amd64/scsi_vhci_f_asym_emc
302+
NO_COMMENT ^kernel/misc/scsi_vhci/amd64/scsi_vhci_f_asym_lsi
303+
NO_COMMENT ^kernel/misc/scsi_vhci/amd64/scsi_vhci_f_sym_emc
304+
NO_COMMENT ^kernel/strmod/amd64/sdpib
305+
NO_COMMENT ^platform/i86pc/kernel/cpu/amd64/cpu_ms\.GenuineIntel\.6\.46
306+
NO_COMMENT ^platform/i86pc/kernel/cpu/amd64/cpu_ms\.GenuineIntel\.6\.47
307+
308+
# ath contains a binary HAL component which contains an incorrect .comment
309+
# section and has a license which forbids modification.
310+
NO_COMMENT ^kernel/drv/amd64/ath
311+
312+
# mdb standalone library versions which are neither delivered nor are real
313+
# shared objects
314+
NO_COMMENT ^usr/lib/amd64/libstanddisasm\.so
315+
NO_COMMENT ^usr/lib/amd64/libstandsaveargs\.so
316+
NO_COMMENT ^usr/lib/amd64/libstanddisasm\.so
317+
NO_COMMENT ^usr/lib/libstanddisasm\.so
318+
319+
# closed binaries predate -ztype=kmod
320+
NOT_KMOD ^kernel/drv/amd64/acpi_toshiba
321+
NOT_KMOD ^kernel/drv/amd64/adpu320
322+
NOT_KMOD ^kernel/drv/amd64/atiatom
323+
NOT_KMOD ^kernel/drv/amd64/bcm_sata
324+
NOT_KMOD ^kernel/drv/amd64/glm
325+
NOT_KMOD ^kernel/drv/amd64/intel_nhmex
326+
NOT_KMOD ^kernel/drv/amd64/ixgb
327+
NOT_KMOD ^kernel/drv/amd64/lsimega
328+
NOT_KMOD ^kernel/drv/amd64/marvell88sx
329+
NOT_KMOD ^kernel/drv/amd64/mpt
330+
NOT_KMOD ^kernel/drv/amd64/sdpib
331+
NOT_KMOD ^kernel/drv/amd64/usbser_edge
332+
NOT_KMOD ^kernel/kmdb/amd64/mpt
333+
NOT_KMOD ^kernel/kmdb/amd64/nfs
334+
NOT_KMOD ^kernel/misc/scsi_vhci/amd64/scsi_vhci_f_asym_emc
335+
NOT_KMOD ^kernel/misc/scsi_vhci/amd64/scsi_vhci_f_asym_lsi
336+
NOT_KMOD ^kernel/misc/scsi_vhci/amd64/scsi_vhci_f_sym_emc
337+
NOT_KMOD ^kernel/strmod/amd64/sdpib
338+
NOT_KMOD ^platform/i86pc/kernel/cpu/amd64/cpu_ms\.GenuineIntel\.6\.46
339+
NOT_KMOD ^platform/i86pc/kernel/cpu/amd64/cpu_ms\.GenuineIntel\.6\.47

‎exception_lists/closed-bins‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
./kernel/drv/amd64/pcn
3939
./kernel/drv/pcser
4040
./kernel/drv/amd64/pcser
41-
./kernel/drv/sparcv9/pcser
4241
./kernel/drv/sdpib
4342
./kernel/drv/usbser_edge
4443
./kernel/kmdb/mpt
@@ -55,16 +54,14 @@
5554
./lib/crypto/kcfd
5655
./lib/libc_i18n.a
5756
./lib/amd64/libc_i18n.a
58-
./lib/sparcv9/libc_i18n.a
5957
./platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.46
6058
./platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.47
61-
./platform/sun4u/kernel/drv/sparcv9/ctsmc
62-
./platform/sun4v/kernel/drv/ncp.conf
63-
./platform/sun4v/kernel/drv/n2cp.conf
6459
./usr/has
6560
./usr/has/bin
6661
./usr/has/bin/patch
6762
./usr/include/sys/agp
63+
./usr/include/sys/lc_core.h
64+
./usr/include/sys/localedef.h
6865
./usr/include/sys/lvm
6966
./usr/include/sys/pcmcia
7067
./usr/include/sys/usb/clients/hwarc
@@ -73,18 +70,13 @@
7370
./usr/kernel
7471
./usr/kernel/strmod
7572
./usr/kernel/strmod/amd64
76-
./usr/kernel/strmod/sparcv9
7773
./usr/kernel/drv
7874
./usr/kernel/drv/amd64
79-
./usr/kernel/drv/sparcv9
8075
./usr/kernel/drv/amd64/llc2
81-
./usr/kernel/drv/sparcv9/llc2
8276
./usr/kernel/drv/llc2.conf
8377
./usr/kernel/drv/llc2
8478
./usr/lib/inet/i86
85-
./usr/lib/inet/sparcv7
8679
./usr/lib/inet/i86/in.iked
87-
./usr/lib/inet/sparcv7/in.iked
8880
./usr/lib/libike.so
8981
./usr/lib/llc2
9082
./usr/lib/llc2/llc2_config
@@ -98,7 +90,6 @@
9890
./usr/lib/locale/iso_8859_1
9991
./usr/lib/locale/iso_8859_1/LC_CTYPE
10092
./usr/lib/locale/iso_8859_1/amd64
101-
./usr/lib/locale/iso_8859_1/sparcv9
10293
./usr/lib/locale/C/locale_description
10394
./usr/lib/localedef
10495
./usr/lib/localedef/extensions

0 commit comments

Comments
 (0)