build: Rework patch mechanism for Fuel submodules 91/22791/8
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 1 Oct 2016 11:18:11 +0000 (13:18 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 9 Oct 2016 14:33:43 +0000 (16:33 +0200)
commit42f8585ebb8fffad19a89314659ab9129176c3e9
treee2cf6a4797bcbd036e080541cc3925f8b209549b
parent6f3a054fc95622f0c002f72c0fac6074bb36c36f
build: Rework patch mechanism for Fuel submodules

While refactoring the patching mechanism, take care of:
- Sync submodule handling with Fuel@OPFNV;
- build: Investigate/prepare for moving patches to Fuel@OPNFV;
- build: Investigate divergent fuel-mirror;
- ISO build: cacheid for Fuel comps should not depend on
  Armband git commit;

CHANGE:
 Rename/shuffle patches while grouping them in "features",
 preparing for upstreaming them to Fuel@OPNFV and beyond.

CHANGE:
 Allow linking patches for better representing the dependency
 between one patch and different features.
 e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch:
   - part of `multiarch-fuel`, because it extends Fuel;
   - part of `direct-kernel-boot`, as arch is required for that;
   - part of `cross-bootstrap`, target image is arch-dependent;
 NOTE: Patch links are not staged to Fuel@OPNFV, they only serve
 as markers that a specific patch is part of a feature.

CHANGE:
 Kill all Fuel component submodules, now handled in Fuel@OPNFV:
  - fuel-agent
  - fuel-astute
  - fuel-library
  - fuel-mirror
  - fuel-nailgun-agent
  - fuel-web

CHANGE:
 Move armband-fuel-config.mk to armband git root.

FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT
 part of `cross-bootstrap` feature, but patch context says so ...

FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at
 `make patches-export` by removing spaces at EOL.

v2 -> v3:
 * Phony patch support (links to show a patch belongs to a feature);
 * Updated README.md
v3 -> v7:
 * Re-export Fuel submodules & plugins patches (update patch context);
 * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/);
 * Ignore submodule changes;
 * Add armband git repo info to gitinfo_fuel.txt at build time;

