From 6265851cb0eea0e24c694164ca91635b4d414876 Mon Sep 17 00:00:00 2001 From: "Joshua M. Clulow" Date: Wed, 8 Apr 2020 12:30:48 -0700 Subject: illumos sysroot 20181213 v1 In order to produce a sysroot archive for cross compilation, we need to be able to build binary artefacts from a specific historic version of the gate. In order to build the gate on a modern version of the OS, we must first backport a few minor fixes to the tools and work around some leakage of build system headers into the gate build. We also disable a few components which should not end up in the sysroot. --- exception_lists/packaging | 28 +++ usr/src/cmd/Makefile | 14 -- usr/src/cmd/mandoc/config.h | 4 + usr/src/lib/Makefile | 6 - usr/src/pkg/manifests/diagnostic-latencytop.mf | 43 ----- .../manifests/runtime-perl-module-sun-solaris.mf | 83 --------- usr/src/pkg/manifests/service-hal.mf | 199 --------------------- .../service-storage-media-volume-manager.mf | 68 ------- usr/src/pkg/manifests/system-header.mf | 4 - usr/src/pkg/manifests/system-library-policykit.mf | 50 ------ 10 files changed, 32 insertions(+), 467 deletions(-) delete mode 100644 usr/src/pkg/manifests/diagnostic-latencytop.mf delete mode 100644 usr/src/pkg/manifests/runtime-perl-module-sun-solaris.mf delete mode 100644 usr/src/pkg/manifests/service-hal.mf delete mode 100644 usr/src/pkg/manifests/service-storage-media-volume-manager.mf delete mode 100644 usr/src/pkg/manifests/system-library-policykit.mf diff --git a/exception_lists/packaging b/exception_lists/packaging index da8bc8d90b..112c92b9e6 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -1012,3 +1012,31 @@ lib/sparcv9/llib-lcustr.ln sparc lib/libcustr.so lib/llib-lcustr lib/llib-lcustr.ln + +# +# XXX ignore files we're not building for the sysroot +# +etc/dbus-1 +etc/hal +usr/include/libpolkit +usr/lib/hal +usr/share/man/man1/rmformat.1 +usr/share/man/man1/rmmount.1 +usr/share/man/man1/rmumount.1 +usr/share/man/man1/volcheck.1 +usr/share/man/man1/volrmmount.1 +usr/share/man/man1m/hal-device.1m +usr/share/man/man1m/hal-fdi-validate.1m +usr/share/man/man1m/hal-find-by-capability.1m +usr/share/man/man1m/hal-find-by-property.1m +usr/share/man/man1m/hal-find.1m +usr/share/man/man1m/hal-get-property.1m +usr/share/man/man1m/hal-set-property.1m +usr/share/man/man1m/hald.1m +usr/share/man/man1m/latencytop.1m +usr/share/man/man1m/polkit-is-privileged.1m +usr/share/man/man1m/rmmount.1m +usr/share/man/man1m/rmvolmgr.1m +usr/share/man/man3perl +usr/share/man/man4/fdi.4 +usr/share/man/man5/hal.5 diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile index 37e979d619..9a081848fc 100644 --- a/usr/src/cmd/Makefile +++ b/usr/src/cmd/Makefile @@ -56,7 +56,6 @@ COMMON_SUBDIRS= \ allocate \ availdevs \ lp \ - perl \ Adm \ abi \ adbgen \ @@ -191,7 +190,6 @@ COMMON_SUBDIRS= \ growfs \ grpck \ gss \ - hal \ halt \ head \ hostid \ @@ -228,7 +226,6 @@ COMMON_SUBDIRS= \ kvmstat \ last \ lastcomm \ - latencytop \ ldap \ ldapcachemgr \ lgrpinfo \ @@ -307,7 +304,6 @@ COMMON_SUBDIRS= \ pgrep \ picl \ plimit \ - policykit \ pools \ power \ powertop \ @@ -345,10 +341,7 @@ COMMON_SUBDIRS= \ renice \ rm \ rmdir \ - rmformat \ - rmmount \ rmt \ - rmvolmgr \ roles \ rpcbind \ rpcgen \ @@ -438,8 +431,6 @@ COMMON_SUBDIRS= \ valtools \ vgrind \ vi \ - volcheck \ - volrmmount \ vrrpadm \ vscan \ vt \ @@ -668,9 +659,6 @@ MSGSUBDIRS= \ roles \ rm \ rmdir \ - rmformat \ - rmmount \ - rmvolmgr \ sasinfo \ sbdadm \ scadm \ @@ -716,8 +704,6 @@ MSGSUBDIRS= \ valtools \ vgrind \ vi \ - volcheck \ - volrmmount \ vrrpadm \ vscan \ w \ diff --git a/usr/src/cmd/mandoc/config.h b/usr/src/cmd/mandoc/config.h index 75f62a9339..5f66e96f82 100644 --- a/usr/src/cmd/mandoc/config.h +++ b/usr/src/cmd/mandoc/config.h @@ -2,12 +2,16 @@ #define MANDOC_CONFIG_H #include +#include /* XXX so that O_DIRECTORY is already defined */ #define MAN_CONF_FILE "/etc/man.conf" #define MANPATH_BASE "/usr/share/man" #define MANPATH_DEFAULT "/usr/share/man:/usr/gnu/share/man" #define UTF8_LOCALE "en_US.UTF-8" #define EFTYPE EINVAL +#ifdef O_DIRECTORY +#undef O_DIRECTORY +#endif #define O_DIRECTORY 0 #define HAVE_CMSG_XPG42 0 #define HAVE_DIRENT_NAMLEN 0 diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index 7463954834..dcef7eab87 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -81,7 +81,6 @@ SUBDIRS += \ gss_mechs/mech_dummy \ gss_mechs/mech_krb5 \ gss_mechs/mech_spnego \ - hal \ hbaapi \ iconv_modules \ krb5 \ @@ -254,7 +253,6 @@ SUBDIRS += \ pam_modules \ passwdutil \ pkcs11 \ - policykit \ print \ pylibbe \ pysolaris \ @@ -366,7 +364,6 @@ HDRSUBDIRS= \ ../cmd/sendmail/libmilter \ auditd_plugins \ fm \ - hal \ hbaapi \ libads \ libast \ @@ -486,7 +483,6 @@ HDRSUBDIRS= \ mpapi \ passwdutil \ pkcs11 \ - policykit \ scsi \ smbsrv \ smhba \ @@ -579,7 +575,6 @@ gss_mechs/mech_dh: libgss gss_mechs/mech_dummy: libgss gss_mechs/mech_krb5: libgss libresolv2 pkcs11 libkstat gss_mechs/mech_spnego: gss_mechs/mech_krb5 -hal: dbusdeps krb5: gss_mechs/mech_krb5 libtecla libldap5 libadt_jni: libbsm libadutils: libldap5 libresolv2 @@ -683,7 +678,6 @@ nsswitch: libadutils libidmap libdns_sd libscf libldap5 libsldap pam_modules: libproject passwdutil smbsrv libtsnet libpam libbsm libsecdb passwdutil: libsldap pkcs11: libcryptoutil libgen libuuid -policykit: dbusdeps print: libldap5 libmd5 libsendfile pylibbe: libbe libzfs pysolaris: libsec libidmap diff --git a/usr/src/pkg/manifests/diagnostic-latencytop.mf b/usr/src/pkg/manifests/diagnostic-latencytop.mf deleted file mode 100644 index e7563c4304..0000000000 --- a/usr/src/pkg/manifests/diagnostic-latencytop.mf +++ /dev/null @@ -1,43 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# - -set name=pkg.fmri value=pkg:/diagnostic/latencytop@$(PKGVERS) -set name=pkg.description value="LatencyTOP tool" -set name=pkg.summary value="LatencyTOP tool" -set name=info.classification \ - value="org.opensolaris.category.2008:Applications/System Utilities" -set name=variant.arch value=$(ARCH) -dir path=usr group=sys -dir path=usr/bin -$(i386_ONLY)dir path=usr/bin/$(ARCH32) -dir path=usr/bin/$(ARCH64) -dir path=usr/share/man/man1m -$(i386_ONLY)file path=usr/bin/$(ARCH32)/latencytop mode=0555 -file path=usr/bin/$(ARCH64)/latencytop mode=0555 -file path=usr/share/man/man1m/latencytop.1m -hardlink path=usr/bin/latencytop target=../../usr/lib/isaexec -legacy pkg=SUNWlatencytop desc="LatencyTOP tool" name="LatencyTOP tool" -license cr_Sun license=cr_Sun -license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.mf b/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.mf deleted file mode 100644 index f444a4548a..0000000000 --- a/usr/src/pkg/manifests/runtime-perl-module-sun-solaris.mf +++ /dev/null @@ -1,83 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2014 Racktop Systems. -# Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved. -# - - default mode 0444> - default mode 0555> -set name=pkg.fmri \ - value=pkg:/runtime/perl$(PERL_PKGVERS)/module/sun-solaris@0.5.11,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) -set name=pkg.summary value="Perl $(PERL_VERSION) Sun::Solaris Modules" -set name=info.classification \ - value=org.opensolaris.category.2008:Development/Perl -set name=variant.arch value=$(ARCH) -dir path=usr group=sys -dir path=usr/perl5 -dir path=usr/perl5/$(PERL_VERSION) -dir path=usr/perl5/$(PERL_VERSION)/lib -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH) -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/Sun -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/Sun/Solaris -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Intrs -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Kstat -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Lgrp -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Project -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Task -dir path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Utils -dir path=usr/perl5/$(PERL_VERSION)/lib/Sun -dir path=usr/perl5/$(PERL_VERSION)/lib/Sun/Solaris -dir path=usr/perl5/$(PERL_VERSION)/lib/Sun/Solaris/BSM -dir path=usr/share/man -dir path=usr/share/man/man3perl -file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/Sun/Solaris/Intrs.pm -file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/Sun/Solaris/Kstat.pm -file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/Sun/Solaris/Lgrp.pm -file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/Sun/Solaris/Project.pm -file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/Sun/Solaris/Task.pm -file path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/Sun/Solaris/Utils.pm -file \ - path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Intrs/Intrs.so -file \ - path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Kstat/Kstat.so -file \ - path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Lgrp/Lgrp.so -file \ - path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Project/Project.so -file \ - path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Task/Task.so -file \ - path=usr/perl5/$(PERL_VERSION)/lib/$(PERL_ARCH)/auto/Sun/Solaris/Utils/Utils.so -file path=usr/perl5/$(PERL_VERSION)/lib/Sun/Solaris/BSM/_BSMparse.pm -file path=usr/perl5/$(PERL_VERSION)/lib/Sun/Solaris/Pg.pm -file path=usr/share/man/man3perl/Kstat.3perl -file path=usr/share/man/man3perl/Lgrp.3perl -file path=usr/share/man/man3perl/Project.3perl -file path=usr/share/man/man3perl/Task.3perl -license cr_Sun license=cr_Sun -license usr/src/cmd/perl/THIRDPARTYLICENSE \ - license=usr/src/cmd/perl/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/service-hal.mf b/usr/src/pkg/manifests/service-hal.mf deleted file mode 100644 index 2fdec3d01f..0000000000 --- a/usr/src/pkg/manifests/service-hal.mf +++ /dev/null @@ -1,199 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2012 Nexenta Systems, Inc. All rights reserved. -# - -set name=pkg.fmri value=pkg:/service/hal@$(PKGVERS) -set name=pkg.description \ - value="Hardware Abstraction Layer, HAL (freedesktop.org)" -set name=pkg.summary value="Hardware Abstraction Layer" -set name=info.classification \ - value=org.opensolaris.category.2008:System/Hardware -set name=variant.arch value=$(ARCH) -dir path=etc group=sys variant.opensolaris.zone=global -dir path=etc/dbus-1 variant.opensolaris.zone=global -dir path=etc/dbus-1/system.d variant.opensolaris.zone=global -dir path=etc/hal variant.opensolaris.zone=global -dir path=etc/hal/fdi variant.opensolaris.zone=global -dir path=etc/hal/fdi/information variant.opensolaris.zone=global -dir path=etc/hal/fdi/information/10freedesktop variant.opensolaris.zone=global -dir path=etc/hal/fdi/information/20thirdparty variant.opensolaris.zone=global -dir path=etc/hal/fdi/information/30user variant.opensolaris.zone=global -dir path=etc/hal/fdi/policy variant.opensolaris.zone=global -dir path=etc/hal/fdi/policy/10osvendor variant.opensolaris.zone=global -dir path=etc/hal/fdi/policy/20thirdparty variant.opensolaris.zone=global -dir path=etc/hal/fdi/policy/30user variant.opensolaris.zone=global -dir path=etc/hal/fdi/preprobe variant.opensolaris.zone=global -dir path=etc/hal/fdi/preprobe/10osvendor variant.opensolaris.zone=global -dir path=etc/hal/fdi/preprobe/20thirdparty variant.opensolaris.zone=global -dir path=etc/hal/fdi/preprobe/30user variant.opensolaris.zone=global -dir path=lib variant.opensolaris.zone=global -dir path=lib/svc variant.opensolaris.zone=global -dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global -dir path=lib/svc/manifest/network group=sys variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global -dir path=lib/svc/method variant.opensolaris.zone=global -dir path=usr group=sys -dir path=usr/lib -dir path=usr/lib/$(ARCH64) -dir path=usr/lib/$(ARCH64)/pkgconfig group=other -dir path=usr/lib/hal -dir path=usr/lib/hal/sunos -dir path=usr/lib/pkgconfig group=other -dir path=usr/sbin -dir path=usr/share -dir path=usr/share/lib -dir path=usr/share/lib/xml group=sys -dir path=usr/share/lib/xml/dtd group=sys -dir path=usr/share/man -dir path=usr/share/man/man1m -dir path=usr/share/man/man4 -dir path=usr/share/man/man5 -file path=etc/dbus-1/system.d/hal.conf variant.opensolaris.zone=global -file path=etc/hal/fdi/information/10freedesktop/10-camera-ptp.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi \ - mode=0444 variant.opensolaris.zone=global -file path=etc/hal/fdi/information/10freedesktop/10-usb-music-players.fdi \ - mode=0444 variant.opensolaris.zone=global -file path=etc/hal/fdi/information/10freedesktop/10-usb-pda.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi \ - mode=0444 variant.opensolaris.zone=global -file path=etc/hal/fdi/information/10freedesktop/10-wireless-mice.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/policy/10osvendor/10-cpufreq.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi \ - mode=0444 variant.opensolaris.zone=global -file path=etc/hal/fdi/policy/10osvendor/10-network-attached.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/policy/10osvendor/10-toshiba-buttons.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/policy/10osvendor/20-storage-methods.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/policy/10osvendor/20-zfs-methods.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/preprobe/10osvendor/20-ignore-fixed-storage.fdi \ - mode=0444 variant.opensolaris.zone=global -file path=etc/hal/fdi/preprobe/10osvendor/20-ignore-lofi.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=etc/hal/fdi/preprobe/10osvendor/20-printers.fdi mode=0444 \ - variant.opensolaris.zone=global -file path=lib/svc/manifest/network/network-discovery.xml group=sys mode=0444 \ - variant.opensolaris.zone=global -file path=lib/svc/manifest/system/hal.xml group=sys mode=0444 \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-hal mode=0555 variant.opensolaris.zone=global -file path=lib/svc/method/svc-network-discovery mode=0555 \ - variant.opensolaris.zone=global -file path=usr/lib/$(ARCH64)/libhal-storage.so.1.0.0 -file path=usr/lib/$(ARCH64)/libhal.so.1.0.0 -file path=usr/lib/$(ARCH64)/llib-lhal-storage.ln -file path=usr/lib/$(ARCH64)/llib-lhal.ln -file path=usr/lib/$(ARCH64)/pkgconfig/hal-storage.pc -file path=usr/lib/$(ARCH64)/pkgconfig/hal.pc -file path=usr/lib/hal/hal-functions mode=0555 -file path=usr/lib/hal/hal-is-caller-privileged mode=0555 -file path=usr/lib/hal/hal-storage-cleanup-all-mountpoints mode=0555 -file path=usr/lib/hal/hal-storage-cleanup-mountpoint mode=0555 -file path=usr/lib/hal/hal-storage-closetray mode=0555 -file path=usr/lib/hal/hal-storage-eject mode=0555 -file path=usr/lib/hal/hal-storage-mount mode=0555 -file path=usr/lib/hal/hal-storage-unmount mode=0555 -file path=usr/lib/hal/hal-storage-zpool-export mode=0555 -file path=usr/lib/hal/hal-storage-zpool-import mode=0555 -file path=usr/lib/hal/hal-system-lcd-get-brightness mode=0555 -file path=usr/lib/hal/hal-system-lcd-set-brightness mode=0555 -file path=usr/lib/hal/hal-system-power-hibernate mode=0555 -file path=usr/lib/hal/hal-system-power-reboot mode=0555 -file path=usr/lib/hal/hal-system-power-shutdown mode=0555 -file path=usr/lib/hal/hal-system-power-suspend mode=0555 -file path=usr/lib/hal/hald mode=0555 -file path=usr/lib/hal/hald-addon-acpi mode=0555 -file path=usr/lib/hal/hald-addon-cpufreq mode=0555 -file path=usr/lib/hal/hald-addon-network-discovery mode=0555 -file path=usr/lib/hal/hald-addon-storage mode=0555 -file path=usr/lib/hal/hald-probe-acpi mode=0555 -file path=usr/lib/hal/hald-probe-network-printer mode=0555 -file path=usr/lib/hal/hald-probe-printer mode=0555 -file path=usr/lib/hal/hald-probe-storage mode=0555 -file path=usr/lib/hal/hald-probe-volume mode=0555 -file path=usr/lib/hal/hald-probe-xkb mode=0555 -file path=usr/lib/hal/hald-runner mode=0555 -file path=usr/lib/hal/sunos/hal-system-lcd-get-brightness-sunos mode=0555 -file path=usr/lib/hal/sunos/hal-system-lcd-set-brightness-sunos mode=0555 -file path=usr/lib/hal/sunos/hal-system-power-hibernate-sunos mode=0555 -file path=usr/lib/hal/sunos/hal-system-power-reboot-sunos mode=0555 -file path=usr/lib/hal/sunos/hal-system-power-shutdown-sunos mode=0555 -file path=usr/lib/hal/sunos/hal-system-power-suspend-sunos mode=0555 -file path=usr/lib/libhal-storage.so.1.0.0 -file path=usr/lib/libhal.so.1.0.0 -file path=usr/lib/llib-lhal -file path=usr/lib/llib-lhal-storage -file path=usr/lib/llib-lhal-storage.ln -file path=usr/lib/llib-lhal.ln -file path=usr/lib/pkgconfig/hal-storage.pc -file path=usr/lib/pkgconfig/hal.pc -file path=usr/sbin/hal-device mode=0555 -file path=usr/sbin/hal-fdi-validate mode=0555 -file path=usr/sbin/hal-find-by-capability mode=0555 -file path=usr/sbin/hal-find-by-property mode=0555 -file path=usr/sbin/hal-get-property mode=0555 -file path=usr/sbin/hal-set-property mode=0555 -file path=usr/sbin/lshal mode=0555 -file path=usr/share/lib/xml/dtd/fdi.dtd.1 -file path=usr/share/man/man1m/hal-device.1m -file path=usr/share/man/man1m/hal-fdi-validate.1m -file path=usr/share/man/man1m/hal-find.1m -file path=usr/share/man/man1m/hal-get-property.1m -file path=usr/share/man/man1m/hald.1m -file path=usr/share/man/man4/fdi.4 -file path=usr/share/man/man5/hal.5 -legacy pkg=SUNWhal desc="Hardware Abstraction Layer, HAL (freedesktop.org)" \ - name="Hardware Abstraction Layer" -legacy pkg=SUNWhalr \ - desc="Hardware Abstraction Layer, HAL (freedesktop.org) (Root)" \ - name="Hardware Abstraction Layer (Root)" -license cr_Sun license=cr_Sun -license lic_CDDL license=lic_CDDL -license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE -link path=usr/lib/$(ARCH64)/libhal-storage.so target=./libhal-storage.so.1.0.0 -link path=usr/lib/$(ARCH64)/libhal-storage.so.1 \ - target=./libhal-storage.so.1.0.0 -link path=usr/lib/$(ARCH64)/libhal.so target=./libhal.so.1.0.0 -link path=usr/lib/$(ARCH64)/libhal.so.1 target=./libhal.so.1.0.0 -link path=usr/lib/libhal-storage.so target=./libhal-storage.so.1.0.0 -link path=usr/lib/libhal-storage.so.1 target=./libhal-storage.so.1.0.0 -link path=usr/lib/libhal.so target=./libhal.so.1.0.0 -link path=usr/lib/libhal.so.1 target=./libhal.so.1.0.0 -link path=usr/share/man/man1m/hal-find-by-capability.1m target=hal-find.1m -link path=usr/share/man/man1m/hal-find-by-property.1m target=hal-find.1m -link path=usr/share/man/man1m/hal-set-property.1m target=hal-get-property.1m diff --git a/usr/src/pkg/manifests/service-storage-media-volume-manager.mf b/usr/src/pkg/manifests/service-storage-media-volume-manager.mf deleted file mode 100644 index 945b65c449..0000000000 --- a/usr/src/pkg/manifests/service-storage-media-volume-manager.mf +++ /dev/null @@ -1,68 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2012 Nexenta Systems, Inc. All rights reserved. -# - -set name=pkg.fmri value=pkg:/service/storage/media-volume-manager@$(PKGVERS) -set name=pkg.description value="Non-graphical removable volume manager" -set name=pkg.summary value="Removable volume manager" -set name=info.classification value=org.opensolaris.category.2008:System/Media -set name=variant.arch value=$(ARCH) -dir path=lib variant.opensolaris.zone=global -dir path=lib/svc variant.opensolaris.zone=global -dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global -dir path=lib/svc/manifest/system/filesystem group=sys \ - variant.opensolaris.zone=global -dir path=lib/svc/method variant.opensolaris.zone=global -dir path=usr group=sys -dir path=usr/bin -dir path=usr/lib -dir path=usr/sbin -dir path=usr/share/man/man1 -dir path=usr/share/man/man1m -file path=lib/svc/manifest/system/filesystem/rmvolmgr.xml group=sys mode=0444 \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-rmvolmgr mode=0555 \ - variant.opensolaris.zone=global -file path=usr/bin/rmformat mode=4555 -file path=usr/bin/rmmount mode=0555 -file path=usr/bin/volcheck mode=0555 -file path=usr/bin/volrmmount mode=0555 -file path=usr/lib/rmvolmgr mode=0555 -file path=usr/share/man/man1/rmformat.1 -file path=usr/share/man/man1/rmmount.1 -file path=usr/share/man/man1/volcheck.1 -file path=usr/share/man/man1/volrmmount.1 -file path=usr/share/man/man1m/rmmount.1m -file path=usr/share/man/man1m/rmvolmgr.1m -legacy pkg=SUNWrmvolmgr desc="Non-graphical removable volume manager" \ - name="Removable volume manager" -legacy pkg=SUNWrmvolmgrr desc="Non-graphical removable volume manager (Root)" \ - name="Removable volume manager (Root)" -license cr_Sun license=cr_Sun -license lic_CDDL license=lic_CDDL -link path=usr/bin/rmumount target=./rmmount -link path=usr/sbin/rmmount target=../bin/rmmount -link path=usr/share/man/man1/rmumount.1 target=rmmount.1 diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf index f655696ac6..fd99e68300 100644 --- a/usr/src/pkg/manifests/system-header.mf +++ b/usr/src/pkg/manifests/system-header.mf @@ -55,7 +55,6 @@ dir path=usr/include/ipp dir path=usr/include/ipp/ipgpc dir path=usr/include/iso dir path=usr/include/kerberosv5 -dir path=usr/include/libpolkit dir path=usr/include/net dir path=usr/include/netinet dir path=usr/include/nfs @@ -389,8 +388,6 @@ file path=usr/include/glob.h file path=usr/include/grp.h file path=usr/include/gssapi/gssapi.h file path=usr/include/gssapi/gssapi_ext.h -file path=usr/include/hal/libhal-storage.h -file path=usr/include/hal/libhal.h $(i386_ONLY)file path=usr/include/ia32/sys/asm_linkage.h $(i386_ONLY)file path=usr/include/ia32/sys/kdi_regs.h $(i386_ONLY)file path=usr/include/ia32/sys/machtypes.h @@ -501,7 +498,6 @@ file path=usr/include/libipmi.h file path=usr/include/libipp.h file path=usr/include/libnvpair.h file path=usr/include/libnwam.h -file path=usr/include/libpolkit/libpolkit.h file path=usr/include/libproc.h file path=usr/include/librcm.h file path=usr/include/libscf.h diff --git a/usr/src/pkg/manifests/system-library-policykit.mf b/usr/src/pkg/manifests/system-library-policykit.mf deleted file mode 100644 index d0aa5fd7ff..0000000000 --- a/usr/src/pkg/manifests/system-library-policykit.mf +++ /dev/null @@ -1,50 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# - -set name=pkg.fmri value=pkg:/system/library/policykit@$(PKGVERS) -set name=pkg.description \ - value="Toolkit for controlling privileges (freedesktop.org)" -set name=pkg.summary value=PolicyKit -set name=info.classification \ - value="org.opensolaris.category.2008:System/Administration and Configuration" -set name=variant.arch value=$(ARCH) -dir path=usr group=sys -dir path=usr/lib -dir path=usr/lib/pkgconfig group=other -dir path=usr/sbin -dir path=usr/share/man/man1m -file path=usr/lib/libpolkit.so.0.0.0 -file path=usr/lib/llib-lpolkit -file path=usr/lib/llib-lpolkit.ln -file path=usr/lib/pkgconfig/polkit.pc -file path=usr/sbin/polkit-is-privileged mode=0555 -file path=usr/share/man/man1m/polkit-is-privileged.1m -legacy pkg=SUNWpolkit \ - desc="Toolkit for controlling privileges (freedesktop.org)" \ - name=PolicyKit -license cr_Sun license=cr_Sun -license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE -link path=usr/lib/libpolkit.so target=./libpolkit.so.0.0.0 -link path=usr/lib/libpolkit.so.0 target=./libpolkit.so.0.0.0 -- cgit v1.2.3