Dan McDonald via illumos-developer
2014-10-13 13:57:27 UTC
I've been hammering on a problem: How to get illumos-gate to build on OI *and* OmniOS without introducing regressions on illumos-gate for OI.
One hard problem I've run into is sysidtool: We have a changeset in illumos-omnios below which basically severs the dependency on rpcbind with sysidtool:net. For OmniOS, this is no big deal. It doesn't appear to be a big deal for SmartOS as well. It does appear to be a problem for OI, for the reasons the removed comments state (preventing a dependency cycle with the new sys id).
I've made several WIP changes to illumos-gate to allow it to be built on both platforms. So far, so good, and I've reduced a lot of conflicts. I'd like to know if the below changeset from OmniOS is safe to upstream. The others I have, I believe, will be non-controversial, but this one may be.
Thanks,
Dan
===============
diff --git a/usr/src/cmd/rpcbind/bind.xml b/usr/src/cmd/rpcbind/bind.xml
index 6efc234..218593c 100644
--- a/usr/src/cmd/rpcbind/bind.xml
+++ b/usr/src/cmd/rpcbind/bind.xml
@@ -23,6 +23,7 @@
Copyright 2009 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
+ Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
Service manifest for rpcbind
@@ -63,15 +64,6 @@
value='svc:/system/identity:node' />
</dependency>
- <dependency
- name='sysidtool'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri
- value='svc:/system/sysidtool:net' />
- </dependency>
-
<!--
rpcbind(1M) depends on multicast routes installed by the
routing-setup service, and should be started after any IPsec
diff --git a/usr/src/cmd/svc/milestone/single-user.xml b/usr/src/cmd/svc/milesto
index cbb93fd..706cc20 100644
--- a/usr/src/cmd/svc/milestone/single-user.xml
+++ b/usr/src/cmd/svc/milestone/single-user.xml
@@ -3,6 +3,7 @@
<!--
Copyright 2005 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
+ Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
CDDL HEADER START
@@ -43,32 +44,6 @@
<single_instance />
- <!--
- Single-user's dependency on sysidtool is obsolete, but instead of
- removing it from this manifest, retain it here with its delete
- attribute set to true. This is to try and prevent a dependency
- cycle with the new sysidtool which declares a dependency on
- single-user. This will force the deletion of single-user's
- sysidtool dependency as soon as this manifest is imported
- (instead of waiting for upgrade to delete it).
-
- Note that this does not guarantee the prevention of a dependency
- cycle (if the new sysidtool manifest is imported before
- single-user's) - if this does occur, the code in upgrade will
- catch it - it deletes single-user's dependency and "svcadm
- clear"s sysidtool.
- -->
-
- <dependency
- name='sysidtool'
- grouping='require_all'
- restart_on='none'
- type='service'
- delete='true'>
- <service_fmri value='svc:/system/sysidtool:net' />
- <service_fmri value='svc:/system/sysidtool:system' />
- </dependency>
-
<dependency
name='nodename'
grouping='require_all'
-------------------------------------------
illumos-developer
Archives: https://www.listbox.com/member/archive/182179/=now
RSS Feed: https://www.listbox.com/member/archive/rss/182179/21175072-86d49504
Modify Your Subscription: https://www.listbox.com/member/?member_id=21175072&id_secret=21175072-abdf7b7e
Powered by Listbox: http://www.listbox.com
One hard problem I've run into is sysidtool: We have a changeset in illumos-omnios below which basically severs the dependency on rpcbind with sysidtool:net. For OmniOS, this is no big deal. It doesn't appear to be a big deal for SmartOS as well. It does appear to be a problem for OI, for the reasons the removed comments state (preventing a dependency cycle with the new sys id).
I've made several WIP changes to illumos-gate to allow it to be built on both platforms. So far, so good, and I've reduced a lot of conflicts. I'd like to know if the below changeset from OmniOS is safe to upstream. The others I have, I believe, will be non-controversial, but this one may be.
Thanks,
Dan
===============
diff --git a/usr/src/cmd/rpcbind/bind.xml b/usr/src/cmd/rpcbind/bind.xml
index 6efc234..218593c 100644
--- a/usr/src/cmd/rpcbind/bind.xml
+++ b/usr/src/cmd/rpcbind/bind.xml
@@ -23,6 +23,7 @@
Copyright 2009 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
+ Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
Service manifest for rpcbind
@@ -63,15 +64,6 @@
value='svc:/system/identity:node' />
</dependency>
- <dependency
- name='sysidtool'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri
- value='svc:/system/sysidtool:net' />
- </dependency>
-
<!--
rpcbind(1M) depends on multicast routes installed by the
routing-setup service, and should be started after any IPsec
diff --git a/usr/src/cmd/svc/milestone/single-user.xml b/usr/src/cmd/svc/milesto
index cbb93fd..706cc20 100644
--- a/usr/src/cmd/svc/milestone/single-user.xml
+++ b/usr/src/cmd/svc/milestone/single-user.xml
@@ -3,6 +3,7 @@
<!--
Copyright 2005 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
+ Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
CDDL HEADER START
@@ -43,32 +44,6 @@
<single_instance />
- <!--
- Single-user's dependency on sysidtool is obsolete, but instead of
- removing it from this manifest, retain it here with its delete
- attribute set to true. This is to try and prevent a dependency
- cycle with the new sysidtool which declares a dependency on
- single-user. This will force the deletion of single-user's
- sysidtool dependency as soon as this manifest is imported
- (instead of waiting for upgrade to delete it).
-
- Note that this does not guarantee the prevention of a dependency
- cycle (if the new sysidtool manifest is imported before
- single-user's) - if this does occur, the code in upgrade will
- catch it - it deletes single-user's dependency and "svcadm
- clear"s sysidtool.
- -->
-
- <dependency
- name='sysidtool'
- grouping='require_all'
- restart_on='none'
- type='service'
- delete='true'>
- <service_fmri value='svc:/system/sysidtool:net' />
- <service_fmri value='svc:/system/sysidtool:system' />
- </dependency>
-
<dependency
name='nodename'
grouping='require_all'
-------------------------------------------
illumos-developer
Archives: https://www.listbox.com/member/archive/182179/=now
RSS Feed: https://www.listbox.com/member/archive/rss/182179/21175072-86d49504
Modify Your Subscription: https://www.listbox.com/member/?member_id=21175072&id_secret=21175072-abdf7b7e
Powered by Listbox: http://www.listbox.com