From 88843f6cbec56534ef26694844bf8334f6468f28 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Thu, 14 Jan 2021 17:10:52 -0500 Subject: [PATCH] Move qemu-user-static To Recommended Dependencies --- debian/client/native/DEBIAN/control | 1 + debian/client/virgl/DEBIAN/control | 1 + debian/server/DEBIAN/control | 1 + scripts/package.sh | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/client/native/DEBIAN/control b/debian/client/native/DEBIAN/control index 6170fe27c..0a5619801 100644 --- a/debian/client/native/DEBIAN/control +++ b/debian/client/native/DEBIAN/control @@ -5,4 +5,5 @@ Description: Fun with Blocks Homepage: https://www.minecraft.net/en-us/edition/pi Architecture: all Depends: ${DEPENDENCIES} +Recommends: ${RECOMMENDED_DEPENDENCIES} Conflicts: minecraft-pi, minecraft-pi-virgl diff --git a/debian/client/virgl/DEBIAN/control b/debian/client/virgl/DEBIAN/control index 843e7c3c6..784ed7e5c 100644 --- a/debian/client/virgl/DEBIAN/control +++ b/debian/client/virgl/DEBIAN/control @@ -5,4 +5,5 @@ Description: Fun with Blocks Homepage: https://www.minecraft.net/en-us/edition/pi Architecture: all Depends: ${DEPENDENCIES}, virgl-server +Recommends: ${RECOMMENDED_DEPENDENCIES} Conflicts: minecraft-pi, minecraft-pi-native diff --git a/debian/server/DEBIAN/control b/debian/server/DEBIAN/control index 806cf7db8..dc6221613 100644 --- a/debian/server/DEBIAN/control +++ b/debian/server/DEBIAN/control @@ -5,3 +5,4 @@ Description: Fun with Blocks Homepage: https://www.minecraft.net/en-us/edition/pi Architecture: all Depends: ${DEPENDENCIES} +Recommends: ${RECOMMENDED_DEPENDENCIES} diff --git a/scripts/package.sh b/scripts/package.sh index b659cc540..242700427 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -5,8 +5,9 @@ DEB_VERSION='1.0.0' # Dependencies REQUIRED_DOCKER_VERSION='19.03' -COMMON_DEPENDENCIES="docker.io (>=${REQUIRED_DOCKER_VERSION}) | docker-ce (>=${REQUIRED_DOCKER_VERSION}), libseccomp2 (>=2.4.2), docker-compose, qemu-user-static, binfmt-support" +COMMON_DEPENDENCIES="docker.io (>=${REQUIRED_DOCKER_VERSION}) | docker-ce (>=${REQUIRED_DOCKER_VERSION}), libseccomp2 (>=2.4.2), docker-compose, binfmt-support" CLIENT_DEPENDENCIES="zenity, policykit-1, passwd, login, x11-xserver-utils" +RECOMMENDED_DEPENDENCIES="qemu-user-static" set -e @@ -25,6 +26,7 @@ mkdir debian/tmp prepare_control() { sed -i 's/${VERSION}/'"${DEB_VERSION}.$(date --utc '+%Y%m%d.%H%M')"'/g' "$1/DEBIAN/control" sed -i 's/${DEPENDENCIES}/'"${COMMON_DEPENDENCIES}$2"'/g' "$1/DEBIAN/control" + sed -i 's/${RECOMMENDED_DEPENDENCIES}/'"${RECOMMENDED_DEPENDENCIES}$2"'/g' "$1/DEBIAN/control" } # Package Client DEBs