diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-15 13:44:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-15 13:44:56 +0000 |
| commit | 16d3daed247b1695bbf21679b70086c38d044eb7 (patch) | |
| tree | b6f459dfe48396dbd24f046a2f746892a3d8e630 /usr/src/pkg/manifests/system-boot-loader.mf | |
| parent | 8fe8a39ea9f7811d9c1e2e48a46932561906883f (diff) | |
| parent | a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e (diff) | |
| download | illumos-joyent-16d3daed247b1695bbf21679b70086c38d044eb7.tar.gz | |
[illumos-gate merge]
commit a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e
9472 Add smbutil discon command
commit 4226f635096bf9d814aa9fb335518c4855bbe3a3
6375 Add native name demangling support
commit 83b4671e6262c5aa6b4f9fb5a384b1946dfc2e7f
9664 loader: need UEFI32 support
commit e1bf37b1abeb6653a6e35e2bd6924131cced1efe
9884 cw(1) should use -fpic rather than -Kpic
Conflicts:
usr/src/test/util-tests/tests/Makefile
usr/src/cmd/mdb/common/mdb/mdb_demangle.c
Diffstat (limited to 'usr/src/pkg/manifests/system-boot-loader.mf')
| -rw-r--r-- | usr/src/pkg/manifests/system-boot-loader.mf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/pkg/manifests/system-boot-loader.mf b/usr/src/pkg/manifests/system-boot-loader.mf index 346acbc720..ce0af6a4f7 100644 --- a/usr/src/pkg/manifests/system-boot-loader.mf +++ b/usr/src/pkg/manifests/system-boot-loader.mf @@ -43,7 +43,8 @@ $(i386_ONLY)dir path=usr/share/man $(i386_ONLY)dir path=usr/share/man/man3 $(i386_ONLY)dir path=usr/share/man/man4 $(i386_ONLY)dir path=usr/share/man/man5 -$(i386_ONLY)file path=boot/boot1.efi group=sys mode=0555 +$(i386_ONLY)file path=boot/bootia32.efi group=sys mode=0555 +$(i386_ONLY)file path=boot/bootx64.efi group=sys mode=0555 $(i386_ONLY)file path=boot/cdboot group=sys mode=0444 $(i386_ONLY)file path=boot/defaults/loader.conf group=sys mode=0444 $(i386_ONLY)file path=boot/forth/beadm.4th group=sys mode=0444 @@ -73,9 +74,10 @@ $(i386_ONLY)file path=boot/forth/support.4th group=sys mode=0444 $(i386_ONLY)file path=boot/forth/version.4th group=sys mode=0444 $(i386_ONLY)file path=boot/gptzfsboot group=sys mode=0444 $(i386_ONLY)file path=boot/loader group=sys mode=0444 -$(i386_ONLY)file path=boot/loader.efi group=sys mode=0555 $(i386_ONLY)file path=boot/loader.help group=sys mode=0444 $(i386_ONLY)file path=boot/loader.rc group=sys mode=0444 +$(i386_ONLY)file path=boot/loader32.efi group=sys mode=0555 +$(i386_ONLY)file path=boot/loader64.efi group=sys mode=0555 $(i386_ONLY)file path=boot/pmbr group=sys mode=0444 $(i386_ONLY)file path=boot/pxeboot group=sys mode=0444 $(i386_ONLY)file path=usr/share/man/man4/loader.conf.4 |