OS-8666

SmartOS specifics for illumos#17393

Status:
Resolved
Created:
2025-06-03T15:16:31.674-0400
Updated:
2025-06-17T14:59:18.515-0400

Description

17393 improves .gitignore coverage, but there are some things downstream here in illumos-joyent that need to adjust to the new world order, including one that, honestly, probably should just get upstreamed.

Comments (6)

Dan McDonald commented on 2025-06-04T08:58:25.807-0400:

A peek at git status in a post-built illumos-joyent is telling:

smartos-build(projects/illumos)[0]% git status
On branch master
Your branch is up to date with 'origin/master'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        illumos.sh
        on-closed-bin-nd.i386.tar.bz2
        on-closed-bin.i386.tar.bz2
        usr/src/cmd/Adm/sun/issue
        usr/src/cmd/altexec/altexec
        usr/src/cmd/column/column
        usr/src/cmd/dtrace/test/tst/common/ustack/tst.unpriv.exe
        usr/src/cmd/fs.d/hyprlofs/hlcfg/hlcfg
        usr/src/cmd/fs.d/hyprlofs/mount/mount
        usr/src/cmd/fs.d/lxproc/mount
        usr/src/cmd/machid/machid
        usr/src/cmd/nicstat/nicstat
        usr/src/cmd/perl/contrib/Sun/Solaris/Intrs/i386/Intrs.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/i386/Kstat.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/i386/Lgrp.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Project/i386/Project.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Task/i386/Task.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Utils/i386/Utils.c
        usr/src/cmd/stat/vfsstat/vfsstat
        usr/src/cmd/stat/ziostat/ziostat
        usr/src/cmd/vndadm/test/tst/ioctl/create.attach.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.attachnolink.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.badlinkname.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.doublelink.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.gioctlattach.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.link.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.linkexists.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.ngioctlfault.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.nopriv1.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.nopriv2.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.nopriv3.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.nopriv4.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.olink.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.olinknopriv.exe
        usr/src/cmd/vndadm/test/tst/ioctl/create.rmenolink.exe
        usr/src/cmd/vndadm/test/tst/ioctl/tst.attachrdonly.exe
        usr/src/cmd/vndadm/test/tst/ioctl/tst.badioctl.exe
        usr/src/cmd/vndadm/test/tst/ioctl/tst.basicopenctl.exe
        usr/src/cmd/vndadm/test/tst/ioctl/tst.gioctlfault.exe
        usr/src/cmd/vndadm/test/tst/ioctl/tst.gioctlnattach.exe
        usr/src/cmd/vndadm/test/tst/ioctl/tst.openctlbadflags.exe
        usr/src/cmd/vndadm/test/tst/lib/create.badlink.exe
        usr/src/cmd/vndadm/test/tst/lib/create.badpropid.exe
        usr/src/cmd/vndadm/test/tst/lib/create.badpropsize.exe
        usr/src/cmd/vndadm/test/tst/lib/create.badzone.exe
        usr/src/cmd/vndadm/test/tst/lib/create.basic.exe
        usr/src/cmd/vndadm/test/tst/lib/create.enomem.exe
        usr/src/cmd/vndadm/test/tst/lib/create.frameioeagain.exe
        usr/src/cmd/vndadm/test/tst/lib/create.open.exe
        usr/src/cmd/vndadm/test/tst/lib/create.propiter.exe
        usr/src/cmd/vndadm/test/tst/lib/create.proprdonly.exe
        usr/src/cmd/vndadm/test/tst/lib/err.badclose.exe
        usr/src/cmd/vndadm/test/tst/lib/tst.badopen.exe
        usr/src/cmd/vndadm/test/tst/lib/tst.strerror.exe
        usr/src/cmd/vndadm/test/tst/lib/tst.strsyserror.exe
        usr/src/cmd/vndadm/vndadm
        usr/src/cmd/vndstat/vndstat
        usr/src/cmd/zhyve/zhyve
        usr/src/cmd/zoneadmd/amd64/zoneadmd
        usr/src/lib/brand/lx/zone/lx_boot_zone_debian
        usr/src/lib/brand/lx/zone/lx_boot_zone_docker
        usr/src/lib/brand/lx/zone/lx_boot_zone_redhat
        usr/src/lib/brand/lx/zone/lx_boot_zone_suse
        usr/src/lib/brand/lx/zone/lx_boot_zone_ubuntu
        usr/src/lib/brand/lx/zone/lx_boot_zone_void
        usr/src/lib/brand/lx/zone/lx_install
        usr/src/lib/brand/lx/zone/lx_uninstall
        usr/src/lib/brand/lx/zone/poststate
        usr/src/lib/brand/lx/zone/prestate
        usr/src/lib/brand/lx/zone/statechange
        usr/src/lib/libbunyan/amd64/bunyan_provider_impl.h
        usr/src/lib/libbunyan/i386/bunyan_provider_impl.h
        usr/src/lib/libdtrace/common/mac.d
        usr/src/lib/libdtrace/common/mac.sed
        usr/src/lib/libresolv2_joy/include/os_version.h
        usr/src/lib/libresolv2_joy/include/port_ipv6.h
        usr/src/test/os-tests/tests/tmpfs/tmpfs_full
        usr/src/test/util-tests/tests/bunyan/btest
        usr/src/test/zfs-tests/cmd/watch_dir/watch_dir
        usr/src/tools/man/man

