| @@ -20,9 +20,9 fi | |||
|
|
20 | 20 | |
|
|
21 | 21 | |
|
|
22 | 22 | # Exclude packages if required by Debian release |
|
|
23 | if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then | |
|
|
24 |
|
|
|
|
25 | fi | |
|
|
23 | #if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then | |
|
|
24 | # APT_EXCLUDES="--exclude=init,systemd-sysv" | |
|
|
25 | #fi | |
|
|
26 | 26 | |
|
|
27 | 27 | |
|
|
28 | 28 | # Base debootstrap (unpack only) |
| @@ -36,7 +36,7 fi | |||
|
|
36 | 36 | # Use specified APT server and release |
|
|
37 | 37 | sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list" |
|
|
38 | 38 | |
|
|
39 |
#Fix for changing path for security updates in testing |
|
|
|
39 | #Fix for changing path for security updates in testing | |
|
|
40 | 40 | if [ "$RELEASE" = "testing" ] ; then |
|
|
41 | 41 | sed -i "s,buster\\/updates,testing-security," "${ETC_DIR}/apt/sources.list" |
|
|
42 | 42 | sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list" |
| @@ -28,13 +28,7 if [ "$ENABLE_FBTURBO" = true ] ; then | |||
|
|
28 | 28 | fi |
|
|
29 | 29 | |
|
|
30 | 30 | # Install Xorg build dependencies |
|
|
31 | ||
|
|
32 | if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then | |
|
|
33 | chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev | |
|
|
34 | elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then | |
|
|
35 | 31 |
|
|
|
36 | fi | |
|
|
37 | ||
|
|
38 | 32 | |
|
|
39 | 33 | # Build and install fbturbo driver inside chroot |
|
|
40 | 34 | chroot_exec /bin/bash -x <<'EOF' |
| @@ -76,9 +76,9 chroot_install_cc() { | |||
|
|
76 | 76 | COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }') |
|
|
77 | 77 | |
|
|
78 | 78 | |
|
|
79 |
if |
|
|
|
79 | if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] ; then | |
|
|
80 | 80 | chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES} |
|
|
81 | elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then | |
|
|
81 | elif [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] ; then | |
|
|
82 | 82 | chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES} |
|
|
83 | 83 | fi |
|
|
84 | 84 | |
| @@ -2,7 +2,7 | |||
|
|
2 | 2 | ######################################################################## |
|
|
3 | 3 | # rpi23-gen-image.sh 2015-2017 |
|
|
4 | 4 | # |
|
|
5 |
# Advanced Debian " |
|
|
|
5 | # Advanced Debian "buster" and "bullseye" bootstrap script for Raspberry Pi | |
|
|
6 | 6 | # |
|
|
7 | 7 | # This program is free software; you can redistribute it and/or |
|
|
8 | 8 | # modify it under the terms of the GNU General Public License |
| @@ -36,11 +36,11 fi | |||
|
|
36 | 36 | |
|
|
37 | 37 | # Introduce settings |
|
|
38 | 38 | set -e |
|
|
39 | echo -n -e "\n#\n# RPi 0/1/2/3 Bootstrap Settings\n#\n" | |
|
|
39 | echo -n -e "\n#\n# RPi 0/1/2/3/4 Bootstrap Settings\n#\n" | |
|
|
40 | 40 | set -x |
|
|
41 | 41 | |
|
|
42 | 42 | # Raspberry Pi model configuration |
|
|
43 |
RPI_MODEL=${RPI_MODEL:= |
|
|
|
43 | RPI_MODEL=${RPI_MODEL:=3} | |
|
|
44 | 44 | |
|
|
45 | 45 | # Debian release |
|
|
46 | 46 | RELEASE=${RELEASE:=buster} |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
