summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-31 14:30:14 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-31 14:47:54 +0200
commite799e8f3912dac025e5be5e8c748df8b68b7d06d (patch)
treec8a336156b0eaa7c35a376aca33529efeb107a53 /patches
parentcfdf55bc7b2c00f16dc9a0c240e3c1a4a66e372c (diff)
Upstream: multiarch mirrors
Change-Id: Ia54bd3955a3e3b534d8c4d8380de5870a106edc5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0036-repo-mirror-Allow-multi-arch-local-mirrors.patch136
-rw-r--r--patches/opnfv-fuel/0045-build-cache-Consider-UBUNTU_ARCH-in-.cacheid.patch144
2 files changed, 0 insertions, 280 deletions
diff --git a/patches/opnfv-fuel/0036-repo-mirror-Allow-multi-arch-local-mirrors.patch b/patches/opnfv-fuel/0036-repo-mirror-Allow-multi-arch-local-mirrors.patch
deleted file mode 100644
index 45ebb4e9..00000000
--- a/patches/opnfv-fuel/0036-repo-mirror-Allow-multi-arch-local-mirrors.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 18 Jun 2016 19:42:15 +0200
-Subject: [PATCH] repo mirror: Allow multi-arch local mirrors
-
-This patch allows specifying multiple architectures via UBUNTU_ARCH in
-form of a list of space separated architectures. The first architecture
-in the list is considered primary and will be used for building all the
-deb packages by fuel-main. Additional architectures are added to allow
-targets of other architectures to use the mirror.
-
-NOTE: this imposes a requirement that all packages built are arch
-independent (which is true so far).
-
-[ Alexandru Avadanii ]
-Reworked for applying on top of fuel@OPNFV.
-Pass UBUNTU_ARCH to Docker containers.
-
-Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/Makefile | 1 +
- build/docker/Dockerfile | 2 +-
- build/docker/runcontext | 8 ++++-
- build/repo-multi-arch-local-mirrors.patch | 59 +++++++++++++++++++++++++++++++
- 4 files changed, 68 insertions(+), 2 deletions(-)
- create mode 100644 build/repo-multi-arch-local-mirrors.patch
-
-diff --git a/build/Makefile b/build/Makefile
-index 95b1487..829a231 100644
---- a/build/Makefile
-+++ b/build/Makefile
-@@ -135,6 +135,7 @@ $(ISOCACHE):
- 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
- # Repeat build up to three times
- sudo -E ./fuel_build_loop
- cp /tmp/fuel-main/build/artifacts/fuel*.iso .
-diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
-index 1bb56b7..b38ea4c 100644
---- a/build/docker/Dockerfile
-+++ b/build/docker/Dockerfile
-@@ -30,7 +30,7 @@ RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC
- # Keeping PWD is needed to build as root
- RUN echo "Defaults env_keep += \"PWD\"" > /etc/sudoers.d/keep-pwd
- # Keeping variables for ISO build
--RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU\"" > /etc/sudoers.d/keep-mos
-+RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU UBUNTU_ARCH\"" > /etc/sudoers.d/keep-mos
- RUN chmod 0440 /etc/sudoers.d/open-sudo
- RUN chmod 0440 /etc/sudoers.d/keep-proxies
- RUN chmod 0440 /etc/sudoers.d/keep-pwd
-diff --git a/build/docker/runcontext b/build/docker/runcontext
-index 9f07776..daad663 100755
---- a/build/docker/runcontext
-+++ b/build/docker/runcontext
-@@ -111,7 +111,13 @@ if [ -n "$CACHEBASE" ]; then
- fi
- fi
-
--RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL -e LATEST_TARGET_UBUNTU -u $USER_ID:$GROUP_ID -w $PWD -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"
-+RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
-+ -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \
-+ -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \
-+ -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
-+ -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH \
-+ -u $USER_ID:$GROUP_ID -w $PWD \
-+ -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"
-
- # Passing "debug" puts up an interactive bash shell
- if [ "$1" == "debug" ]; then
-diff --git a/build/repo-multi-arch-local-mirrors.patch b/build/repo-multi-arch-local-mirrors.patch
-new file mode 100644
-index 0000000..d404287
---- /dev/null
-+++ b/build/repo-multi-arch-local-mirrors.patch
-@@ -0,0 +1,59 @@
-+From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-+Date: Thu, 25 Feb 2016 13:31:19 +0100
-+Subject: repo mirror: Allow multi-arch local mirrors
-+
-+This patch allows specifying multiple architectures via UBUNTU_ARCH in
-+form of a list of space separated architectures. The first architecture
-+in the list is considered primary and will be used for building all the
-+deb packages by fuel-main. Additional architectures are added to allow
-+targets of other architectures to use the mirror.
-+NOTE: this imposes a requirement that all packages built are arch
-+independent (which is true so far).
-+
-+Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+---
-+ mirror/ubuntu/module.mk | 2 +-
-+ sandbox.mk | 2 +-
-+ config.mk | 2 +-
-+ 3 files changed, 3 insertions(+), 3 deletions(-)
-+
-+diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk
-+index 7a9466e..fe1ada2 100644
-+--- a/mirror/ubuntu/module.mk
-++++ b/mirror/ubuntu/module.mk
-+@@ -81,7 +81,7 @@ $(BUILD_DIR)/mirror/ubuntu/mirror.done:
-+ --root=$(MIRROR_MOS_UBUNTU_ROOT) \
-+ --dist=$(MIRROR_MOS_UBUNTU_SUITE) \
-+ --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
-+- --arch=$(UBUNTU_ARCH) \
-++ --arch=$(shell echo $(UBUNTU_ARCH) | tr ' ' ',') \
-+ $(LOCAL_MIRROR_UBUNTU)/
-+ rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
-+ $(ACTION.TOUCH)
-+diff --git a/sandbox.mk b/sandbox.mk
-+index 4bc3962..5ffddbd 100644
-+--- a/sandbox.mk
-++++ b/sandbox.mk
-+@@ -188,7 +188,7 @@ touch $(SANDBOX_UBUNTU)/etc/init.d/.legacy-bootordering
-+ mkdir -p $(SANDBOX_UBUNTU)/usr/sbin
-+ cp -a $(BUILD_DIR)/policy-rc.d $(SANDBOX_UBUNTU)/usr/sbin
-+ echo "Running debootstrap"
-+-sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(UBUNTU_ARCH) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
-++sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(word 1,$(UBUNTU_ARCH)) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
-+ if [ -e $(SANDBOX_UBUNTU)/etc/resolv.conf ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf.orig; fi
-+ sudo cp /etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf
-+ if [ -e $(SANDBOX_UBUNTU)/etc/hosts ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/hosts $(SANDBOX_UBUNTU)/etc/hosts.orig; fi
-+diff --git a/config.mk b/config.mk
-+index 74ee039..45a3b30 100644
-+--- a/config.mk
-++++ b/config.mk
-+@@ -49,7 +49,7 @@ UBUNTU_MINOR:=04
-+ UBUNTU_RELEASE_NUMBER:=$(UBUNTU_MAJOR).$(UBUNTU_MINOR)
-+ UBUNTU_KERNEL_FLAVOR?=lts-trusty
-+ UBUNTU_NETBOOT_FLAVOR?=netboot
-+-UBUNTU_ARCH:=amd64
-++UBUNTU_ARCH?=amd64
-+ UBUNTU_IMAGE_RELEASE:=$(UBUNTU_MAJOR)$(UBUNTU_MINOR)
-+ SEPARATE_IMAGES?=/boot,ext2 /,ext4
-+
diff --git a/patches/opnfv-fuel/0045-build-cache-Consider-UBUNTU_ARCH-in-.cacheid.patch b/patches/opnfv-fuel/0045-build-cache-Consider-UBUNTU_ARCH-in-.cacheid.patch
deleted file mode 100644
index 43d5bcc5..00000000
--- a/patches/opnfv-fuel/0045-build-cache-Consider-UBUNTU_ARCH-in-.cacheid.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Wed, 17 Aug 2016 20:36:51 +0200
-Subject: [PATCH] build: cache: Consider UBUNTU_ARCH in .cacheid
-
-Usually UBUNTU_ARCH is not changed inside the same repository,
-but we should consider this case anyway for future merging
-Armband and Fuel@OPNFV repositories/build systems.
-
-This applies to all Fuel plugins and the local repo.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/f_isoroot/f_bgpvpn-pluginbuild/Makefile | 1 +
- build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile | 1 +
- build/f_isoroot/f_kvm-pluginbuild/Makefile | 1 +
- build/f_isoroot/f_odlpluginbuild/Makefile | 1 +
- build/f_isoroot/f_onosfwpluginbuild/Makefile | 1 +
- build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile | 1 +
- build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile | 1 +
- build/f_isoroot/f_repobuild/Makefile | 1 +
- build/f_isoroot/f_vsperfpluginbuild/Makefile | 1 +
- build/f_isoroot/f_yardstick-pluginbuild/Makefile | 1 +
- 10 files changed, 10 insertions(+)
-
-diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
-index ed3be29..8ce28fc 100644
---- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
-+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
-@@ -67,6 +67,7 @@ release:.bgpvpnbuild
- fi
- sha1sum Makefile >> .cachedata
- sha1sum config.mk >> .cachedata
-+ echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build
-diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
-index 9ab922d..17bc36d 100644
---- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
-+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
-@@ -67,6 +67,7 @@ release:.fastpathmetrics
- fi
- @sha1sum Makefile | awk {'print $$1'} >> .cachedata
- @sha1sum config.mk | awk {'print $$1'} >> .cachedata
-+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- @cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build
-diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
-index ba2fd0b..2454b5e 100644
---- a/build/f_isoroot/f_kvm-pluginbuild/Makefile
-+++ b/build/f_isoroot/f_kvm-pluginbuild/Makefile
-@@ -70,6 +70,7 @@ release:.kvmbuild
- fi
- @sha1sum Makefile | awk {'print $$1'} >> .cachedata
- @sha1sum config.mk | awk {'print $$1'} >> .cachedata
-+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- @cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build
-diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
-index e2cbf7d..6c717c7 100644
---- a/build/f_isoroot/f_odlpluginbuild/Makefile
-+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
-@@ -58,6 +58,7 @@ release:.odlbuild
- fi
- @sha1sum Makefile | awk {'print $$1'} >> .cachedata
- @sha1sum config.mk | awk {'print $$1'} >> .cachedata
-+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build
-diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile
-index a9dcb22..02ba029 100644
---- a/build/f_isoroot/f_onosfwpluginbuild/Makefile
-+++ b/build/f_isoroot/f_onosfwpluginbuild/Makefile
-@@ -66,6 +66,7 @@ release:.onosbuild
- fi
- @sha1sum Makefile | awk {'print $$1'} >> .cachedata
- @sha1sum config.mk | awk {'print $$1'} >> .cachedata
-+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- @cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build
-diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
-index ecf586a..2d0d202 100644
---- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
-+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
-@@ -67,6 +67,7 @@ release:.ovsbuild
- fi
- @sha1sum Makefile | awk {'print $$1'} >> .cachedata
- @sha1sum config.mk | awk {'print $$1'} >> .cachedata
-+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- @cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build
-diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
-index 9e432d1..9455389 100644
---- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
-+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
-@@ -67,6 +67,7 @@ release:.ovsnfvbuild
- fi
- @sha1sum Makefile | awk {'print $$1'} >> .cachedata
- @sha1sum config.mk | awk {'print $$1'} >> .cachedata
-+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- @cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build
-diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
-index 6fef8ff..f6ebc2c 100644
---- a/build/f_isoroot/f_repobuild/Makefile
-+++ b/build/f_isoroot/f_repobuild/Makefile
-@@ -73,6 +73,7 @@ release:nailgun
- sha1sum Makefile >> .cachedata
- sha1sum config.mk >> .cachedata
- $(CACHETOOL) packages >> .cachedata
-+ echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build
-diff --git a/build/f_isoroot/f_vsperfpluginbuild/Makefile b/build/f_isoroot/f_vsperfpluginbuild/Makefile
-index 9bd236a..73de611 100644
---- a/build/f_isoroot/f_vsperfpluginbuild/Makefile
-+++ b/build/f_isoroot/f_vsperfpluginbuild/Makefile
-@@ -68,6 +68,7 @@ release:.vsperfbuild
- fi
- @sha1sum Makefile | awk {'print $$1'} >> .cachedata
- @sha1sum config.mk | awk {'print $$1'} >> .cachedata
-+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- @cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build
-diff --git a/build/f_isoroot/f_yardstick-pluginbuild/Makefile b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
-index 47723d5..32de3b3 100644
---- a/build/f_isoroot/f_yardstick-pluginbuild/Makefile
-+++ b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
-@@ -68,6 +68,7 @@ release:.yardstickbuild
- fi
- @sha1sum Makefile | awk {'print $$1'} >> .cachedata
- @sha1sum config.mk | awk {'print $$1'} >> .cachedata
-+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
- @cat .cachedata | $(CACHETOOL) getid > .cacheid
-
- # Clean local data related to caching - called prior to ordinary build