diff options
| author | John Levon <levon@movementarian.org> | 2019-11-25 12:07:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-25 12:07:54 +0000 |
| commit | def8eb24e347b55aeaeb27f7e650cafc9ad35a5f (patch) | |
| tree | 79dfa77d8915e1e84f042d6117de4fbdb2913b10 | |
| parent | b1de1f2a45499c8253ae8a15ee908707846efcc4 (diff) | |
| download | illumos-joyent-def8eb24e347b55aeaeb27f7e650cafc9ad35a5f.tar.gz | |
OS-8053 OS-8049 needs further fixes (#237)
Reviewed by: Tim Foster <tim.foster@joyent.com>
Approved by: Tim Foster <tim.foster@joyent.com>
| -rw-r--r-- | usr/src/Makefile.testarchive | 1 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/developer-build-make.mf | 10 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-test-smartostest.mf | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/usr/src/Makefile.testarchive b/usr/src/Makefile.testarchive index fe995d9be7..1f557cf3d3 100644 --- a/usr/src/Makefile.testarchive +++ b/usr/src/Makefile.testarchive @@ -17,6 +17,7 @@ # into the test archive deliverable. # TEST_IPS_MANIFEST_FILES = \ + developer-build-make.mf \ system-bhyve-tests.mf \ system-dtrace-tests.mf \ system-file-system-zfs-tests.mf \ diff --git a/usr/src/pkg/manifests/developer-build-make.mf b/usr/src/pkg/manifests/developer-build-make.mf index 0a7bc175b1..7186b9617d 100644 --- a/usr/src/pkg/manifests/developer-build-make.mf +++ b/usr/src/pkg/manifests/developer-build-make.mf @@ -10,6 +10,7 @@ # # Copyright 2015, Richard Lowe. +# Copyright 2019 Joyent, Inc. set name=pkg.fmri value=pkg:/developer/build/make@$(PKGVERS) set name=pkg.description value="Parallel make(1) build tool" @@ -17,9 +18,18 @@ set name=pkg.summary value="Parallel make(1) build tool" set name=info.classification \ value="org.opensolaris.category.2008:Development/Source Code Management" set name=variant.arch value=$(ARCH) +dir path=usr/ccs +dir path=usr/ccs/bin +dir path=usr/ccs/lib +dir path=usr/lib/$(ARCH64) +dir path=usr/share +dir path=usr/share/lib dir path=usr/share/lib/make +dir path=usr/share/man dir path=usr/share/man/man1 dir path=usr/share/man/man1s +dir path=usr/xpg4 +dir path=usr/xpg4/bin file path=usr/bin/make mode=0555 file path=usr/lib/$(ARCH64)/libmakestate.so.1 file path=usr/lib/libmakestate.so.1 diff --git a/usr/src/pkg/manifests/system-test-smartostest.mf b/usr/src/pkg/manifests/system-test-smartostest.mf index 30905b9c98..21bc4cbd1a 100644 --- a/usr/src/pkg/manifests/system-test-smartostest.mf +++ b/usr/src/pkg/manifests/system-test-smartostest.mf @@ -45,8 +45,6 @@ file path=usr/bin/ctfmerge mode=0555 # so we need to redeliver isaexec in order to create the # proto area correctly. file path=usr/lib/isaexec -# Needed by make_test -file path=usr/bin/make mode=0555 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL |