Raspi2-3_GenImage Commit - r616:14b04258ec8f · Collaboration Tremplin des Sciences

Merge pull request #23 from drtyhlpr/master...

Gérard Vidal -

r616:14b04258ec8f

parent child

Context file:

r616:14b04258ec8f

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

             # Install additional packages
             if [ "$APT_INCLUDES_LATE" ] ; then
-              chroot_exec apt-get -qq -y install "$(echo "$APT_INCLUDES_LATE" |tr , ' ')"
+              chroot_exec apt-get -qq -y install $(echo "$APT_INCLUDES_LATE" |tr , ' ')
             fi
             # Install Debian custom packages

bootstrap.d/12-locale.sh +8 0

             # Install and setup timezone
             echo "${TIMEZONE}" > "${ETC_DIR}/timezone"
+            if [ -f "${ETC_DIR}/localtime" ]; then
+                # 1. If 11-apt.sh upgrades the package 'tzdata', '/etc/localtime' was created
+                #    because 'dpkg-reconfigure -f noninteractive tzdata' was executed by apt-get.
+                # 2. If '/etc/localtime' exists, our execution of 'dpkg-reconfigure -f noninteractive tzdata'
+                #    will ignore the our timezone set in '/etc/timezone'.
+                # 3. Removing /etc/localtime will solve this.
+                rm -f "${ETC_DIR}/localtime"
+            fi
             chroot_exec dpkg-reconfigure -f noninteractive tzdata
             # Install and setup default locale and keyboard configuration

bootstrap.d/15-rpi-config.sh +2 -2

                 # Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
                 as_nobody wget -q -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
-                as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
+                as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
                 # Set permissions
                 chown -R root:root "${R}/tmp/pi-bluetooth"
                 # Install Firmware Flash file and apropiate licence
                 mkdir -p "$BLUETOOTH_FIRMWARE_DIR"
                 install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
-                install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
+                install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${BLUETOOTH_FIRMWARE_DIR}/BCM43430A1.hcd"
                 install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
                 install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"

rpi23-gen-image.sh +1 -1

             KERNEL_ZSWAP=${KERNEL_ZSWAP:=false}
             KERNEL_VIRT=${KERNEL_VIRT:=false}
             KERNEL_BPF=${KERNEL_BPF:=false}
-            KERNEL_DEFAULT_GOV=${KERNEL_DEFAULT_GOV:=powersave}
+            KERNEL_DEFAULT_GOV=${KERNEL_DEFAULT_GOV:=ondemand}
             KERNEL_SECURITY=${KERNEL_SECURITY:=false}
             KERNEL_NF=${KERNEL_NF:=false}

General Comments 0

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

No TODOs yet

	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