| @@ -20,12 +20,7 if [ "$ENABLE_MINBASE" = true ] ; then | |||
|
|
20 | 20 | fi |
|
|
21 | 21 | |
|
|
22 | 22 | # Exclude packages if required by Debian release |
|
|
23 | if [ "$RELEASE" = "stretch" ] ; then | |
|
|
24 | EXCLUDES="--exclude=init,systemd-sysv" | |
|
|
25 | fi | |
|
|
26 | ||
|
|
27 | # Exclude packages if required by Debian buster release | |
|
|
28 | if [ "$RELEASE" = "buster" ] ; then | |
|
|
23 | if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then | |
|
|
29 | 24 | EXCLUDES="--exclude=init,systemd-sysv" |
|
|
30 | 25 | fi |
|
|
31 | 26 | |
| @@ -28,12 +28,7 if [ "$ENABLE_FBTURBO" = true ] ; then | |||
|
|
28 | 28 | fi |
|
|
29 | 29 | |
|
|
30 | 30 | # Install Xorg build dependencies |
|
|
31 | if [ "$RELEASE" = "jessie" ] ; then | |
|
|
32 | chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev | |
|
|
33 | elif [ "$RELEASE" = "stretch" ] ; then | |
|
|
34 | chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev | |
|
|
35 | # removed --allow-unauthenticated as recommended after amendment on _apt privileges | |
|
|
36 | elif [ "$RELEASE" = "buster" ] ; then | |
|
|
31 | if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then | |
|
|
37 | 32 | chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev |
|
|
38 | 33 | fi |
|
|
39 | 34 | |
| @@ -59,10 +59,8 chroot_install_cc() { | |||
|
|
59 | 59 | if [ -z "${COMPILER_PACKAGES}" ] ; then |
|
|
60 | 60 | COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }') |
|
|
61 | 61 | |
|
|
62 | if [ "$RELEASE" = "jessie" ] ; then | |
|
|
62 | if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then | |
|
|
63 | 63 | chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES} |
|
|
64 | elif [ "$RELEASE" = "stretch" ] ; then | |
|
|
65 | chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES} | |
|
|
66 | 64 | fi |
|
|
67 | 65 | fi |
|
|
68 | 66 | } |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
