Skip to content

Commit da5cd4a

Browse files
committed
core/images: Temporarily add back the to-be-removed linux-firmware packages
In this commit we add back the removed packages for the following boards: - RaspberryPi (this image is used on the RPI Zero and RPI Zero W, but not on the RPI Zero 2W) - RaspberryPi 2 - Raspberrypi0-2w-64 - RaspberryPi 3 - RaspberryPi3-64 - RaspberryPi 4 - RaspberryPi 5 - RPI CM4 - Revpi Connect - RevPi Connect S - RevPi Connect 4 raspberrypi3-unipi-neuron and raspberrypi4-unipi-neuron inherit the Pi3 and Pi4-64 machines After the meta-balena removal PR will be merged, a new major balenaOS release can perform the actual removal by setting TEMPORARILY_ALLOWED_PACKAGES = "". Also, drop setting firmware compression because this already is enabled by default in meta-balena. Changelog-entry: core/images: Temporarily add back the to-be-removed linux-firmware packages Signed-off-by: Alexandru Costache <alexandru@balena.io>
1 parent 95c055c commit da5cd4a

2 files changed

Lines changed: 43 additions & 3 deletions

File tree

layers/meta-balena-raspberrypi/conf/layer.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@ PREFERRED_VERSION_linux-raspberrypi:raspberrypi5 = "6.12%"
158158
# Use the full version of cyfmac43455-sdio firmware to support WPA3
159159
CYFMAC43455_SDIO_FIRMWARE = "standard"
160160

161-
FIRMWARE_COMPRESSION:raspberrypi4-64 ?= "1"
162-
FIRMWARE_COMPRESSION:raspberrypi0-2w-64 ?= "1"
163-
164161
# avoid pseudo abort due to iwlwifi firmware being cleaned outside of fakeroot - this should be a temporary workaround until https://github.com/balena-os/meta-balena/pull/2270 is merged
165162
IWLWIFI_FW_TOCLEAN:raspberrypi4-64 = ""
166163
IWLWIFI_FW_TOCLEAN:raspberrypi0-2w-64 = ""
@@ -171,3 +168,4 @@ KERNEL_FEATURES:remove:revpi-connect-s = "cfg/fs/vfat.scc"
171168
KERNEL_FEATURES:remove:revpi-connect-4 = "cfg/fs/vfat.scc"
172169

173170
VC4DTBO = "vc4-kms-v3d,cma-320"
171+

layers/meta-balena-raspberrypi/recipes-core/images/balena-image.inc

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,45 @@ BALENA_BOOT_PARTITION_FILES:append:raspberrypi4-64 = " \
106106
rpi-eeprom/pieeprom-latest-stable.bin:/pieeprom-latest-stable.bin \
107107
rpi-eeprom/vl805-latest-stable.bin:/vl805-latest-stable.bin \
108108
"
109+
110+
COMMON_ALLOWED_PACKAGES = " \
111+
linux-firmware-rtl8192su \
112+
linux-firmware-rtl8723b-bt \
113+
linux-firmware-wl12xx \
114+
linux-firmware-wl18xx \
115+
linux-firmware-wlcommon \
116+
"
117+
118+
RPI_COMMON_ALLOWED_PACKAGES = " \
119+
linux-firmware-iwlwifi-3160 \
120+
linux-firmware-iwlwifi-7260 \
121+
linux-firmware-iwlwifi-7265 \
122+
linux-firmware-iwlwifi-7265d \
123+
linux-firmware-iwlwifi-8000c \
124+
linux-firmware-iwlwifi-9260 \
125+
"
126+
127+
TEMPORARILY_ALLOWED_PACKAGES:raspberrypi4-64 ?= " ${COMMON_ALLOWED_PACKAGES} "
128+
TEMPORARILY_ALLOWED_PACKAGES:raspberrypi5 ?= " ${COMMON_ALLOWED_PACKAGES} "
129+
TEMPORARILY_ALLOWED_PACKAGES:raspberrypi ?= " ${COMMON_ALLOWED_PACKAGES} \
130+
${RPI_COMMON_ALLOWED_PACKAGES} \
131+
"
132+
133+
TEMPORARILY_ALLOWED_PACKAGES:raspberrypi3 ?= " ${COMMON_ALLOWED_PACKAGES} \
134+
${RPI_COMMON_ALLOWED_PACKAGES} \
135+
"
136+
137+
TEMPORARILY_ALLOWED_PACKAGES:raspberrypi2 ?= " ${COMMON_ALLOWED_PACKAGES} \
138+
${RPI_COMMON_ALLOWED_PACKAGES} \
139+
"
140+
141+
# These files were not installed for the Pi Zero 2W 64bit
142+
TEMPORARILY_ALLOWED_PACKAGES:raspberrypi0-2w-64 ?= " linux-firmware-iwlwifi-3160 linux-firmware-wl12xx linux-firmware-wlcommon "
143+
TEMPORARILY_ALLOWED_PACKAGES:raspberrypicm4-ioboard ?= " linux-firmware-wl12xx linux-firmware-wlcommon "
144+
145+
# meta-balena will override TEMPORARILY_ALLOWED_PACKAGES in the major release
146+
BALENA_ALLOWED_FIRMWARE_PACKAGES:append = "${TEMPORARILY_ALLOWED_PACKAGES}"
147+
148+
# This is linux-ffirmware that will be removed
149+
# in the next major balenaOS release
150+
IMAGE_INSTALL:append = " ${TEMPORARILY_ALLOWED_PACKAGES} "

0 commit comments

Comments
 (0)