nothing added to commit but untracked files present (use "git add" to track)

Dan McDonald commented on 2025-06-04T14:43:34.509-0400:

There are remaining diffs after the low-hanging-fruit fixes:

On branch OS-8666
Your branch is up to date with 'origin/OS-8666'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        usr/src/cmd/perl/contrib/Sun/Solaris/Intrs/i386/Intrs.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/i386/Kstat.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/i386/Lgrp.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Project/i386/Project.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Task/i386/Task.c
        usr/src/cmd/perl/contrib/Sun/Solaris/Utils/i386/Utils.c
        usr/src/cmd/zoneadmd/amd64/zoneadmd
        usr/src/cmd/zoneadmd/i386/zoneadmd

nothing added to commit but untracked files present (use "git add" to track)

The perl ones will probably get added as part of this fix until we decide to ship a 64-bit platform perl.

The zoneadmd ones are the subject of OS-8667, and maybe until OS-8667 is sorted out we will include these as well.

Dan McDonald commented on 2025-06-06T15:52:24.498-0400:

Current state of things. Remaining noise will be addressed by OS-8667

smartos-build(projects/illumos)[0]% git status
On branch OS-8666
Your branch is up to date with 'origin/OS-8666'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        usr/src/cmd/zoneadmd/amd64/zoneadmd
        usr/src/cmd/zoneadmd/i386/zoneadmd

nothing added to commit but untracked files present (use "git add" to track)
smartos-build(projects/illumos)[0]% 

Dan McDonald commented on 2025-06-06T15:54:10.876-0400:

A perl cleanup (losing the i386 ones) is part of a bigger project as it covers at least two repos.

Dan McDonald commented on 2025-06-06T15:58:11.072-0400:

Using OS-8666 in gcc14 builds as a survives-nightly example. Did switch while they are still locally building bootstrap. E.g.:

nuc-build(projects/illumos)[0]% git checkout OS-8666
branch 'OS-8666' set up to track 'origin/OS-8666'.
Switched to a new branch 'OS-8666'
nuc-build(projects/illumos)[0]% git status
On branch OS-8666
Your branch is up to date with 'origin/OS-8666'.

nothing to commit, working tree clean
nuc-build(projects/illumos)[0]% git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
nuc-build(projects/illumos)[0]% git status
On branch master
Your branch is up to date with 'origin/master'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        illumos.sh
        on-closed-bin-nd.i386.tar.bz2
        on-closed-bin.i386.tar.bz2

nothing added to commit but untracked files present (use "git add" to track)
nuc-build(projects/illumos)[0]% git checkout OS-8666
Switched to branch 'OS-8666'
Your branch is up to date with 'origin/OS-8666'.
nuc-build(projects/illumos)[0]% 

Dan McDonald commented on 2025-06-06T17:39:28.524-0400:

Both gcc14 builds whizzed through nighly.sh on this branch without issue:

smartos-build-3(~)[0]% ls gcc14/*stamp
gcc14/0-illumos-stamp    gcc14/0-preflight-stamp  gcc14/0-strap-stamp 
smartos-build-3(~)[0]% 
nuc-build(~)[0]% ls gcc14-DEBUG/*stamp
gcc14-DEBUG/0-illumos-stamp    gcc14-DEBUG/0-strap-stamp 
gcc14-DEBUG/0-preflight-stamp  
nuc-build(~)[0]% 

Related Links