summaryrefslogtreecommitdiff
path: root/usr/src/pkg
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2021-09-30 11:05:05 +0300
committerToomas Soome <tsoome@me.com>2021-10-16 00:33:08 +0300
commita0fbb7fb6838a78ac78444267878638832a983f3 (patch)
tree8399daf4aff6449ee9181a0421abb897aa205ea4 /usr/src/pkg
parent9e11eb24108a4735199cb20067ce66706c492016 (diff)
downloadillumos-joyent-a0fbb7fb6838a78ac78444267878638832a983f3.tar.gz
14124 ztest is looking for zdb in wrong directory
14125 zfs-tests should be built 64-bit only Reviewed by: Yuri Pankov <ypankov@tintri.com> Reviewed by: Klaus Ziegler <klausz@haus-gisela.de> Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr/src/pkg')
-rw-r--r--usr/src/pkg/manifests/system-file-system-zfs-tests.mf18
1 files changed, 4 insertions, 14 deletions
diff --git a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
index d39248a2e4..b2d3d84418 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
+++ b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
@@ -36,7 +36,6 @@ dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
dir path=usr group=sys
dir path=usr/bin
-$(i386_ONLY)dir path=usr/bin/$(ARCH32)
dir path=usr/bin/$(ARCH64)
dir path=usr/include
dir path=usr/include/sys
@@ -45,27 +44,18 @@ dir path=usr/lib
dir path=usr/lib/devfsadm group=sys
dir path=usr/lib/devfsadm/linkmod group=sys
dir path=usr/sbin
-$(i386_ONLY)dir path=usr/sbin/$(ARCH32)
dir path=usr/sbin/$(ARCH64)
driver name=zut perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/zut group=sys
file path=kernel/drv/zut.conf group=sys
-$(i386_ONLY)file path=usr/bin/$(ARCH32)/zlook mode=0555
-$(i386_ONLY)file path=usr/bin/$(ARCH32)/ztest mode=0555
-file path=usr/bin/$(ARCH64)/zlook mode=0555
-file path=usr/bin/$(ARCH64)/ztest mode=0555
file path=usr/bin/raidz_test mode=0555
+file path=usr/bin/zlook mode=0555
file path=usr/bin/zloop mode=0555
+file path=usr/bin/ztest mode=0555
file path=usr/include/sys/fs/zut.h
file path=usr/lib/devfsadm/linkmod/SUNW_zut_link.so group=sys
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/zhack mode=0555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/zinject mode=0555
-file path=usr/sbin/$(ARCH64)/zhack mode=0555
-file path=usr/sbin/$(ARCH64)/zinject mode=0555
-hardlink path=usr/bin/zlook target=../../usr/lib/isaexec
-hardlink path=usr/bin/ztest target=../../usr/lib/isaexec
-hardlink path=usr/sbin/zhack target=../../usr/lib/isaexec
-hardlink path=usr/sbin/zinject target=../../usr/lib/isaexec
+file path=usr/sbin/zhack mode=0555
+file path=usr/sbin/zinject mode=0555
legacy pkg=SUNWonzfs desc="ZFS test commands" name="ZFS unbundled utilities"
legacy pkg=SUNWonzfsr desc="ZFS test driver" name="ZFS unbundled driver"
license cr_Sun license=cr_Sun