@@ -20,9 +20,9 fi | |||||
20 |
|
20 | |||
21 |
|
21 | |||
22 | # Exclude packages if required by Debian release |
|
22 | # Exclude packages if required by Debian release | |
23 | if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then |
|
23 | #if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then | |
24 |
|
|
24 | # APT_EXCLUDES="--exclude=init,systemd-sysv" | |
25 | fi |
|
25 | #fi | |
26 |
|
26 | |||
27 |
|
27 | |||
28 | # Base debootstrap (unpack only) |
|
28 | # Base debootstrap (unpack only) |
@@ -36,7 +36,7 fi | |||||
36 | # Use specified APT server and release |
|
36 | # Use specified APT server and release | |
37 | sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list" |
|
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 | if [ "$RELEASE" = "testing" ] ; then |
|
40 | if [ "$RELEASE" = "testing" ] ; then | |
41 | sed -i "s,buster\\/updates,testing-security," "${ETC_DIR}/apt/sources.list" |
|
41 | sed -i "s,buster\\/updates,testing-security," "${ETC_DIR}/apt/sources.list" | |
42 | sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list" |
|
42 | sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list" |
@@ -28,13 +28,7 if [ "$ENABLE_FBTURBO" = true ] ; then | |||||
28 | fi |
|
28 | fi | |
29 |
|
29 | |||
30 | # Install Xorg build dependencies |
|
30 | # Install Xorg build dependencies | |
31 |
|
31 | 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 | ||
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 | 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 |
|
|||
36 | fi |
|
|||
37 |
|
||||
38 |
|
32 | |||
39 | # Build and install fbturbo driver inside chroot |
|
33 | # Build and install fbturbo driver inside chroot | |
40 | chroot_exec /bin/bash -x <<'EOF' |
|
34 | chroot_exec /bin/bash -x <<'EOF' |
@@ -76,9 +76,9 chroot_install_cc() { | |||||
76 | COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }') |
|
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 | chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES} |
|
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 | chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES} |
|
82 | chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES} | |
83 | fi |
|
83 | fi | |
84 |
|
84 | |||
@@ -119,4 +119,4 unset_kernel_config() { | |||||
119 | # unsets flag with the value of $1, config must exist at "./.config" |
|
119 | # unsets flag with the value of $1, config must exist at "./.config" | |
120 | TGT="CONFIG_${1#CONFIG_}" |
|
120 | TGT="CONFIG_${1#CONFIG_}" | |
121 | sed -i "s/^${TGT}=.*/# ${TGT} is not set/" .config |
|
121 | sed -i "s/^${TGT}=.*/# ${TGT} is not set/" .config | |
122 | } No newline at end of file |
|
122 | } |
@@ -2,7 +2,7 | |||||
2 | ######################################################################## |
|
2 | ######################################################################## | |
3 | # rpi23-gen-image.sh 2015-2017 |
|
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 | # This program is free software; you can redistribute it and/or |
|
7 | # This program is free software; you can redistribute it and/or | |
8 | # modify it under the terms of the GNU General Public License |
|
8 | # modify it under the terms of the GNU General Public License | |
@@ -36,11 +36,11 fi | |||||
36 |
|
36 | |||
37 | # Introduce settings |
|
37 | # Introduce settings | |
38 | set -e |
|
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 | set -x |
|
40 | set -x | |
41 |
|
41 | |||
42 | # Raspberry Pi model configuration |
|
42 | # Raspberry Pi model configuration | |
43 |
RPI_MODEL=${RPI_MODEL:= |
|
43 | RPI_MODEL=${RPI_MODEL:=3} | |
44 |
|
44 | |||
45 | # Debian release |
|
45 | # Debian release | |
46 | RELEASE=${RELEASE:=buster} |
|
46 | RELEASE=${RELEASE:=buster} |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant