These changes in the X packages in Nevada build 135 will need updates to the IPS distro-import package definitions for those packages.
As usual, this only lists the changes that need distro-import changes, the full list of X changes in these builds can be seen at: http://hub.opensolaris.org/bin/view/Community+Group+x_win/changelogs-nv_130#HBuild135 Diffs are shown against current versions - I assume David will copy these to the 135 directory when making these changes during the resync. -alan- * 6930514 Update Xorg from 1.7.4 to 1.7.5 diff --git a/src/util/distro-import/133/common/x11:server:xorg b/src/util/distro-import/133/common/x11:server:xorg --- a/src/util/distro-import/133/common/x11:server:xorg +++ b/src/util/distro-import/133/common/x11:server:xorg @@ -4,7 +4,7 @@ import SUNWxorg-server depend_path /usr/share/X11/xkb/rules/base $(i386_ONLY)depend_path /platform/i86pc/kernel/drv/xsvc -version 1.7.4 +version 1.7.5 end package package SUNWxorg-server * 6926932 Removal of Xsun on SPARC [PSARC 2008/033]: X consolidation portion Since Xsun is no longer delivered, the x11-server manifest in the SVR4 packages now defaults to Xorg on SPARC as well, so the distro-import no longer needs to override it. diff --git a/src/util/distro-import/133/common/x11:x11-config b/src/util/distro-import/133/common/x11:x11-config --- a/src/util/distro-import/133/common/x11:x11-config +++ b/src/util/distro-import/133/common/x11:x11-config @@ -4,11 +4,6 @@ import SUNWxwplr exclude \ var/svc/manifest/application/x11/xfs.xml \ var/svc/manifest/application/x11/xvnc-inetd.xml -$(sparc_ONLY)drop var/svc/manifest/application/x11/x11-server.xml -$(sparc_ONLY)add file x11-server.xml \ -$(sparc_ONLY) path=var/svc/manifest/application/x11/x11-server.xml \ -$(sparc_ONLY) mode=0444 owner=root group=sys \ -$(sparc_ONLY) restart_fmri=svc:/system/manifest-import:default end package package SUNWxwplr diff --git a/src/util/distro-import/Makefile b/src/util/distro-import/Makefile --- a/src/util/distro-import/Makefile +++ b/src/util/distro-import/Makefile @@ -633,7 +633,6 @@ mkdir -p proto/usr/share/applications mkdir -p proto/usr/share/man mkdir -p proto/var/svc/manifest/application/graphical-login - mkdir -p proto/var/svc/manifest/application/x11 mkdir -p proto/var/svc/manifest/system/xvm mkdir -p proto/var/svc/profile [Looks like you may also be able to remove the mkdir of proto/var/svc/manifest/application/graphical-login now too - at least I didn't see any files there in my test build.]
