diff options
| -rw-r--r-- | patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch | 50 | ||||
| -rw-r--r-- | patches/fuel-main/0001-mirror-sandbox-Allow-multi-arch-debian-mirrors.patch (renamed from patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch) | 16 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch | 4 |
3 files changed, 12 insertions, 58 deletions
diff --git a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch b/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch deleted file mode 100644 index 07f1fb93..00000000 --- a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -Date: Thu, 25 Feb 2016 13:31:19 +0100 -Subject: [PATCH] Use qemu-debootstrap to support multi-arch - ---- - prepare-build-env.sh | 2 +- - requirements-rpm.txt | 1 + - sandbox.mk | 4 ++-- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/prepare-build-env.sh b/prepare-build-env.sh -index 194e528..fa186ed 100755 ---- a/prepare-build-env.sh -+++ b/prepare-build-env.sh -@@ -112,6 +112,7 @@ - lrzip \ - python-jinja2 \ - python-yaml \ -+ qemu-user-static - reprepro \ - rpm \ - syslinux \ - unzip \ -diff --git a/requirements-rpm.txt b/requirements-rpm.txt -index e0aa9ba..9a2d141 100644 ---- a/requirements-rpm.txt -+++ b/requirements-rpm.txt -@@ -202,6 +202,7 @@ python-yaql - pytz - PyYAML - qemu-img -+qemu-user-static - rabbitmq-server - rpm - rpm-build -diff --git a/sandbox.mk b/sandbox.mk -index 3c65cc6..cf3704b 100644 ---- a/sandbox.mk -+++ b/sandbox.mk -@@ -182,8 +182,8 @@ mkdir -p $(SANDBOX_UBUNTU)/etc/init.d - 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) -+echo "Running qemu-debootstrap" -+sudo qemu-debootstrap --no-check-gpg --include=ca-certificates --arch=$(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/patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch b/patches/fuel-main/0001-mirror-sandbox-Allow-multi-arch-debian-mirrors.patch index 9be98494..18f2c20e 100644 --- a/patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch +++ b/patches/fuel-main/0001-mirror-sandbox-Allow-multi-arch-debian-mirrors.patch @@ -1,6 +1,6 @@ From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -Date: Thu, 25 Feb 2016 23:58:58 +0100 -Subject: [PATCH] Allow multi-arch debian mirrors +Date: Thu, 25 Feb 2016 13:31:19 +0100 +Subject: [PATCH] mirror, sandbox: Allow multi-arch debian mirrors This patch allows specifying multiple architectures via UBUNTU_ARCH in form of a list of space separated architectures. The first architecture @@ -9,6 +9,8 @@ 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@caviumnetworks.com> --- mirror/ubuntu/module.mk | 2 +- sandbox.mk | 2 +- @@ -28,15 +30,15 @@ index 7a9466e..fe1ada2 100644 rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project $(ACTION.TOUCH) diff --git a/sandbox.mk b/sandbox.mk -index cf3704b..18757a1 100644 +index 4bc3962..5ffddbd 100644 --- a/sandbox.mk +++ b/sandbox.mk -@@ -183,7 +183,7 @@ touch $(SANDBOX_UBUNTU)/etc/init.d/.legacy-bootordering +@@ -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 qemu-debootstrap" --sudo qemu-debootstrap --no-check-gpg --include=ca-certificates --arch=$(UBUNTU_ARCH) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT) -+sudo qemu-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) + 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/patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch b/patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch index 7cb759e1..9ed79cc4 100644 --- a/patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch +++ b/patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch @@ -51,7 +51,7 @@ index ed5bc99..9f14e35 100644 from common import ( N, -@@ -248,6 +250,38 @@ class Reap(object): +@@ -248,6 +250,40 @@ class Reap(object): if key not in ['ipaddress', 'netmask', 'dhcp_pool_start', 'dhcp_pool_end', 'ssh_network']: del fuel['ADMIN_NETWORK'][key] @@ -78,6 +78,8 @@ index ed5bc99..9f14e35 100644 + ifcfg_f = ('/etc/sysconfig/network-scripts/ifcfg-%s' % ifcfg_name) + with open(ifcfg_f) as f: + for line in f: ++ if line.startswith('#'): ++ continue + (key, val) = line.split('=') + ifcfg_data[key.lower()] = val.rstrip() + |