X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=patches%2Fopnfv-fuel%2F0036-repo-mirror-Allow-multi-arch-local-mirrors.patch;h=45ebb4e9ee50ed1bf35362363107e9c9d1c129a0;hb=dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7;hp=0316e42bd1d70cd882f81458bae8681a8b19b98e;hpb=293e752ad5f422359c8d0efa0a51fbb484318212;p=armband.git 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 index 0316e42b..45ebb4e9 100644 --- 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 @@ -13,33 +13,68 @@ 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 Signed-off-by: Alexandru Avadanii --- build/Makefile | 1 + - build/repo-multi-arch-local-mirrors.patch | 45 +++++++++++++++++++++++++++++++ - 2 files changed, 46 insertions(+) + 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 2d33aa4..0490bab 100644 +index 95b1487..829a231 100644 --- a/build/Makefile +++ b/build/Makefile -@@ -139,6 +139,7 @@ $(ISOCACHE): - cd /tmp/fuel-main && git config user.email "fuel@opnfv.org" +@@ -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..c3ff26a +index 0000000..d404287 --- /dev/null +++ b/build/repo-multi-arch-local-mirrors.patch -@@ -0,0 +1,45 @@ +@@ -0,0 +1,59 @@ +From: Stanislaw Kardach +Date: Thu, 25 Feb 2016 13:31:19 +0100 +Subject: repo mirror: Allow multi-arch local mirrors @@ -57,7 +92,8 @@ index 0000000..c3ff26a +--- + mirror/ubuntu/module.mk | 2 +- + sandbox.mk | 2 +- -+ 2 files changed, 2 insertions(+), 2 deletions(-) ++ 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 @@ -85,3 +121,16 @@ index 0000000..c3ff26a + 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 ++