Summary: various packaging updates and bug fix.
Add new syntax to include selected files during bulk import; this is needed if files conflict in path with those that are already there.
Replace hsfs/lofi w/ new versions until they show up in Nevada.
Drop showrev from SUNWadmc - needed libs aren't there.
Add selective import to Makefile to update just some packages in repo.
Fix 700 rather than 0700 bug in pkgtarfile.py.
Add SUNWslim_utils to repo and slim_install cluster.
Add SUNWdtracetoolkit package to repo and slim_install cluster.
--- a/src/modules/pkgtarfile.py Thu Oct 18 16:04:46 2007 -0700
+++ b/src/modules/pkgtarfile.py Mon Oct 22 09:59:11 2007 -0700
@@ -75,7 +75,7 @@
# the action execute methods run. If proper directory actions
# don't exist for these directories, the permissions will be wrong.
try:
- os.makedirs(upperdirs, 700)
+ os.makedirs(upperdirs, 0700)
except:
pass
try:
--- a/src/util/distro-import/75a/slim_cluster Thu Oct 18 16:04:46 2007 -0700
+++ b/src/util/distro-import/75a/slim_cluster Mon Oct 22 09:59:11 2007 -0700
@@ -48,6 +48,7 @@
include common/SUNWdbus
include common/SUNWdbus-bindings
include common/SUNWdoc
+include common/SUNWdtracetoolkit
include common/SUNWdtrc
include common/SUNWdtrp
include common/SUNWesu
@@ -317,6 +318,7 @@
include common/SUNWsfdoc
include common/SUNWsfinf
include common/SUNWsfman
+include common/SUNWslim-utils
include common/SUNWsmapi
include common/SUNWsmedia
include common/SUNWsndm
@@ -442,15 +444,32 @@
cluster slim_install
description "slim install cluster"
version 0.1
+depend SUNWipkg
idepend BRCMbnx
idepend CADP160
+idepend FSWfontconfig-devel-docs
+idepend FSWxorg-client-docs
+idepend FSWxorg-client-programs
+idepend FSWxorg-clientlibs
+idepend FSWxorg-data
+idepend FSWxorg-devel-docs
+idepend FSWxorg-fonts
+idepend FSWxwpft
+idepend FSWxwrtl
idepend HPFC
idepend SK98sol
idepend SKfp
+idepend SUNW1394
idepend SUNWPython
idepend SUNWPython-extra
+idepend SUNWTcl
idepend SUNWTiff
+idepend SUNWTk
+idepend SUNWa2psr
+idepend SUNWa2psu
idepend SUNWaac
+idepend SUNWaccr
+idepend SUNWaccu
idepend SUNWad810
idepend SUNWadixp
idepend SUNWadmap
@@ -459,6 +478,8 @@
idepend SUNWadmr
idepend SUNWadp
idepend SUNWadpu320
+idepend SUNWafe
+idepend SUNWagp
idepend SUNWahci
idepend SUNWamd8111s
idepend SUNWamr
@@ -467,13 +488,19 @@
idepend SUNWatheros
idepend SUNWauda
idepend SUNWaudd
+idepend SUNWaudf
idepend SUNWaudiohd
+idepend SUNWav1394
+idepend SUNWbart
idepend SUNWbash
idepend SUNWbge
+idepend SUNWbind
+idepend SUNWbindr
idepend SUNWbip
idepend SUNWbipr
idepend SUNWbrltty
idepend SUNWbrltty-root
+idepend SUNWbtool
idepend SUNWbzip
idepend SUNWcadp
idepend SUNWcakr
@@ -486,6 +513,8 @@
idepend SUNWchxge
idepend SUNWckr
idepend SUNWcnetr
+idepend SUNWcpc
+idepend SUNWcpcu
idepend SUNWcpp
idepend SUNWcqhpc
idepend SUNWcsd
@@ -496,9 +525,21 @@
idepend SUNWdbus
idepend SUNWdbus-bindings
idepend SUNWdbus-root
+idepend SUNWdoc
+idepend SUNWdrmr
+idepend SUNWdtracetoolkit
idepend SUNWdtrc
idepend SUNWdtrp
idepend SUNWesu
+idepend SUNWevolution
+idepend SUNWevolution-data-server
+idepend SUNWevolution-exchange
+idepend SUNWevolution-exchange-root
+idepend SUNWevolution-jescs
+idepend SUNWevolution-libs
+idepend SUNWevolution-root
+idepend SUNWevolution-webcal
+idepend SUNWevolution-webcal-root
idepend SUNWfchba
idepend SUNWfchbar
idepend SUNWfcip
@@ -507,15 +548,29 @@
idepend SUNWfcprt
idepend SUNWfcsm
idepend SUNWfctl
+idepend SUNWffiltersr
+idepend SUNWffiltersu
idepend SUNWfirefox
idepend SUNWfirefox-root
idepend SUNWflac
idepend SUNWflexruntime
idepend SUNWfmd
idepend SUNWfmdr
+idepend SUNWfontconfig
+idepend SUNWfontconfig-docs
+idepend SUNWfontconfig-root
+idepend SUNWfppd
+idepend SUNWfreetype2
+idepend SUNWfss
idepend SUNWftpr
idepend SUNWftpu
+idepend SUNWfwdc
+idepend SUNWfwdcu
+idepend SUNWfwflash
idepend SUNWgccruntime
+idepend SUNWgcmn
+idepend SUNWggrp
+idepend SUNWgimpprint
idepend SUNWgksu
idepend SUNWgksu-root
idepend SUNWgnome-a11y-dasher
@@ -557,6 +612,7 @@
idepend SUNWgnome-disk-analyzer-root
idepend SUNWgnome-display-mgr
idepend SUNWgnome-display-mgr-root
+idepend SUNWgnome-dtstart
idepend SUNWgnome-file-mgr
idepend SUNWgnome-file-mgr-root
idepend SUNWgnome-fonts
@@ -601,6 +657,8 @@
idepend SUNWgnome-panel-root
idepend SUNWgnome-pdf-viewer
idepend SUNWgnome-pdf-viewer-root
+idepend SUNWgnome-pilot
+idepend SUNWgnome-pilot-root
idepend SUNWgnome-print
idepend SUNWgnome-print-root
idepend SUNWgnome-ps-viewer
@@ -636,17 +694,25 @@
idepend SUNWgnome-wm-root
idepend SUNWgnu-coreutils
idepend SUNWgnu-diffutils
+idepend SUNWgnu-gettext
+idepend SUNWgnu-libiconv
idepend SUNWgnu-which
idepend SUNWgnutls
+idepend SUNWgpch
idepend SUNWgrub
+idepend SUNWgscr
+idepend SUNWgsfot
+idepend SUNWgsfst
idepend SUNWgss
idepend SUNWgssc
idepend SUNWgssdh
idepend SUNWgssk
+idepend SUNWgtar
idepend SUNWgui-install
idepend SUNWgzip
idepend SUNWhal
idepend SUNWhalr
+idepend SUNWhpijs
idepend SUNWhwdata
idepend SUNWib
idepend SUNWibsdp
@@ -659,26 +725,34 @@
idepend SUNWima
idepend SUNWimac
idepend SUNWimacr
+idepend SUNWimagick
idepend SUNWimar
idepend SUNWintgige
idepend SUNWipfr
idepend SUNWipfu
-depend SUNWipkg
idepend SUNWipmi
idepend SUNWipmir
idepend SUNWipoib
+idepend SUNWippcore
+idepend SUNWipplr
+idepend SUNWipplu
idepend SUNWipw
idepend SUNWiscsir
+idepend SUNWiscsitgtr
+idepend SUNWiscsitgtu
idepend SUNWiscsiu
idepend SUNWislcc
idepend SUNWiso-codes
idepend SUNWiwi
+idepend SUNWixgb
+idepend SUNWjdsver
idepend SUNWjpg
idepend SUNWjss
idepend SUNWkey
idepend SUNWkrbr
idepend SUNWkrbu
idepend SUNWkvm
+idepend SUNWless
idepend SUNWlexpt
idepend SUNWlibC
idepend SUNWlibcroco
@@ -695,15 +769,27 @@
idepend SUNWlibsasl
idepend SUNWlibsdl
idepend SUNWlibtheora
+idepend SUNWlibusb
+idepend SUNWlibusbugen
idepend SUNWlldap
idepend SUNWloc
+idepend SUNWlp-cmds
+idepend SUNWlpr-cmds
idepend SUNWlsimega
idepend SUNWluxop
idepend SUNWlxml
+idepend SUNWlxml-python
+idepend SUNWlxr
+idepend SUNWlxsl
+idepend SUNWlxsl-python
+idepend SUNWlxu
+idepend SUNWman
idepend SUNWmdb
idepend SUNWmdbr
idepend SUNWmdr
idepend SUNWmdu
+idepend SUNWmkcd
+idepend SUNWmkcdr
idepend SUNWmlib
idepend SUNWmpapi
idepend SUNWmpapir
@@ -712,7 +798,9 @@
idepend SUNWmpsvplr
idepend SUNWmusicbrainz
idepend SUNWmv88sx
+idepend SUNWmxfe
idepend SUNWmyspell-dictionary-en
+idepend SUNWncft
idepend SUNWnfsckr
idepend SUNWnfscr
idepend SUNWnfscu
@@ -722,20 +810,26 @@
idepend SUNWnge
idepend SUNWnisr
idepend SUNWnisu
+idepend SUNWnmap
+idepend SUNWntpr
+idepend SUNWntpu
idepend SUNWnvsata
idepend SUNWnxge
idepend SUNWogg-vorbis
-idepend SUNWopensslr
idepend SUNWopenssl-commands
idepend SUNWopenssl-libraries
idepend SUNWopenssl-man
+idepend SUNWopensslr
idepend SUNWos86r
+idepend SUNWpapi
idepend SUNWpcan
idepend SUNWpcelx
idepend SUNWpcmci
idepend SUNWpcmcu
idepend SUNWpcmem
+idepend SUNWpcr
idepend SUNWpcser
+idepend SUNWpcu
idepend SUNWpcwl
idepend SUNWpd
idepend SUNWperl-authen-pam
@@ -746,10 +840,20 @@
idepend SUNWpilot-link
idepend SUNWpkgcmdsr
idepend SUNWpkgcmdsu
+idepend SUNWpmr
+idepend SUNWpmu
idepend SUNWpng
idepend SUNWpolkit
+idepend SUNWpool
+idepend SUNWpoold
+idepend SUNWpoolr
idepend SUNWpostrun
idepend SUNWpostrun-root
+idepend SUNWpppd
+idepend SUNWpppdr
+idepend SUNWpppdt
+idepend SUNWpppdu
+idepend SUNWpppg
idepend SUNWpr
idepend SUNWprint-monitor
idepend SUNWprint-monitor-root
@@ -757,6 +861,12 @@
idepend SUNWpsdcr
idepend SUNWpsdir
idepend SUNWpsdpr
+idepend SUNWpsf
+idepend SUNWpsm-ipp
+idepend SUNWpsm-lpd
+idepend SUNWpsr
+idepend SUNWpsu
+idepend SUNWpsutils
idepend SUNWqlc
idepend SUNWqlcu
idepend SUNWralink
@@ -773,13 +883,23 @@
idepend SUNWroute
idepend SUNWroutr
idepend SUNWrpcib
+idepend SUNWrpm
idepend SUNWrsg
idepend SUNWrsgk
+idepend SUNWrsync
idepend SUNWrtls
+idepend SUNWrtw
+idepend SUNWsbp2
idepend SUNWscmr
idepend SUNWscmu
+idepend SUNWscplp
+idepend SUNWscsa1394
idepend SUNWses
+idepend SUNWsfdoc
+idepend SUNWsfinf
+idepend SUNWsfman
idepend SUNWsi3124
+idepend SUNWslim-utils
idepend SUNWsmapi
idepend SUNWsmedia
idepend SUNWsmediar
@@ -795,7 +915,10 @@
idepend SUNWsshr
idepend SUNWsshu
idepend SUNWtavor
+idepend SUNWtcpd
+idepend SUNWtcsh
idepend SUNWtecla
+idepend SUNWtexi
idepend SUNWtftp
idepend SUNWtftpr
idepend SUNWthunderbird
@@ -824,158 +947,39 @@
idepend SUNWusbvc
idepend SUNWvia823x
idepend SUNWwbsup
+idepend SUNWwgetr
+idepend SUNWwgetu
idepend SUNWwlanr
idepend SUNWwlanu
idepend SUNWwpar
idepend SUNWwpau
idepend SUNWwpi
+idepend SUNWxcu4
idepend SUNWxge
+idepend SUNWxorg-cfg
+idepend SUNWxorg-client-docs
+idepend SUNWxorg-client-programs
+idepend SUNWxorg-clientlibs
+idepend SUNWxorg-compatlinks
+idepend SUNWxorg-devel-docs
+idepend SUNWxorg-doc
+idepend SUNWxorg-graphics-ddx
+idepend SUNWxorg-mesa
+idepend SUNWxorg-server
+idepend SUNWxscreensaver-hacks
+idepend SUNWxscreensaver-hacks-gl
idepend SUNWxsvc
+idepend SUNWxwdv
+idepend SUNWxwplr
+idepend SUNWxwsvr
+idepend SUNWxwxft
idepend SUNWzfskr
idepend SUNWzfsr
idepend SUNWzfsu
+idepend SUNWzip
idepend SUNWzlib
-idepend SYMhisl
-idepend SUNWfontconfig
-idepend SUNWxorg-clientlibs
-idepend SUNWxorg-server
-idepend SUNWfontconfig-docs
-idepend FSWfontconfig-devel-docs
-idepend SUNWxorg-compatlinks
-idepend SUNWfontconfig-root
-idepend SUNWxorg-devel-docs
-idepend FSWxorg-devel-docs
-idepend SUNWxscreensaver-hacks
-idepend SUNWfreetype2
-idepend SUNWxorg-doc
-idepend SUNWxscreensaver-hacks-gl
-idepend SUNWxorg-cfg
-idepend SUNWxorg-graphics-ddx
-idepend SUNWxorg-client-docs
-idepend SUNWxwsvr
-idepend SUNWxorg-client-programs
-idepend SUNWxorg-mesa
-idepend SUNWxwxft
-idepend FSWxorg-client-programs
-idepend FSWxorg-client-docs
-idepend FSWxorg-clientlibs
-idepend FSWxwrtl
-idepend FSWxorg-data
-idepend FSWxorg-fonts
-idepend FSWxwpft
-idepend SUNWdoc
-idepend SUNWman
-idepend SUNWTcl
-idepend SUNWTk
-idepend SUNWgimpprint
-idepend SUNWlibusb
-idepend SUNWlxsl
-idepend SUNWpapi
-idepend SUNWpool
-idepend SUNWpoold
-idepend SUNWpoolr
-idepend SUNWscplp
-idepend SUNWxcu4
idepend SUNWzoner
idepend SUNWzoneu
-idepend SUNWgnu-gettext
-idepend SUNWgnu-libiconv
-idepend SUNWgnome-dtstart
-idepend SUNWjdsver
-idepend SUNWxwplr
-idepend SUNWevolution-libs
-idepend SUNWevolution-data-server
-idepend SUNWagp
-idepend SUNWcpc
-idepend SUNWcpcu
-idepend SUNWixgb
-idepend SUNWdrmr
-idepend SUNWpmr
-idepend SUNWpmu
-idepend SUNWpsr
-idepend SUNWpsu
-idepend SUNWaccr
-idepend SUNWaccu
-idepend SUNWntpr
-idepend SUNWntpu
-idepend SUNWiscsitgtr
-idepend SUNWiscsitgtu
-idepend SUNWlxr
-idepend SUNWlxu
-idepend SUNW1394
-idepend SUNWsbp2
-idepend SUNWfwdc
-idepend SUNWfwdcu
-idepend SUNWav1394
-idepend SUNWscsa1394
-idepend SUNWrtw
-idepend SUNWaudf
-idepend SUNWfss
-idepend SUNWfwflash
-idepend SUNWippcore
-idepend SUNWipplr
-idepend SUNWipplu
-idepend SUNWlp-cmds
-idepend SUNWlpr-cmds
-idepend SUNWpcr
-idepend SUNWpcu
-idepend SUNWpsf
-idepend SUNWpsm-ipp
-idepend SUNWpsm-lpd
-idepend SUNWxwdv
-idepend SUNWa2psr
-idepend SUNWa2psu
-idepend SUNWbind
-idepend SUNWbindr
-idepend SUNWgcmn
-idepend SUNWggrp
-idepend SUNWgpch
-idepend SUNWgtar
-idepend SUNWless
-idepend SUNWlibusbugen
-idepend SUNWlxml-python
-idepend SUNWlxsl-python
-idepend SUNWncft
-idepend SUNWnmap
-idepend SUNWpsutils
-idepend SUNWrpm
-idepend SUNWrsync
-idepend SUNWsfdoc
-idepend SUNWsfinf
-idepend SUNWsfman
-idepend SUNWtcsh
-idepend SUNWtexi
-idepend SUNWwgetr
-idepend SUNWwgetu
-idepend SUNWzip
idepend SUNWzsh
-idepend SUNWfppd
-idepend SUNWffiltersr
-idepend SUNWffiltersu
-idepend SUNWgscr
-idepend SUNWgsfot
-idepend SUNWgsfst
-idepend SUNWhpijs
-idepend SUNWimagick
-idepend SUNWmkcdr
-idepend SUNWmkcd
-idepend SUNWgnome-pilot
-idepend SUNWgnome-pilot-root
-idepend SUNWpppd
-idepend SUNWpppdr
-idepend SUNWpppdt
-idepend SUNWpppdu
-idepend SUNWpppg
-idepend SUNWbtool
-idepend SUNWbart
-idepend SUNWtcpd
-idepend SUNWafe
-idepend SUNWmxfe
-idepend SUNWevolution
-idepend SUNWevolution-exchange
-idepend SUNWevolution-exchange-root
-idepend SUNWevolution-jescs
-idepend SUNWevolution-root
-idepend SUNWevolution-webcal
-idepend SUNWevolution-webcal-root
+idepend SYMhisl
end package
--- a/src/util/distro-import/Makefile Thu Oct 18 16:04:46 2007 -0700
+++ b/src/util/distro-import/Makefile Mon Oct 22 09:59:11 2007 -0700
@@ -34,6 +34,7 @@
SLIM_PKGS=$(SLIM_PATH)/SLIM_PKGS/latest
FOX_PKGS=$(SLIM_PATH)/FOX/latest
REPO=http://localhost:10000
+JUST_THESE_PKGS=
ALL_PKGS=$(GNOME_PKGS) \
$(INSTALL_PKGS) \
@@ -117,7 +118,7 @@
slim_import: $(BUILDID)/slim_cluster $(TMPPKGS)
rm -f slim_cluster; ln -s $(BUILDID)/slim_cluster slim_cluster
- ./solaris.py -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) slim_cluster
+ ./solaris.py -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) slim_cluster $(JUST_THESE_PKGS)
.KEEP_STATE:
--- a/src/util/distro-import/common/SUNWadmc Thu Oct 18 16:04:46 2007 -0700
+++ b/src/util/distro-import/common/SUNWadmc Mon Oct 22 09:59:11 2007 -0700
@@ -1,3 +1,4 @@
package SUNWadmc
import SUNWadmc
+drop usr/bin/showrev
end package
--- a/src/util/distro-import/common/SUNWckr Thu Oct 18 16:04:46 2007 -0700
+++ b/src/util/distro-import/common/SUNWckr Mon Oct 22 09:59:11 2007 -0700
@@ -9,4 +9,18 @@
drop kernel/drv/bmc.conf
drop kernel/drv/sparcv9/isp
# END NON-REDISTRIBUTABLE
+# XXX until new hsfs hits nevada
+drop kernel/fs/amd64/hsfs
+drop kernel/fs/hsfs
+from SUNWhsfs import
+kernel/fs/amd64/hsfs
+kernel/fs/hsfs
+end import
+# XXX until new clofi hits nevada
+drop kernel/drv/amd64/lofi
+drop kernel/drv/lofi
+from SUNWclofi import
+kernel/drv/amd64/lofi
+kernel/drv/lofi
+end import
end package
--- a/src/util/distro-import/common/SUNWcs Thu Oct 18 16:04:46 2007 -0700
+++ b/src/util/distro-import/common/SUNWcs Mon Oct 22 09:59:11 2007 -0700
@@ -7,5 +7,17 @@
add link path=usr/bin/ksh target=ksh93
add link path=usr/bin/rksh target=rksh93
# END NON-REDISTRIBUTABLE
+# hack until clofi integrates into nevada
+drop usr/sbin/lofiadm
+from SUNWclofi import
+usr/sbin/lofiadm
+end import
import SUNWcsr
+drop var/svc/profile/generic_open.xml
+drop var/svc/profile/generic_limited_net.xml
+from SUNWslim-utils import
+# switch to gdm
+var/svc/profile/generic_open.xml
+var/svc/profile/generic_limited_net.xml
+end import
end package
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWdtracetoolkit Mon Oct 22 09:59:11 2007 -0700
@@ -0,0 +1,3 @@
+package SUNWdtracetoolkit
+import SUNWdtracetoolkit
+end package
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWslim-utils Mon Oct 22 09:59:11 2007 -0700
@@ -0,0 +1,3 @@
+package SUNWslim-utils
+import SUNWslim-utils exclude var/svc/profile/generic_limited_net.xml var/svc/profile/generic_open.xml
+end package
--- a/src/util/distro-import/solaris.py Thu Oct 18 16:04:46 2007 -0700
+++ b/src/util/distro-import/solaris.py Mon Oct 22 09:59:11 2007 -0700
@@ -53,8 +53,7 @@
self.imppkg = None
pkgdict[name] = self
- def import_pkg(self, imppkg):
-
+ def import_pkg(self, imppkg, line):
try:
p = SolarisPackage(pkg_path(imppkg))
except:
@@ -66,11 +65,17 @@
imppkg = p.pkginfo["PKG"] # filename NOT always same as pkgname
svr4pkgsseen[imppkg] = p;
-
+
+ excludes = dict((f, True) for f in line.split())
+
# XXX This isn't thread-safe. We want a dict method that adds
# the key/value pair, but throws an exception if the key is
# already present.
for o in p.manifest:
+ if o.pathname in excludes:
+ print "excluding %s from %s" % (o.pathname, imppkg)
+ continue
+
if o.pathname in elided_files:
print "ignoring %s in %s" % (o.pathname, imppkg)
continue
@@ -655,7 +660,15 @@
curpkg.version = lexer.get_token()
elif token == "import":
- curpkg.import_pkg(lexer.get_token())
+ package_name = lexer.get_token()
+ next = lexer.get_token()
+ if next != "exclude":
+ line = ""
+ lexer.push_token(next)
+ else:
+ line = lexer.instream.readline().strip()
+
+ curpkg.import_pkg(package_name, line)
elif token == "from":
pkgspec = lexer.get_token()