aboutsummaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-04-08 15:32:58 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-02 14:23:31 +0000
commit8169211d5ca2ddff72a7b5279fc9146af46e5cea (patch)
treeba2e03e3506fe9de81710dfe3ad0efedab81274d /patches
parentd8451852f403bc1a820452478328bdb7d7d2fa47 (diff)
FIXME: Add --force-yes to apt-get dist-upgrade.
arm64 udev in Ubuntu Trusty is broken, so we had to provide our own patched udev package in armband MOS repos. Due to dpkg version comparison algorithm, our MOS version of udev is considered a downgrade, which requires --force-yes for apt-get dist-upgrade to work and pick up this version, otherwise bootstrap/target image build would fail with apt-get error code 100. This change can be dropped later, if other packages do not manifest the same behavior. Change-Id: I00f6a55290f2d09fd6aacfa948c84e39da27923d (cherry picked from commit 4ac065843d64e56ba7374ad8732cc27f8682a8be)
Diffstat (limited to 'patches')
-rw-r--r--patches/fuel-agent/0009-FIXME-Add-force-yes-to-apt-get-dist-upgrade.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/fuel-agent/0009-FIXME-Add-force-yes-to-apt-get-dist-upgrade.patch b/patches/fuel-agent/0009-FIXME-Add-force-yes-to-apt-get-dist-upgrade.patch
new file mode 100644
index 00000000..90428c57
--- /dev/null
+++ b/patches/fuel-agent/0009-FIXME-Add-force-yes-to-apt-get-dist-upgrade.patch
@@ -0,0 +1,31 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Fri, 8 Apr 2016 15:28:43 +0200
+Subject: [PATCH] FIXME: Add --force-yes to apt-get dist-upgrade.
+
+arm64 udev in Ubuntu Trusty is broken, so we had to provide our own
+patched udev package in armband MOS repos.
+
+Due to dpkg version comparison algorithm, our MOS version of udev
+is considered a downgrade, which requires --force-yes for
+apt-get dist-upgrade to work and pick up this version, otherwise
+bootstrap/target image build would fail with apt-get error code 100.
+
+This change can be dropped later, if other packages do not manifest
+the same behavior.
+---
+ fuel_agent/utils/build.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fuel_agent/utils/build.py b/fuel_agent/utils/build.py
+index e11ceba..8cca26d 100644
+--- a/fuel_agent/utils/build.py
++++ b/fuel_agent/utils/build.py
+@@ -111,7 +111,7 @@ def run_apt_get(chroot, packages, eatmydata=False, attempts=10):
+ time in X times.
+ """
+ for action in ('update', 'dist-upgrade'):
+- cmds = ['chroot', chroot, 'apt-get', '-y', action]
++ cmds = ['chroot', chroot, 'apt-get', '-y', '--force-yes', action]
+ stdout, stderr = utils.execute(*cmds, attempts=attempts)
+ LOG.debug('Running apt-get %s completed.\nstdout: %s\nstderr: %s',
+ action, stdout, stderr)