Raspi2-3_GenImage Commit - r668:dc3793318828 · Collaboration Tremplin des Sciences

fixes bullseye/testing renaming for chroot...

Unknown -

r668:dc3793318828

parent child

Context file:

r668:dc3793318828

Collapse all files

bootstrap.d/11-apt.sh +1 -1

             # Use specified APT server and release
             sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
-            if [ "$RELEASE" = "bullseye" ] || [ "$RELEASE" = "testing" ] ; then
+            if [ "$RELEASE" = "testing" ] ; then
             sed -i "s,stretch\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
             else
             sed -i "s/ stretch/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"

bootstrap.d/13-kernel.sh +6 -6

             	    # Mask this temporarily during switch to rpi-4.19.y
             	    #Fix SD_DRIVER upstream and downstream mess in 64bit RPIdeb_config
             	    # use correct driver MMC_BCM2835_MMC instead of MMC_BCM2835_SDHOST - see https://www.raspberrypi.org/forums/viewtopic.php?t=210225
-            	    set_kernel_config CONFIG_MMC_BCM2835 n
+            	    #set_kernel_config CONFIG_MMC_BCM2835 n
-            	    set_kernel_config CONFIG_MMC_SDHCI_IPROC n
+            	    #set_kernel_config CONFIG_MMC_SDHCI_IPROC n
-            	    set_kernel_config CONFIG_USB_DWC2 n
+            	    #set_kernel_config CONFIG_USB_DWC2 n
-            	    sed -i "s|depends on MMC_BCM2835_MMC && MMC_BCM2835_DMA|depends on MMC_BCM2835_MMC|" "${KERNEL_DIR}"/drivers/mmc/host/Kconfig
+            	    #sed -i "s|depends on MMC_BCM2835_MMC && MMC_BCM2835_DMA|depends on MMC_BCM2835_MMC|" "${KERNEL_DIR}"/drivers/mmc/host/Kconfig
             	    #VLAN got disabled without reason in arm64bit
             	    set_kernel_config CONFIG_IPVLAN m
             	    case "$KERNEL_DEFAULT_GOV" in
                       performance)
-            	        set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
+            	            set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
                         ;;
                       userspace)
-                        set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE y
+                        	    set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE y
                         ;;
                       ondemand)
             		    set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND y

rpi23-gen-image.sh +3 -1

             # Debian release
             RELEASE=${RELEASE:=buster}
+            if [ $RELEASE = "bullseye" ] ; then
+             RELEASE=testing
+            fi
             # Kernel Branch
             KERNEL_BRANCH=${KERNEL_BRANCH:=""}
             KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
             FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot}
             WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
-            COLLABORA_URL=${COLLABORA_URL:=https://repositories.collabora.co.uk/debian}
             FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
             UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
             VIDEOCORE_URL=${VIDEOCORE_URL:=https://github.com/raspberrypi/userland}

General Comments 0

Écrire
Preview

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages