Move qemu-user-static To Recommended Dependencies

This commit is contained in:
TheBrokenRail 2021-01-14 17:10:52 -05:00
parent 565603821e
commit 88843f6cbe
4 changed files with 6 additions and 1 deletions

View File

@ -5,4 +5,5 @@ Description: Fun with Blocks
Homepage: https://www.minecraft.net/en-us/edition/pi Homepage: https://www.minecraft.net/en-us/edition/pi
Architecture: all Architecture: all
Depends: ${DEPENDENCIES} Depends: ${DEPENDENCIES}
Recommends: ${RECOMMENDED_DEPENDENCIES}
Conflicts: minecraft-pi, minecraft-pi-virgl Conflicts: minecraft-pi, minecraft-pi-virgl

View File

@ -5,4 +5,5 @@ Description: Fun with Blocks
Homepage: https://www.minecraft.net/en-us/edition/pi Homepage: https://www.minecraft.net/en-us/edition/pi
Architecture: all Architecture: all
Depends: ${DEPENDENCIES}, virgl-server Depends: ${DEPENDENCIES}, virgl-server
Recommends: ${RECOMMENDED_DEPENDENCIES}
Conflicts: minecraft-pi, minecraft-pi-native Conflicts: minecraft-pi, minecraft-pi-native

View File

@ -5,3 +5,4 @@ Description: Fun with Blocks
Homepage: https://www.minecraft.net/en-us/edition/pi Homepage: https://www.minecraft.net/en-us/edition/pi
Architecture: all Architecture: all
Depends: ${DEPENDENCIES} Depends: ${DEPENDENCIES}
Recommends: ${RECOMMENDED_DEPENDENCIES}

View File

@ -5,8 +5,9 @@ DEB_VERSION='1.0.0'
# Dependencies # Dependencies
REQUIRED_DOCKER_VERSION='19.03' 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" CLIENT_DEPENDENCIES="zenity, policykit-1, passwd, login, x11-xserver-utils"
RECOMMENDED_DEPENDENCIES="qemu-user-static"
set -e set -e
@ -25,6 +26,7 @@ mkdir debian/tmp
prepare_control() { prepare_control() {
sed -i 's/${VERSION}/'"${DEB_VERSION}.$(date --utc '+%Y%m%d.%H%M')"'/g' "$1/DEBIAN/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/${DEPENDENCIES}/'"${COMMON_DEPENDENCIES}$2"'/g' "$1/DEBIAN/control"
sed -i 's/${RECOMMENDED_DEPENDENCIES}/'"${RECOMMENDED_DEPENDENCIES}$2"'/g' "$1/DEBIAN/control"
} }
# Package Client DEBs # Package Client DEBs