From 20923a967a468f0e584fd7b212d7e4c9e8b0c72a Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Tue, 14 Aug 2018 11:02:22 +0300 Subject: [PATCH] pkg: remove deps on renamed packages --- usr/src/pkg/manifests/developer-acpi.mf | 1 - usr/src/pkg/manifests/driver-graphics-drm.inc | 1 - usr/src/pkg/manifests/driver-network-axf.inc | 1 - usr/src/pkg/manifests/driver-network-platform.inc | 6 ----- usr/src/pkg/manifests/driver-network-udmf.inc | 1 - usr/src/pkg/manifests/driver-network-upf.inc | 1 - usr/src/pkg/manifests/driver-network-urf.inc | 1 - usr/src/pkg/manifests/driver-usb-usbgem.inc | 1 - usr/src/pkg/manifests/service-security-gss.inc | 8 ------- usr/src/pkg/manifests/system-core-os.mf | 26 ---------------------- usr/src/pkg/manifests/system-file-system-nfs.mf | 1 - ...system-kernel-dynamic-reconfiguration-i86pc.inc | 1 - usr/src/pkg/manifests/system-library.inc | 5 ----- .../system-management-wbem-data-management.mf | 1 - usr/src/pkg/manifests/system-test-cryptotest.mf | 1 - 15 files changed, 56 deletions(-) diff --git a/usr/src/pkg/manifests/developer-acpi.mf b/usr/src/pkg/manifests/developer-acpi.mf index 9a7bfe9ed7..524c176fef 100644 --- a/usr/src/pkg/manifests/developer-acpi.mf +++ b/usr/src/pkg/manifests/developer-acpi.mf @@ -23,4 +23,3 @@ file path=usr/sbin/acpidump mode=0555 file path=usr/sbin/acpixtract mode=0555 file path=usr/share/man/man8/acpidump.8 file path=usr/share/man/man8/acpixtract.8 -depend fmri=driver/x11/xsvc type=require diff --git a/usr/src/pkg/manifests/driver-graphics-drm.inc b/usr/src/pkg/manifests/driver-graphics-drm.inc index 25062c455a..4382ee7941 100644 --- a/usr/src/pkg/manifests/driver-graphics-drm.inc +++ b/usr/src/pkg/manifests/driver-graphics-drm.inc @@ -70,4 +70,3 @@ file path=usr/share/man/man7d/radeon.7d license cr_Sun license=cr_Sun license usr/src/uts/common/io/drm/THIRDPARTYLICENSE \ license=usr/src/uts/common/io/drm/THIRDPARTYLICENSE -depend fmri=pkg:/driver/graphics/agpgart type=require diff --git a/usr/src/pkg/manifests/driver-network-axf.inc b/usr/src/pkg/manifests/driver-network-axf.inc index 23076ea9df..1aa19b53fc 100644 --- a/usr/src/pkg/manifests/driver-network-axf.inc +++ b/usr/src/pkg/manifests/driver-network-axf.inc @@ -38,4 +38,3 @@ driver name=axf clone_perms="axf 0666 root sys" perms="* 0666 root sys" \ file path=kernel/drv/axf group=sys license usr/src/uts/common/io/axf/THIRDPARTYLICENSE \ license=usr/src/uts/common/io/axf/THIRDPARTYLICENSE -depend fmri=driver/usb/usbgem type=require diff --git a/usr/src/pkg/manifests/driver-network-platform.inc b/usr/src/pkg/manifests/driver-network-platform.inc index d94db58e92..132fb42bf6 100644 --- a/usr/src/pkg/manifests/driver-network-platform.inc +++ b/usr/src/pkg/manifests/driver-network-platform.inc @@ -45,9 +45,3 @@ file path=kernel/drv/dnet group=sys file path=usr/share/man/man7d/dnet.7d license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -# elxl moved out of this package, so create a dependency for upgraded systems -depend fmri=driver/network/elxl type=require -# iprb moved out of this package, so create a dependency for upgraded systems -depend fmri=driver/network/iprb type=require -# pcn moved out of this package, so create a dependency for upgraded systems -depend fmri=driver/network/pcn type=require diff --git a/usr/src/pkg/manifests/driver-network-udmf.inc b/usr/src/pkg/manifests/driver-network-udmf.inc index 3236ac1127..6ca44375d8 100644 --- a/usr/src/pkg/manifests/driver-network-udmf.inc +++ b/usr/src/pkg/manifests/driver-network-udmf.inc @@ -24,4 +24,3 @@ driver name=udmf clone_perms="udmf 0666 root sys" perms="* 0666 root sys" \ file path=kernel/drv/udmf group=sys license usr/src/uts/common/io/udmf/THIRDPARTYLICENSE \ license=usr/src/uts/common/io/udmf/THIRDPARTYLICENSE -depend fmri=driver/usb/usbgem type=require diff --git a/usr/src/pkg/manifests/driver-network-upf.inc b/usr/src/pkg/manifests/driver-network-upf.inc index 3f9cfe9676..e5f1741d70 100644 --- a/usr/src/pkg/manifests/driver-network-upf.inc +++ b/usr/src/pkg/manifests/driver-network-upf.inc @@ -92,4 +92,3 @@ driver name=upf clone_perms="upf 0666 root sys" perms="* 0666 root sys" \ file path=kernel/drv/upf group=sys license usr/src/uts/common/io/upf/THIRDPARTYLICENSE \ license=usr/src/uts/common/io/upf/THIRDPARTYLICENSE -depend fmri=driver/usb/usbgem type=require diff --git a/usr/src/pkg/manifests/driver-network-urf.inc b/usr/src/pkg/manifests/driver-network-urf.inc index 01061eb229..1add99123a 100644 --- a/usr/src/pkg/manifests/driver-network-urf.inc +++ b/usr/src/pkg/manifests/driver-network-urf.inc @@ -25,4 +25,3 @@ driver name=urf clone_perms="urf 0666 root sys" perms="* 0666 root sys" \ file path=kernel/drv/urf group=sys license usr/src/uts/common/io/urf/THIRDPARTYLICENSE \ license=usr/src/uts/common/io/urf/THIRDPARTYLICENSE -depend fmri=driver/usb/usbgem type=require diff --git a/usr/src/pkg/manifests/driver-usb-usbgem.inc b/usr/src/pkg/manifests/driver-usb-usbgem.inc index 64149f4747..234a180ef6 100644 --- a/usr/src/pkg/manifests/driver-usb-usbgem.inc +++ b/usr/src/pkg/manifests/driver-usb-usbgem.inc @@ -18,4 +18,3 @@ dir path=kernel/misc group=sys file path=kernel/misc/usbgem group=sys mode=0755 license usr/src/uts/common/io/usbgem/THIRDPARTYLICENSE \ license=usr/src/uts/common/io/usbgem/THIRDPARTYLICENSE -depend fmri=driver/usb type=require diff --git a/usr/src/pkg/manifests/service-security-gss.inc b/usr/src/pkg/manifests/service-security-gss.inc index 91282d5e8d..ea15d7c31b 100644 --- a/usr/src/pkg/manifests/service-security-gss.inc +++ b/usr/src/pkg/manifests/service-security-gss.inc @@ -43,11 +43,3 @@ file path=usr/share/man/man4/mech.4 file path=usr/share/man/man5/gss_auth_rules.5 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -# -# These dependencies can be removed once there is a mechanism in place -# to configure gss plugins, rather than delivering a fully populated -# etc/gss/mech file. -# -depend fmri=service/security/kerberos-5 type=require -depend fmri=system/library/security/gss/diffie-hellman type=require -depend fmri=system/library/security/gss/spnego type=require diff --git a/usr/src/pkg/manifests/system-core-os.mf b/usr/src/pkg/manifests/system-core-os.mf index ed8ac8b1ff..159aeb8e1c 100644 --- a/usr/src/pkg/manifests/system-core-os.mf +++ b/usr/src/pkg/manifests/system-core-os.mf @@ -1416,12 +1416,6 @@ link path=usr/spool target=../var/spool link path=usr/tmp target=../var/tmp link path=var/ld/32 target=. link path=var/ld/64 target=$(ARCH64) -depend fmri=library/libedit type=require -depend fmri=library/libressl type=require -# -# Depend on terminfo data. -# -depend fmri=library/ncurses type=require # # Depend on kernel # @@ -1431,30 +1425,10 @@ depend fmri=pkg:/system/kernel type=require # depend fmri=runtime/perl$(PERL_PKGVERS) type=require # -# intrd uses sun-solaris Perl modules -# -depend fmri=runtime/perl$(PERL_PKGVERS)/module/sun-solaris type=require -# -# Depend on ksh93 -# -depend fmri=shell/ksh93 type=require -# # The boot loader package # depend fmri=system/boot/loader type=require # -# The loadkeys binary needs the keytables. -# -depend fmri=system/data/keyboard/keytables type=require -# -# Depend on zoneinfo data. -# -depend fmri=system/data/zoneinfo type=require -# -# The mailx binary calls /usr/lib/sendmail provided by mailwrapper -# -depend fmri=system/network/mailwrapper type=require -# # The base system should contain /usr/bin/file. There is probably a better # place for this dependency. # diff --git a/usr/src/pkg/manifests/system-file-system-nfs.mf b/usr/src/pkg/manifests/system-file-system-nfs.mf index 7bd4ab3285..eb152f5830 100644 --- a/usr/src/pkg/manifests/system-file-system-nfs.mf +++ b/usr/src/pkg/manifests/system-file-system-nfs.mf @@ -103,4 +103,3 @@ link path=usr/lib/nfs/libmapid.so target=libmapid.so.1 link path=usr/sbin/showmount target=../lib/fs/nfs/showmount user username=unknown ftpuser=false gcos-field="Unknown Remote UID" \ group=unknown uid=96 -depend fmri=system/kernel/secure-rpc type=require diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.inc b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.inc index 16f6926dea..dea698b78c 100644 --- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.inc +++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.inc @@ -60,4 +60,3 @@ license usr/src/cmd/acpihpd/THIRDPARTYLICENSE \ license=usr/src/cmd/acpihpd/THIRDPARTYLICENSE link path=usr/platform/i86pc/lib/cfgadm/$(ARCH64)/sbd.so target=./sbd.so.1 link path=usr/platform/i86pc/lib/cfgadm/sbd.so target=./sbd.so.1 -depend fmri=pkg:/system/kernel/power type=require diff --git a/usr/src/pkg/manifests/system-library.inc b/usr/src/pkg/manifests/system-library.inc index e38bda9c93..92ff5cc850 100644 --- a/usr/src/pkg/manifests/system-library.inc +++ b/usr/src/pkg/manifests/system-library.inc @@ -1117,8 +1117,3 @@ link path=usr/lib/security/pam_unix_session.so target=./pam_unix_session.so.1 link path=usr/lib/security/pkcs11_kernel.so target=./pkcs11_kernel.so.1 link path=usr/lib/security/pkcs11_softtoken.so target=./pkcs11_softtoken.so.1 link path=usr/lib/straddr.so target=./straddr.so.2 -# -# libses.so needs to dlopen(3C) plugins from usr/lib/scsi/plugins/ses/vendor/, -# a dependency which cannot be automatically derived -# -depend fmri=system/library/storage/scsi-plugins type=require diff --git a/usr/src/pkg/manifests/system-management-wbem-data-management.mf b/usr/src/pkg/manifests/system-management-wbem-data-management.mf index 93059305ec..f423834f1e 100644 --- a/usr/src/pkg/manifests/system-management-wbem-data-management.mf +++ b/usr/src/pkg/manifests/system-management-wbem-data-management.mf @@ -35,4 +35,3 @@ file path=usr/lib/libfsmgt.so.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/libfsmgt.so target=./libfsmgt.so.1 -depend fmri=system/library/libdiskmgt type=require diff --git a/usr/src/pkg/manifests/system-test-cryptotest.mf b/usr/src/pkg/manifests/system-test-cryptotest.mf index db54e93b90..94f2212ee3 100644 --- a/usr/src/pkg/manifests/system-test-cryptotest.mf +++ b/usr/src/pkg/manifests/system-test-cryptotest.mf @@ -48,5 +48,4 @@ file path=opt/crypto-tests/tests/pkcs/aes/aes_ecb mode=0555 file path=opt/crypto-tests/tests/pkcs/aes/aes_gcm mode=0555 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -depend fmri=driver/crypto/dprov type=require depend fmri=system/test/testrunner type=require -- 2.11.4.GIT