diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-02-17 11:18:01 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-02-17 11:18:01 -0500 |
| commit | 6b5cbdc877c63887c7f97b6d8f95fc833c906550 (patch) | |
| tree | d63a0c474d67f2af1ad63d22affdbcf587bcc290 /manifest | |
| parent | 226e0abadbf2adba4a444e9c65cadbff340be638 (diff) | |
| parent | 22028508fd28d36ff74dc02c5774a8ba1f0db045 (diff) | |
| download | illumos-joyent-6b5cbdc877c63887c7f97b6d8f95fc833c906550.tar.gz | |
[illumos-gate merge]
commit 22028508fd28d36ff74dc02c5774a8ba1f0db045
14480 loader: restructure loader source tree
commit 94afd1448ba04525848cf1165d8deec88a124035
14479 SMB testoplock broken after 13515 (fix check_rtime)
commit 4d723c3fe851d72cc2dc241f5a1777f9e3e85b87
14479 SMB testoplock broken after 13515
commit 0a34963c38fe21eee84ebab010996317731a5171
14475 Recursive death in libfakekernel assfail after 12396
commit 6ce41887bdf3c5c43465fd94dffe1b4acd302afe
14499 i86xpv/unix: variable 'val' is uninitialized
commit dfc4fe31363cc213fe0423dc162bc08298c796cd
14473 ps: only build 64-bit ps
Conflicts:
manifest
usr/src/boot/efi/loader/Makefile.com
usr/src/boot/forth/Makefile
usr/src/boot/i386/loader/Makefile
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -2511,7 +2511,6 @@ f usr/bin/amd64/prctl 0555 root bin f usr/bin/amd64/preap 0555 root bin f usr/bin/amd64/prstat 0555 root bin f usr/bin/amd64/prun 0555 root bin -f usr/bin/amd64/ps 0555 root bin f usr/bin/amd64/psecflags 0555 root bin f usr/bin/amd64/psig 0555 root bin f usr/bin/amd64/pstack 0555 root bin @@ -2824,7 +2823,7 @@ f usr/bin/profiles 0555 root bin f usr/bin/projects 0555 root bin h usr/bin/prstat=usr/lib/isaexec h usr/bin/prun=usr/lib/isaexec -h usr/bin/ps=usr/lib/isaexec +f usr/bin/ps 0555 root bin h usr/bin/psecflags=usr/lib/isaexec h usr/bin/psig=usr/lib/isaexec h usr/bin/pstack=usr/lib/isaexec @@ -21439,13 +21438,12 @@ s usr/src=share/src s usr/tmp=../var/tmp d usr/ucb 0755 root bin d usr/ucb/amd64 0755 root bin -f usr/ucb/amd64/ps 0555 root bin f usr/ucb/df 0755 root bin d usr/ucb/i86 0755 root bin f usr/ucb/ls 0755 root bin s usr/ucb/more=../bin/more s usr/ucb/page=../bin/more -h usr/ucb/ps=usr/lib/isaexec +h usr/ucb/ps=usr/bin/ps f usr/ucb/shutdown 0755 root bin f usr/ucb/touch 0755 root bin s usr/ucb/uptime=../bin/uptime |