Skip to content

Commit

Permalink
Unhold dummy if backports are enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
dnschneid committed Nov 9, 2017
1 parent c0f61fb commit ebe859a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions targets/xiwi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions targets/xorg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ebe859a

Please sign in to comment.