Implements: ARMBAND-136
Closes-bug: ARMBAND-95
Closes-bug: ARMBAND-93
Closes-bug: ARMBAND-92

Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
94 files changed:
.gitignore
.gitmodules
Makefile
README.md
armband-fuel-config.mk [new file with mode: 0644]
ci/build.sh
ci/deploy.sh
patches/fuel-agent/cross-bootstrap/0001-Use-qemu-debootstrap-for-image-creation.patch [moved from patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch with 85% similarity]
patches/fuel-agent/cross-bootstrap/0002-Add-FLASH_KERNEL_SKIP-true.patch [moved from patches/fuel-agent/0002-Add-FLASH_KERNEL_SKIP-true.patch with 90% similarity]
patches/fuel-agent/cross-bootstrap/0003-Fix-qemu-user-static-replacement.patch [moved from patches/fuel-agent/0003-Fix-qemu-user-static-replacement.patch with 90% similarity]
patches/fuel-agent/cross-bootstrap/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch [moved from patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch with 92% similarity]
patches/fuel-agent/cross-bootstrap/0005-FIXME-Add-force-yes-to-apt-get-dist-upgrade.patch [moved from patches/fuel-agent/0009-FIXME-Add-force-yes-to-apt-get-dist-upgrade.patch with 93% similarity]
patches/fuel-agent/cross-bootstrap/0006-UX-Update-bootstrap-target-build-time-estimate.patch [moved from patches/fuel-agent/0010-UX-Update-bootstrap-target-build-time-estimate.patch with 95% similarity]
patches/fuel-agent/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch [moved from patches/fuel-agent/0011-kernel-flavor-linux-image-generic-lts-xenial.patch with 91% similarity]
patches/fuel-agent/multiarch-efi/0001-Add-esp-partition-flag.patch [moved from patches/fuel-agent/0005-Add-esp-partition-flag.patch with 88% similarity]
patches/fuel-agent/multiarch-efi/0002-Add-fs-for-efi-partition.patch [moved from patches/fuel-agent/0007-Add-fs-for-efi-partition.patch with 88% similarity]
patches/fuel-astute/multiarch-efi/0001-Erase-EFI-boot-entry-on-EFI-systems.patch [moved from patches/fuel-astute/0001-Erase-EFI-boot-entry-on-EFI-systems.patch with 99% similarity]
patches/fuel-library/0001-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch [moved from patches/fuel-library/0011-ceph-Fix-obsolete-XFS-mount-param-delaylog.patch with 85% similarity]
patches/fuel-library/0002-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch [moved from patches/fuel-library/0012-ceilometer-Fix-libvirt-bin-group-name-for-armband.patch with 95% similarity]
patches/fuel-library/0003-compute-Fix-virtlogd-not-started-after-install.patch [moved from patches/fuel-library/0016-compute-Fix-virtlogd-not-started-after-install.patch with 93% similarity]
patches/fuel-library/arm64-bug-fixes/0001-nova-config-Disable-usb-tablet-for-aarch64.patch [moved from patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch with 78% similarity]
patches/fuel-library/arm64-bug-fixes/0002-Install-vgabios-and-link-for-aarch64.patch [moved from patches/fuel-library/0007-Install-vgabios-and-link-for-aarch64.patch with 70% similarity]
patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch [moved from patches/fuel-library/0008-nova-Update-vga-console-defaults-for-armv7-aarch64.patch with 83% similarity]
patches/fuel-library/arm64-bug-fixes/0004-nova-AArch64-enable-hugepage-support.patch [moved from patches/fuel-library/0009-nova-AArch64-enable-hugepage-support.patch with 96% similarity]
patches/fuel-library/direct-kernel-boot/0001-upload_cirros-Add-direct-kernel-boot-support.patch [moved from patches/fuel-library/0006-upload_cirros-Add-direct-kernel-boot-support.patch with 90% similarity]
patches/fuel-library/direct-kernel-boot/0002-nova-Fix-inject-for-direct-boot-with-part-table.patch [moved from patches/fuel-library/0010-nova-Fix-inject-for-direct-boot-with-part-table.patch with 87% similarity]
patches/fuel-library/multiarch-efi/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch [moved from patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch with 98% similarity]
patches/fuel-library/multiarch-efi/0002-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch [moved from patches/fuel-library/0014-Add-cobbler-grub-aarch64-to-cobbler-dependencies.patch with 100% similarity]
patches/fuel-library/multiarch-fuel/0001-Make-qemu-kvm-architecture-aware.patch [moved from patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch with 85% similarity]
patches/fuel-library/multiarch-fuel/0002-Make-TestVM-creation-architecture-aware.patch [moved from patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch with 96% similarity]
patches/fuel-library/multiarch-mirrors/0001-Add-arm64-for-auxiliary-repos.patch [moved from patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch with 90% similarity]
patches/fuel-library/mysql-sst-provider/0001-Allow-configuring-MySQL-WSREP-SST-provider.patch [moved from patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch with 85% similarity]
patches/fuel-library/upstream-backports/0001-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespac.patch [moved from patches/fuel-library/0015-Set-net.ipv4.ip_nonlocal_bind-1-for-vrouter-namespace.patch with 99% similarity]
patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch [moved from patches/fuel-library/0017-Always-wait-for-MySQL-sync-on-service-refresh.patch with 88% similarity]
patches/fuel-library/upstream-backports/0003-Fix-MySQL-logging-dir-permissions-for-syslog.patch [moved from patches/fuel-library/0018-Fix-MySQL-logging-dir-permissions-for-syslog.patch with 98% similarity]
patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch
patches/fuel-mirror/kernel-bump/0001-kernel-flavor-Add-linux-image-generic-lts-xenial.patch [moved from patches/fuel-mirror/0003-kernel-flavor-Add-linux-image-generic-lts-xenial.patch with 83% similarity]
patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch
patches/fuel-plugin-opendaylight/0002-opnfv-quagga-Build-for-UBUNTU_ARCH.patch
patches/fuel-plugin-opendaylight/0003-FIXME-ODL-wget-no-check-certificate-for-cache.patch
patches/fuel-plugin-ovs/0001-Cleanup-Use-dget-instead-of-wget-dpkg-source.patch [moved from patches/fuel-plugin-ovs/0002-Cleanup-Use-dget-instead-of-wget-dpkg-source.patch with 99% similarity]
patches/fuel-plugin-ovs/0002-Cleanup-Drop-git-dependency.patch [moved from patches/fuel-plugin-ovs/0003-Cleanup-Drop-git-dependency.patch with 97% similarity]
patches/fuel-plugin-ovs/0003-build-apt-force-yes.patch [moved from patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch with 97% similarity]
patches/fuel-plugin-ovs/0004-pre_build_hook-Introduce-USE_DOCKER-option.patch [moved from patches/fuel-plugin-ovs/0005-pre_build_hook-Introduce-USE_DOCKER-option.patch with 99% similarity]
patches/fuel-plugin-ovs/0005-build-install-pre_build_hook-Prepare-multiarch.patch [moved from patches/fuel-plugin-ovs/0006-build-install-pre_build_hook-Prepare-multiarch.patch with 99% similarity]
patches/fuel-plugin-ovs/0006-AArch64-Add-native-build-support.patch [moved from patches/fuel-plugin-ovs/0007-AArch64-Add-native-build-support.patch with 99% similarity]
patches/fuel-plugin-ovs/0007-AArch64-Add-support-for-downloading-prebuilt-DEBs.patch [moved from patches/fuel-plugin-ovs/0008-AArch64-Add-support-for-downloading-prebuilt-DEBs.patch with 99% similarity]
patches/fuel-plugin-ovs/0008-build-docker-Use-host-s-network-stack.patch [moved from patches/fuel-plugin-ovs/0009-build-docker-Use-host-s-network-stack.patch with 100% similarity]
patches/fuel-plugin-ovs/0009-HACK-build-prebuilt-DEBs-src-bin-ver-mismatch.patch [moved from patches/fuel-plugin-ovs/0010-HACK-build-prebuilt-DEBs-src-bin-ver-mismatch.patch with 99% similarity]
patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch
patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
patches/fuel-web/cross-bootstrap/0000-Add-arch-to-nailgun-release-and-target-image.patch [new symlink]
patches/fuel-web/direct-kernel-boot/0000-Add-arch-to-nailgun-release-and-target-image.patch [new symlink]
patches/fuel-web/direct-kernel-boot/0001-direct-kernel-boot-for-cirros.patch [moved from patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch with 94% similarity]
patches/fuel-web/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch [moved from patches/fuel-web/0007-kernel-flavor-linux-image-generic-lts-xenial.patch with 94% similarity]
patches/fuel-web/multiarch-fuel/0000-Add-arch-to-nailgun-release-and-target-image.patch [new symlink]
patches/fuel-web/multiarch-fuel/0000-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch [new symlink]
patches/fuel-web/multiarch-fuel/0001-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch [moved from patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch with 94% similarity]
patches/fuel-web/mysql-sst-provider/0001-Add-configuration-item-for-WSREP-SST-provider.patch [moved from patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch with 90% similarity]
patches/opnfv-fuel/0000-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch [moved from patches/opnfv-fuel/0046-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch with 52% similarity]
patches/opnfv-fuel/0001-build-Add-ARMBAND_BASE-support.patch [new file with mode: 0644]
patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch [moved from patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch with 97% similarity]
patches/opnfv-fuel/0003-dea_base-replace-grub-pc-by-grub-efi-arm64.patch [moved from patches/opnfv-fuel/0009-dea_base-replace-grub-pc-by-grub-efi-arm64.patch with 98% similarity]
patches/opnfv-fuel/0004-post-scripts-Allow-SSH-on-non-admin-ifaces.patch [moved from patches/opnfv-fuel/0010-post-scripts-Allow-SSH-on-non-admin-ifaces.patch with 100% similarity]
patches/opnfv-fuel/0005-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch [moved from patches/opnfv-fuel/0030-deploy.py-add-a-time-stamp-to-the-new-ISO-image.patch with 99% similarity]
patches/opnfv-fuel/0006-build-docker-Use-host-s-network-stack.patch [moved from patches/opnfv-fuel/0055-build-docker-Use-host-s-network-stack.patch with 93% similarity]
patches/opnfv-fuel/0006-deploy.sh-no-need-to-set-umask-0000.patch [deleted file]
patches/opnfv-fuel/0007-deploy-Fix-add-bootstrap-DEA-override-delay.patch [moved from patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch with 94% similarity]
patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch [deleted file]
patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch [deleted file]
patches/opnfv-fuel/arm64-bug-fixes/0001-bootstrap-Add-lshw-package.patch [moved from patches/opnfv-fuel/0028-bootstrap-Add-lshw-package.patch with 92% similarity]
patches/opnfv-fuel/arm64-bug-fixes/0002-net-check-add-support-for-faulty-operstate.patch [moved from patches/opnfv-fuel/0054-net-check-add-support-for-faulty-operstate.patch with 84% similarity]
patches/opnfv-fuel/cross-bootstrap/0001-UX-Update-bootstrap-target-build-time-estimate.patch [moved from patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch with 71% similarity]
patches/opnfv-fuel/cross-bootstrap/0002-Build-bootstrap-image-for-arm64.patch [moved from patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch with 56% similarity]
patches/opnfv-fuel/cross-bootstrap/0003-bootstrap-Use-public-Ubuntu-ports-mirrors.patch [moved from patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch with 92% similarity]
patches/opnfv-fuel/cross-bootstrap/0004-post-scripts-Enable-systemd-binfmt-for-first-boot.patch [moved from patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch with 85% similarity]
patches/opnfv-fuel/cross-bootstrap/0005-mcagent-Increase-max-shell-command-timeout-to-2h.patch [moved from patches/opnfv-fuel/0032-mcagent-Increase-max-shell-command-timeout-to-2h.patch with 95% similarity]
patches/opnfv-fuel/cross-bootstrap/0006-bootstrap-Use-gzip-instead-of-xz-compression.patch [moved from patches/opnfv-fuel/0033-bootstrap-Use-gzip-instead-of-xz-compression.patch with 98% similarity]
patches/opnfv-fuel/cross-bootstrap/0007-Nailgun-Increase-target-image-build-timeout.patch [moved from patches/opnfv-fuel/0034-Nailgun-Increase-target-image-build-timeout.patch with 93% similarity]
patches/opnfv-fuel/cross-bootstrap/0008-m1.micro-Increase-profile-RAM-size-to-128MB.patch [moved from patches/opnfv-fuel/0035-m1.micro-Increase-profile-RAM-size-to-128MB.patch with 98% similarity]
patches/opnfv-fuel/kernel-bump/0001-kernel-flavor-linux-image-generic-lts-xenial.patch [moved from patches/opnfv-fuel/0001-kernel-flavor-linux-image-generic-lts-xenial.patch with 93% similarity]
patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch [moved from patches/opnfv-fuel/0002-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch with 99% similarity]
patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch [moved from patches/opnfv-fuel/0020-Add-arm64-deb-repositories-setup.patch with 97% similarity]
patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch [moved from patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch with 96% similarity]
patches/opnfv-fuel/upstream-backports/0001-deploy.sh-Remove-check-for-root-rm-umask-0000.patch [moved from patches/opnfv-fuel/0007-Remove-check-for-root.patch with 51% similarity]
patches/opnfv-fuel/upstream-backports/0002-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch [moved from patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch with 87% similarity]
patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch
patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch
upstream/fuel-agent [deleted submodule]
upstream/fuel-astute [deleted submodule]
upstream/fuel-library [deleted submodule]
upstream/fuel-mirror [deleted submodule]
upstream/fuel-nailgun-agent [deleted submodule]
upstream/fuel-web [deleted submodule]