From 957a16139281785c2a6685428f7b037d6578f08d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 5 Sep 2016 13:51:57 +0200 Subject: Upstream: move patches to repo-patches dir Upstream change: [1] Slight rebase of our patches is now needed. [1] https://gerrit.opnfv.org/gerrit/#/c/20043/ Change-Id: I955ae3c5c304d8c8da6e42680c81e9255487fb68 Signed-off-by: Alexandru Avadanii --- .../0021-Build-bootstrap-image-for-arm64.patch | 6 +- ...date-bootstrap-target-build-time-estimate.patch | 6 +- ...ipts-Enable-systemd-binfmt-for-first-boot.patch | 6 +- ...port-dpkg-checkbuilddeps-to-mk-build-deps.patch | 17 +-- .../0043-build-Add-armband.mk-config.patch | 10 +- ...050-build-Move-patches-to-patch-repos-dir.patch | 142 --------------------- 6 files changed, 16 insertions(+), 171 deletions(-) delete mode 100644 patches/opnfv-fuel/0050-build-Move-patches-to-patch-repos-dir.patch (limited to 'patches/opnfv-fuel') diff --git a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch index f66777c7..4daf733e 100644 --- a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch +++ b/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch @@ -9,9 +9,9 @@ per supported arch. This requires Fuel refactoring. build/bootstrap_admin_node.sh.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch ---- a/build/bootstrap_admin_node.sh.patch -+++ b/build/bootstrap_admin_node.sh.patch +diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch +--- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch ++++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch @@ -53,3 +53,12 @@ # Enable iptables systemctl enable iptables.service diff --git a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch index 4023264c..fe623957 100644 --- a/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch +++ b/patches/opnfv-fuel/0027-UX-Update-bootstrap-target-build-time-estimate.patch @@ -11,10 +11,10 @@ Signed-off-by: Alexandru Avadanii build/bootstrap_admin_node.sh.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch +diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch index c66b497..46b53e6 100644 ---- a/build/bootstrap_admin_node.sh.patch -+++ b/build/bootstrap_admin_node.sh.patch +--- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch ++++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch @@ -8,5 +8,20 @@ --- a/iso/bootstrap_admin_node.sh +++ b/iso/bootstrap_admin_node.sh diff --git a/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch b/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch index 6d55311c..03e877a1 100644 --- a/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch +++ b/patches/opnfv-fuel/0031-post-scripts-Enable-systemd-binfmt-for-first-boot.patch @@ -30,10 +30,10 @@ Finally, this commit adds an OPNFV post-install script in 2 files changed, 47 insertions(+) create mode 100755 build/f_isoroot/f_bootstrap/post-scripts/80_prepare_cross_builds.sh -diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch +diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch index b1ea90b..7f16d0b 100644 ---- a/build/bootstrap_admin_node.sh.patch -+++ b/build/bootstrap_admin_node.sh.patch +--- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch ++++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch @@ -24,5 +24,18 @@ nodes over PXE, they will be discovered and become available for installing \ OpenStack on them" diff --git a/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch b/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch index 675b9815..5dde448f 100644 --- a/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch +++ b/patches/opnfv-fuel/0040-Backport-dpkg-checkbuilddeps-to-mk-build-deps.patch @@ -8,26 +8,15 @@ Backported from [1]. Signed-off-by: Alexandru Avadanii --- - build/Makefile | 1 + ...ce-dpkg-checkbuilddeps-with-mk-build-deps.patch | 38 ++++++++++++++++++++++ - 2 files changed, 39 insertions(+) + 1 files changed, 38 insertions(+) create mode 100644 build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch -diff --git a/build/Makefile b/build/Makefile -index d917f26..ec5d27a 100644 ---- a/build/Makefile -+++ b/build/Makefile -@@ -140,4 +140,5 @@ $(ISOCACHE): - cd /tmp/fuel-main && git am $(TOPDIR)/repo-multi-arch-local-mirrors.patch -+ cd /tmp/fuel-main && git am $(TOPDIR)/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch - # Repeat build up to three times - sudo -E ./fuel_build_loop - cp /tmp/fuel-main/build/artifacts/fuel*.iso . -diff --git a/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch +diff --git a/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch new file mode 100644 index 0000000..896f3cf --- /dev/null -+++ b/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch ++++ b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch @@ -0,0 +1,38 @@ +From: Sergii Golovatiuk +Date: Fri, 3 Jun 2016 12:26:19 +0200 diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch index df1bd110..fee234d7 100644 --- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch +++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch @@ -25,18 +25,16 @@ index 4454c35..377ecc6 100644 ############################################################################ # BEGIN of variables to customize # -@@ -129,6 +132,9 @@ $(ISOCACHE): - sudo docker info - cd /tmp/fuel-main && make repos - $(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt +@@ -129,5 +132,8 @@ $(ISOCACHE): + cd $(FUEL_MAIN_DIR) && make repos + $(REPOINFO) -r $(FUEL_MAIN_DIR) > gitinfo_fuel.txt + @if test -n $(ARMBAND_BASE); then \ + $(REPOINFO) -r $(ARMBAND_BASE) >> gitinfo_fuel.txt; \ + fi # OPNFV patches at Fuel build time # Need to be commited in order for them to be considered by the Fuel # build system -@@ -228,6 +234,10 @@ debug: - sha1sum *.patch >> .cachedata +@@ -228,5 +234,9 @@ debug: sha1sum fuel_build_loop >> .cachedata sha1sum config.mk >> .cachedata + @if test -n $(ARMBAND_BASE); then \ diff --git a/patches/opnfv-fuel/0050-build-Move-patches-to-patch-repos-dir.patch b/patches/opnfv-fuel/0050-build-Move-patches-to-patch-repos-dir.patch deleted file mode 100644 index 9874c9c2..00000000 --- a/patches/opnfv-fuel/0050-build-Move-patches-to-patch-repos-dir.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Alexandru Avadanii -Date: Sat, 27 Aug 2016 17:13:32 +0200 -Subject: [PATCH] build: Move patches to dir - -Decouple main Makefile and repository patches by moving all Fuel -component patches to a subdir, . - -Proposed structure of dir: -- patch-repos/*.patch are intended for git repo; -- patch-repos/build/repo//*.patch are intended for - , e.g. "fuel-nailgun"; - -Full list of Fuel submodules supported by this mechanism at [1]. - -While at it, replace all occurences of with - 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 - -Signed-off-by: Alexandru Avadanii ---- - build/Makefile | 42 ++++++++++++---------- - .../0010-bootstrap_admin_node.sh.patch} | 0 - .../0020-isolinux.cfg.patch} | 0 - .../0030-repo-multi-arch-local-mirrors.patch} | 0 - ...e-dpkg-checkbuilddeps-with-mk-build-deps.patch} | 0 - ...tel-82599-10-Gigabit-NIC-as-DPDK-capable.patch} | 0 - 6 files changed, 24 insertions(+), 18 deletions(-) - rename build/{bootstrap_admin_node.sh.patch => patch-repos/0010-bootstrap_admin_node.sh.patch} (100%) - rename build/{isolinux.cfg.patch => patch-repos/0020-isolinux.cfg.patch} (100%) - rename build/{repo-multi-arch-local-mirrors.patch => patch-repos/0030-repo-multi-arch-local-mirrors.patch} (100%) - rename build/{replace-dpkg-checkbuilddeps-with-mk-build-deps.patch => patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch} (100%) - rename build/{Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch => patch-repos/build/repos/fuel-nailgun/0010-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch} (100%) - -diff --git a/build/Makefile b/build/Makefile -index 377ecc6..b234924 100644 ---- a/build/Makefile -+++ b/build/Makefile -@@ -83,6 +83,11 @@ ORIGDIR := $(TOPDIR)/origiso - # END of variables to customize - ############################################################################# - -+# Fuel-main destination path and fuel-* submodule patching, for full list check: -+# https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk#L32-L44 -+FUEL_MAIN_DIR := /tmp/fuel-main -+FUEL_PATCHES := $(shell find $(BUILD_BASE)/patch-repos -name '*.patch' | sort) -+ - SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) - - .PHONY: all -@@ -108,10 +113,10 @@ include cache.mk - - $(ISOCACHE): - # Clone Fuel to non-persistent location and build -- sudo rm -rf /tmp/fuel-main -- cd /tmp && git clone $(FUEL_MAIN_REPO) -- cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG) -- @echo "fuel" `git -C /tmp/fuel-main rev-parse HEAD` >> $(VERSION_FILE) -+ sudo rm -rf $(FUEL_MAIN_DIR) -+ git clone $(FUEL_MAIN_REPO) $(FUEL_MAIN_DIR) -+ git -C $(FUEL_MAIN_DIR) checkout $(FUEL_MAIN_TAG) -+ @echo "fuel" `git -C $(FUEL_MAIN_DIR) rev-parse HEAD` >> $(VERSION_FILE) - # Remove Docker optimizations, otherwise multistrap will fail during - # Fuel build. - sudo rm -f /etc/apt/apt.conf.d/docker* -@@ -127,25 +132,26 @@ $(ISOCACHE): - sudo service docker stop || exit 0 - sudo service docker start - -- cd /tmp/fuel-main && ./prepare-build-env.sh -+ cd $(FUEL_MAIN_DIR) && ./prepare-build-env.sh - # Verify that Docker is alive - sudo docker info -- cd /tmp/fuel-main && make repos -- $(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt -+ # fuel-main Makefiles do not like `make -C` -+ cd $(FUEL_MAIN_DIR) && make repos -+ $(REPOINFO) -r $(FUEL_MAIN_DIR) > gitinfo_fuel.txt - @if test -n $(ARMBAND_BASE); then \ - $(REPOINFO) -r $(ARMBAND_BASE) >> gitinfo_fuel.txt; \ - fi - # OPNFV patches at Fuel build time - # Need to be commited in order for them to be considered by the Fuel - # build system -- cd /tmp/fuel-main && git am $(TOPDIR)/bootstrap_admin_node.sh.patch -- cd /tmp/fuel-main && git am $(TOPDIR)/isolinux.cfg.patch -- cd /tmp/fuel-main/build/repos/fuel-nailgun && git am $(TOPDIR)/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch -- cd /tmp/fuel-main && git am $(TOPDIR)/repo-multi-arch-local-mirrors.patch -- cd /tmp/fuel-main && git am $(TOPDIR)/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch -+ $(foreach patch,$(FUEL_PATCHES),git \ -+ -C $(subst $(BUILD_BASE)/patch-repos,$(FUEL_MAIN_DIR),$(dir $(patch))) \ -+ am --whitespace=nowarn --committer-date-is-author-date $(patch) || \ -+ (echo 'Error: Failed patching Fuel repos!' ; exit 1);) -+ - # Repeat build up to three times - sudo -E ./fuel_build_loop -- cp /tmp/fuel-main/build/artifacts/fuel*.iso . -+ cp $(FUEL_MAIN_DIR)/build/artifacts/fuel*.iso . - # Store artifact in cache straight away if caching is enabled - # (no .cacheid will be present unless this is a cached build) - test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0 -@@ -227,11 +233,11 @@ debug: - # - The commit ID of the full Fuel repo structre - # - The contents of all local Fuel patches - .cacheid: -- cd /tmp && git clone $(FUEL_MAIN_REPO) -- cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG) -- cd /tmp/fuel-main && make repos -- $(REPOINFO) -r /tmp/fuel-main > .cachedata -- sha1sum *.patch >> .cachedata -+ git clone $(FUEL_MAIN_REPO) $(FUEL_MAIN_DIR) -+ git -C $(FUEL_MAIN_DIR) checkout $(FUEL_MAIN_TAG) -+ make -C $(FUEL_MAIN_DIR) repos -+ $(REPOINFO) -r $(FUEL_MAIN_DIR) > .cachedata -+ $(foreach patch,$(FUEL_PATCHES),sha1sum $(patch) >> .cachedata;) - sha1sum fuel_build_loop >> .cachedata - sha1sum config.mk >> .cachedata - @if test -n $(ARMBAND_BASE); then \ -diff --git a/build/bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch -similarity index 100% -rename from build/bootstrap_admin_node.sh.patch -rename to build/patch-repos/0010-bootstrap_admin_node.sh.patch -diff --git a/build/isolinux.cfg.patch b/build/patch-repos/0020-isolinux.cfg.patch -similarity index 100% -rename from build/isolinux.cfg.patch -rename to build/patch-repos/0020-isolinux.cfg.patch -diff --git a/build/repo-multi-arch-local-mirrors.patch b/build/patch-repos/0030-repo-multi-arch-local-mirrors.patch -similarity index 100% -rename from build/repo-multi-arch-local-mirrors.patch -rename to build/patch-repos/0030-repo-multi-arch-local-mirrors.patch -diff --git a/build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch b/build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch -similarity index 100% -rename from build/replace-dpkg-checkbuilddeps-with-mk-build-deps.patch -rename to build/patch-repos/0040-replace-dpkg-checkbuilddeps-with-mk-build-deps.patch -diff --git a/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch b/build/patch-repos/build/repos/fuel-nailgun/0010-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch -similarity index 100% -rename from build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch -rename to build/patch-repos/build/repos/fuel-nailgun/0010-Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch -- cgit 1.2.3-korg