So perhaps we should torch the slim_import rule and related bits from the
makefile? There's enough confusing cruft there that we don't need to
perpetuate even more.
I'll remove the slim_import part of the Makefile as part of this
changeset.
diff -r 1b976d038cae src/util/distro-import/Makefile
--- a/src/util/distro-import/Makefile Wed Oct 06 09:35:35 2010 -0700
+++ b/src/util/distro-import/Makefile Thu Oct 07 11:27:40 2010 -0700
@@ -623,7 +629,7 @@
FILELIST_RAMDISK_PKG_72 = SUNWcakr.i
FILELIST_RAMDISK_PKG_71 = SUNWcakr.i
-default: 149/slim_import
+default: 149/redist_import
cluster.import: $(WOS_PKGS)/.clustertoc Makefile
./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \
@@ -848,17 +855,6 @@
%/import:
$(MAKE) BUILDID=$(@:%/import=%) import
-slim_import: $(BUILDID)/slim_cluster $(FIX_FILES:%=$(BUILDID)/%)
- $(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) \
- $(JUST_THESE_PKGS:%=-j %) $(INCLUDE_PATH_$(BUILDID):%=-I %) \
- $(CONSOLIDATION_OPTIONS) $(BUILDID)/slim_cluster
-
-%/slim_import:
- if test -z "$(JUST_THESE_PKGS)"; then \
- $(MAKE) clobber; \
- fi
- $(MAKE) BUILDID=$(@:%/slim_import=%) slim_import
-
redist_import: $(BUILDID)/redist_cluster $(FIX_FILES:%=$(BUILDID)/%)
$(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) \
$(JUST_THESE_PKGS:%=-j %) $(INCLUDE_PATH_$(BUILDID):%=-I %) \
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss
