diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-10-04 12:05:13 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-10-04 12:05:13 +0000 |
| commit | 20ee10e3437cbf62da85738dbb8b02d4aab50dbe (patch) | |
| tree | 5fe538356671f4d95c5b23a5152f73527eeb2065 /manifest | |
| parent | f408efb3f96c6de895719901f007f0bc2c6d795d (diff) | |
| parent | 41f1e5ce90cd52781080a1c5e7aa689846400e74 (diff) | |
| download | illumos-joyent-20ee10e3437cbf62da85738dbb8b02d4aab50dbe.tar.gz | |
[illumos-gate merge]
commit 41f1e5ce90cd52781080a1c5e7aa689846400e74
8422 uts: basic UEFI support for illumos
commit 3e76f9d6851ef6c63217178eb67278ec2809b944
8609 want a position independent CRT
Conflicts:
usr/src/cmd/cron/Makefile
usr/src/lib/common/i386/crtn.s
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4700,7 +4700,7 @@ f usr/lib/amd64/crt1.o 0644 root bin f usr/lib/amd64/crti.o 0644 root bin f usr/lib/amd64/crtn.o 0644 root bin f usr/lib/amd64/libficl-sys.so.4.1.0 0755 root bin -f usr/lib/amd64/gcrt1.o 0644 root bin +h usr/lib/amd64/gcrt1.o=usr/lib/amd64/crt1.o d usr/lib/amd64/gss 0755 root bin f usr/lib/amd64/gss/dh1024-0.so.1 0755 root bin s usr/lib/amd64/gss/dh1024-0.so=dh1024-0.so.1 @@ -5533,7 +5533,7 @@ f usr/lib/fwflash/verify/ses-SUN.so 0755 root bin s usr/lib/fwflash/verify/sgen-LSILOGIC.so=ses-SUN.so s usr/lib/fwflash/verify/sgen-SUN.so=ses-SUN.so f usr/lib/fwflash/verify/tavor-MELLANOX.so 0755 root bin -f usr/lib/gcrt1.o 0644 root bin +h usr/lib/gcrt1.o=usr/lib/crt1.o f usr/lib/getoptcvt 0555 root bin f usr/lib/gmsgfmt 0555 root bin d usr/lib/gss 0755 root bin |