From dd5550d06c6f714dc3a4db174b2bb006a5092206 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 19 Dec 2016 01:16:33 +0100 Subject: patches: fuel-mirror: Remove obsolete patches fuel-mirror has been replaced by packetary and all its patches we held in Armband are now obsolote as well. JIRA: ARMBAND-185 Change-Id: I1b83501965394ea8080305428bad17c826c5cf42 Signed-off-by: Alexandru Avadanii --- ...Set-mos-ubuntu-base-URL-to-linux.enea.com.patch | 21 ------- ...-fuel-agent-dependencies-to-Ubuntu-mirror.patch | 70 ---------------------- ...flavor-Add-linux-image-generic-lts-xenial.patch | 26 -------- 3 files changed, 117 deletions(-) delete mode 100644 patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch delete mode 100644 patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch delete mode 100644 patches/fuel-mirror/kernel-bump/0001-kernel-flavor-Add-linux-image-generic-lts-xenial.patch (limited to 'patches') diff --git a/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch b/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch deleted file mode 100644 index 9d45cda1..00000000 --- a/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Alexandru Avadanii -Date: Fri, 4 Mar 2016 00:51:40 +0100 -Subject: [PATCH] Set mos-ubuntu base URL to linux.enea.com. - -Contents of amd64 mos-ubuntu repos should be in sync with arm64. ---- - contrib/fuel_mirror/data/ubuntu.yaml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml -index ac62455..cd86ec9 100644 ---- a/contrib/fuel_mirror/data/ubuntu.yaml -+++ b/contrib/fuel_mirror/data/ubuntu.yaml -@@ -1,6 +1,6 @@ - # GLOBAL variables - ubuntu_baseurl: &ubuntu_baseurl http://archive.ubuntu.com/ubuntu --mos_baseurl: &mos_baseurl http://mirror.fuel-infra.org/mos-repos/ubuntu/$mos_version -+mos_baseurl: &mos_baseurl http://linux.enea.com/mos-repos/ubuntu/$mos_version - - fuel_release_match: - version: $openstack_version diff --git a/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch b/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch deleted file mode 100644 index d18c90a7..00000000 --- a/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Alexandru Avadanii -Date: Fri, 4 Mar 2016 00:59:54 +0100 -Subject: [PATCH] Add fuel-agent dependencies to Ubuntu mirror. - -Add qemu-user-static and binfmt-support to the list of packages -the local mirror of amd64 Ubuntu should contain. - -NOTE: This is needed because fuel-agent from upstream mirror does not -list them as dependencies (not patched for cross-debootstrap). - -FIXME: Will building/patching fuel-agent using OPNFV mechanism solve -missing deps from local mirror too? - -FIXME: Remove udev package from this patch when Ubuntu Trusty on arm64 -fixes persistent device names in the udev it ships out of the box. - -FIXME: Remove lshw package from this patch when Ubuntu Trusty on arm64 -fixes bug [1]: "AArch64: slow cpuinfo due to redundant loop". - -Added armband-odl-leveldb-fix for patching ODL's leveldbjni without -building it for each deploy. - -JIRA: ARMBAND-114 - -[1] https://bugs.launchpad.net/ubuntu/+source/lshw/+bug/1582181 ---- - contrib/fuel_mirror/data/ubuntu.yaml | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml -index cd86ec9..18fb1ee 100644 ---- a/contrib/fuel_mirror/data/ubuntu.yaml -+++ b/contrib/fuel_mirror/data/ubuntu.yaml -@@ -73,10 +73,12 @@ packages: &packages - - "acpi-support" - - "anacron" - - "aptitude" -+ - "armband-odl-leveldb-fix" - - "atop" - - "acct" - - "bash-completion" - - "bc" -+ - "binfmt-support" - - "build-essential" - - "cloud-init" - - "conntrackd" -@@ -101,6 +103,7 @@ packages: &packages - - "linux-image-generic-lts-trusty" - - "live-boot" - - "livecd-rootfs" -+ - "lshw" - - "mc" - - "memcached" - - "monit" -@@ -116,6 +119,7 @@ packages: &packages - - "puppet" - - "python-lesscpy" - - "python-pip" -+ - "qemu-user-static" - - "rsyslog-gnutls" - - "rsyslog-relp" - - "screen" -@@ -127,6 +131,7 @@ packages: &packages - - "tmux" - - "traceroute" - - "ubuntu-standard" -+ - "udev" - - "vim" - - "virt-what" - - "xinetd" diff --git a/patches/fuel-mirror/kernel-bump/0001-kernel-flavor-Add-linux-image-generic-lts-xenial.patch b/patches/fuel-mirror/kernel-bump/0001-kernel-flavor-Add-linux-image-generic-lts-xenial.patch deleted file mode 100644 index 35f356d6..00000000 --- a/patches/fuel-mirror/kernel-bump/0001-kernel-flavor-Add-linux-image-generic-lts-xenial.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Alexandru Avadanii -Date: Wed, 13 Jul 2016 21:33:04 +0200 -Subject: [PATCH] kernel-flavor: Add linux-image-generic-lts-xenial - -Ubuntu arm64: While keeping kernel 4.2 for Trusty -(linux-image-generic-lts-trusty), add 4.4 backported from Xenial -(linux-image-generic-lts-xenial) to local mirror in Armband ISO. - -Signed-off-by: Alexandru Avadanii ---- - contrib/fuel_mirror/data/ubuntu.yaml | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml -index 2ec4f1d..6805847 100644 ---- a/contrib/fuel_mirror/data/ubuntu.yaml -+++ b/contrib/fuel_mirror/data/ubuntu.yaml -@@ -100,6 +100,8 @@ packages: &packages - - "linux-firmware-nonfree" - - "linux-headers-generic-lts-trusty" - - "linux-image-generic-lts-trusty" -+ - "linux-headers-generic-lts-xenial" -+ - "linux-image-generic-lts-xenial" - - "live-boot" - - "livecd-rootfs" - - "lshw" -- cgit 1.2.3-korg