##// END OF EJS Templates
Updates due to modifs on raspberryPi /linux github...
vidal -
r774:33d3a3b5ebfc
parent child
Show More
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
@@ -17,10 +17,10 install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
17 # Use specified APT server and release
17 # Use specified APT server and release
18 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
18 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
19
19
20 #Fix for changing path for security updates in testing
20 #Fix for changing path for security updates in oldstable / buster
21 if [ "$RELEASE" = "testing" ] ; then
21 if [ "$RELEASE" = "oldstable" ] || [ "$RELEASE" = "buster " ] ; then
22 sed -i "s,buster\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
22 sed -i "s:bullseye-security:${RELEASE}\\/updates:" "${ETC_DIR}/apt/sources.list"
23 sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
23 sed -i "s:security.debian.org/debian-security:security.debian.org:" "${ETC_DIR}/apt/sources.list"
24 fi
24 fi
25
25
26 if [ "$ENABLE_NONFREE" = "true" ] ; then
26 if [ "$ENABLE_NONFREE" = "true" ] ; then
@@ -29,7 +29,7 fi
29
29
30 if [ -z "$RELEASE" ] ; then
30 if [ -z "$RELEASE" ] ; then
31 # Change release in sources list
31 # Change release in sources list
32 sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
32 sed -i "s/ bullseye/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
33 fi
33 fi
34
34
35 # Upgrade package index and update all installed packages and changed dependencies
35 # Upgrade package index and update all installed packages and changed dependencies
@@ -1,8 +1,8
1 deb http://ftp.debian.org/debian buster main contrib
1 deb http://debian.proxad.net/debian/ bullseye main contrib
2 #deb-src http://ftp.debian.org/debian buster main contrib
2 #deb-src http://ftp.debian.org/debian bullseye main contrib
3
3
4 deb http://ftp.debian.org/debian/ buster-updates main contrib
4 deb http://debian.proxad.net/debian/ bullseye-updates main contrib
5 #deb-src http://ftp.debian.org/debian/ buster-updates main contrib
5 #deb-src http://ftp.debian.org/debian/ bullseye-updates main contrib
6
6
7 deb http://security.debian.org/ buster/updates main contrib
7 deb http://security.debian.org/debian-security bullseye-security main contrib
8 #deb-src http://security.debian.org/ buster/updates main contrib
8 #deb-src http://security.debian.org/ bullseye/updates main contrib
@@ -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 [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] ; then
79 if [ "$RELEASE" = "bookworm" ] || [ "$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" = "buster" ] || [ "$RELEASE" = "bullseye" ] ; then
81 elif [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] || [ "$RELEASE" = "bookworm" ]; 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
@@ -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 "buster" and "bullseye" bootstrap script for Raspberry Pi
5 # Advanced Debian "bullseye" and "bookworm" 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
@@ -39,14 +39,15 set -e
39 echo -n -e "\n#\n# RPi 0/1/2/3/4 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 defaults to 3P
43 RPI_MODEL=${RPI_MODEL:=3P}
43 RPI_MODEL=${RPI_MODEL:=3P}
44
44
45 # Debian release
45 # Debian release defaults to bullseye
46 RELEASE=${RELEASE:=buster}
46 RELEASE=${RELEASE:=bullseye}
47 if [ $RELEASE = "bullseye" ] ; then
47 if [ "$RELEASE" = "bookworm" ] ; then
48 RELEASE=testing
48 RELEASE=testing
49 fi
49 fi
50 echo "Debian release value used : " $RELEASE
50
51
51 # Kernel Branch
52 # Kernel Branch
52 KERNEL_BRANCH=${KERNEL_BRANCH:=""}
53 KERNEL_BRANCH=${KERNEL_BRANCH:=""}
@@ -54,7 +55,8 KERNEL_BRANCH=${KERNEL_BRANCH:=""}
54 # URLs
55 # URLs
55 KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
56 KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
56 FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot}
57 FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot}
57 WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
58 #WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
59 WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/bullseye/debian/config/brcm80211/brcm}
58 FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
60 FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
59 UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
61 UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
60 VIDEOCORE_URL=${VIDEOCORE_URL:=https://github.com/raspberrypi/userland}
62 VIDEOCORE_URL=${VIDEOCORE_URL:=https://github.com/raspberrypi/userland}
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant