| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Decouple main Makefile and repository patches by moving all Fuel
component patches to a subdir, <patch-repo>.
Proposed structure of <patch-repos> dir:
- patch-repos/*.patch are intended for <fuel-main> git repo;
- patch-repos/build/repo/<fuel-module>/*.patch are intended for
<fuel-module>, e.g. "fuel-nailgun";
Full list of Fuel submodules supported by this mechanism at [1].
While at it, replace all occurences of </tmp/fuel-main> with
<FUEL_MAIN_DIR> in main Makefile and rewrite a few git/make calls
to use the "-C" arg.
NOTE: `git -C` is available starting with git 1.8.5.
[1] https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk
#L32-L44
Change-Id: I5e4adc7285054777c3898592ed48482ccd2b706f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Tested in armband, with very small adaptions.
Use `git apply` and/or `git am` in favor of `patch`.
Change patches from old context format to unified diff.
This change allows us to decouple Makefile and patches.
This means we no longer have to manually stage touched files
before committing them to git.
Possible improvements:
- move patches to separate dir and add ordering info (prefix);
- merge patches (currently we have one per touched file);
Remove obsolete (unused?) patch:
- fuel-main_docker_version.patch
Change-Id: I5b621370993b259779c813b47105f632948e6da7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Switching to Fuel 9.0/Mitaka for the build system.
Overhaul of the patching mechanism. As bootstrap_admin_node.sh has
been transitioned into an RPM (fuel-support), the lazy designer found
it more simple to patch that script during the Fuel build phase than
at the OPNFV ISO generation. The patch mechanism has been changed to a
normal context diff instead of the orig/modified file tuples
previously used. Hopefully this will require fewer manual rebases (may
the fuzz be with us!).
Also the ks.cfg patching has transitioned to a context based ordinary
patch for the same reasons, but this is as before taking place during
OPNFV ISO generation.
Patch naming made more descriptive.
The reaping mechanism has been slightly modified due to a change in
the naming of the node files when these are generated by the Fuel CLI.
IMPORTANT 1: The package cache mechanism is currently disabled, it is
only possible to install Fuel with a direct internet connection. This
will be fixed in a later change set!
IMPORTANT 2: All plugins has been disabled! As you have re-certified
your plugin with Fuel 9.0, please re-enable it in build/Makefile!
Change-Id: Ia918d16a74b68f89d178e06befe6e8a7a9367bf9
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
|
Alexandru Avadanii
Stefan K. Berg