From ebe859aafba265a1f6f7472af61537f322cb9ac6 Mon Sep 17 00:00:00 2001
From: David Schneider <dnschneid@chromium.org>
Date: Fri, 20 Jan 2017 16:40:46 -0800
Subject: [PATCH] Unhold dummy if backports are enabled

---
 targets/xiwi | 5 +++++
 targets/xorg | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/targets/xiwi b/targets/xiwi
index 8ea3d5315..57f86b625 100755
--- a/targets/xiwi
+++ b/targets/xiwi
@@ -26,6 +26,11 @@ elif release -eq trusty; then
     backport='-lts-xenial'
 fi
 
+# Avoid issues when jumping backports
+if [ "${DISTROAKA:-"$DISTRO"}" = 'debian' -a -n "$backport" ]; then
+    apt-mark unhold xserver-xorg-video-dummy || true 2>/dev/null
+fi
+
 # Unhold xserver-xorg-video-dummy to make sure deps are pulled in
 if [ "${DISTROAKA:-"$DISTRO"}" = 'debian' ]; then
     apt-mark unhold xserver-xorg-video-dummy$backport || true 2>/dev/null
diff --git a/targets/xorg b/targets/xorg
index 10d282f46..d494fe329 100644
--- a/targets/xorg
+++ b/targets/xorg
@@ -34,6 +34,11 @@ elif release -eq trusty; then
     backport='-lts-xenial'
 fi
 
+# Avoid issues when jumping backports
+if [ "${DISTROAKA:-"$DISTRO"}" = 'debian' -a -n "$backport" ]; then
+    apt-mark unhold xserver-xorg-video-dummy || true 2>/dev/null
+fi
+
 # Intel?
 inteldriver=''
 if [ "${ARCH#arm}" = "$ARCH" ]; then