diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-21 11:43:51 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-21 11:43:51 +0000 |
| commit | de1c7a865adeab38b51e5c0db5058e61469b322c (patch) | |
| tree | 898a230006c801195b396aa68892d1296d8c549e /usr/src/pkg/manifests/system-data-hardware-registry.mf | |
| parent | 69ac6c001ab11b88fdfc6b13fcc344154a268056 (diff) | |
| parent | 51396a8ee7fb52fe0ab33bfe7b4f495ad431904a (diff) | |
| download | illumos-joyent-de1c7a865adeab38b51e5c0db5058e61469b322c.tar.gz | |
[illumos-gate merge]
commit 51396a8ee7fb52fe0ab33bfe7b4f495ad431904a
13083 Enable gate builds with OpenJDK 11
commit fd147c98dbdbc9e5ac99fa51cb608e8eeb1f16f1
13168 reality should reflect the mac_prop_id_t comment
commit 3626423cd8fd36c60b866e625aff599f055c7dc3
13167 Update hwdata to 2020.9.15
Conflicts:
usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile
Diffstat (limited to 'usr/src/pkg/manifests/system-data-hardware-registry.mf')
| -rw-r--r-- | usr/src/pkg/manifests/system-data-hardware-registry.mf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/pkg/manifests/system-data-hardware-registry.mf b/usr/src/pkg/manifests/system-data-hardware-registry.mf index 779d1613e3..19e8cb6130 100644 --- a/usr/src/pkg/manifests/system-data-hardware-registry.mf +++ b/usr/src/pkg/manifests/system-data-hardware-registry.mf @@ -25,7 +25,7 @@ # set name=pkg.fmri \ - value=pkg:/system/data/hardware-registry@2020.2.22,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) + value=pkg:/system/data/hardware-registry@2020.9.15,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) set name=pkg.description \ value="ASCII databases describing various PCI, USB and other hardware" set name=pkg.summary value="Hardware data files" |