Hi Matt and Darren.
Derived Manifests is into the final stretch now, and I am creating plans
for pushing AI-CUD-based AI-client bits to slim_source. The idea is to
accommodate the AI-CUD gate while not breaking slim_source. When AI-CUD
pushes, my bits will be there for you, ready to go.
Here is what I think will work:
Push all AI-server changes based on a slim_source child, and push the
following from my AI-CUD child:
Push all new files to slim-source with no changes from AI-CUD:
usr/src/cmd/aimanifest/aimanifest.py
usr/src/cmd/aimanifest/Makefile
usr/src/cmd/rbac/user_attr.system%2Finstall%2Fauto-install
usr/src/lib/install_manifest_input/Makefile
usr/src/lib/install_manifest_input/__init__.py
usr/src/lib/install_manifest_input/mim.py
usr/src/lib/install_manifest_input/process_dtd.py
usr/src/lib/install_manifest_input/test/test_manifest_input_overlay.py
usr/src/lib/install_manifest_input/test/test_manifest_input_pathing.py
usr/src/lib/install_manifest_input/test/test_manifest_input_set_get_add.py
usr/src/lib/install_manifest_input/test/test_manifest_input_validate_commit.py
usr/src/lib/install_manifest_input/test/test_process_dtd.py
usr/src/cmd/auto-install/checkpoints/dmm.py
usr/src/cmd/auto-install/checkpoints/test/dmm_build_test.py
usr/src/cmd/auto-install/checkpoints/test/dmm_env_test.py
usr/src/cmd/auto-install/checkpoints/test/dmm_log_test.py
Merge the following AI-CUD-based files with slim_source. These are
either Makefiles or bits which won't break slim_source by pushing them.
usr/src/Makefile.master
usr/src/Targetdirs
usr/src/cmd/auto-install/ai_get_manifest.py
usr/src/cmd/auto-install/svc/manifest-locator
usr/src/cmd/rbac/Makefile
usr/src/lib/install_logging_pymod/logger.py
usr/src/pkg/manifests/system-install-auto-install.mf
After I push the above to slim_source and the AI-CUD gate pulls from
slim_source, I will push my entire AI-CUD gate child to AI-CUD. This
way, slim_source will continue to build, AI-CUD will have the latest
changes from me, and slim_source will end up fully updated when the
AI-CUD gate pushes.
A webrev of the merged files vs slim_source is at:
http://cr.opensolaris.org/~schwartz/110410.1/webrev-vs-slim-source/
A webrev of merged files vs my AI-CUD child is at:
http://cr.opensolaris.org/~schwartz/110410.1/webrev-vs-ai-cud-child
(Note logger.py and rbac/Makefile have no diffs so don't show up.)
Merges may change as I haven't tested the image yet, and other pushes
may happen before I push. However this gives you an idea of what I plan
to do.
Don't take the following into slim_source. They can be integrated when
AI-CUD goes back. The third is unchanged from slim_source but needs to
be pushed to AI-CUD to revert it back. The last requires more shuffling
for DataObject but it isn't needed yet.
The first two relate directly to AI-CUD work:
usr/src/cmd/auto-install/auto_install.py
usr/src/cmd/auto-install/checkpoints/Makefile
Unchanged from slim_source but needs pushing to AI-CUD to revert it back.
usr/src/cmd/auto-install/config/get_manifest
Requires shuffling for DataObject but DO isn't needed yet.
usr/src/lib/install_common/__init__.py
If this doesn't make sense, or if you want to talk about this please let
me know.
Thanks,
Jack
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss
