From: Jan Kiszka <[email protected]>
With bullseye, Debian's firmware-brcm80211 contains what was still
missing in buster. Now this duplication breaks the image build.
Fixes: d73b2d97376d ("Update jailhouse-demo distro from Debian 10 to 11")
Reported-by: Luigi De Simone <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>
---
conf/machine/rpi4.conf | 1 -
.../rpi-firmware-brcm80211.bb | 24 -------------------
2 files changed, 25 deletions(-)
delete mode 100644 recipes-bsp/rpi-firmware-brcm80211/rpi-firmware-brcm80211.bb
diff --git a/conf/machine/rpi4.conf b/conf/machine/rpi4.conf
index e8985e8..2aa2151 100644
--- a/conf/machine/rpi4.conf
+++ b/conf/machine/rpi4.conf
@@ -31,4 +31,3 @@ IMAGE_BOOT_FILES = " \
"
IMAGE_PREINSTALL_append = " firmware-brcm80211"
-IMAGE_INSTALL_append = " rpi-firmware-brcm80211"
diff --git a/recipes-bsp/rpi-firmware-brcm80211/rpi-firmware-brcm80211.bb
b/recipes-bsp/rpi-firmware-brcm80211/rpi-firmware-brcm80211.bb
deleted file mode 100644
index 602d8d7..0000000
--- a/recipes-bsp/rpi-firmware-brcm80211/rpi-firmware-brcm80211.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Jailhouse, a Linux-based partitioning hypervisor
-#
-# Copyright (c) Siemens AG, 2020
-#
-# Authors:
-# Jan Kiszka <[email protected]>
-#
-# SPDX-License-Identifier: MIT
-#
-
-inherit dpkg-raw
-
-SRC_URI =
"https://github.com/RPi-Distro/firmware-nonfree/archive/${SRCREV}.tar.gz;downloadfilename=firmware-${SRCREV}.tar.gz";
-SRCREV = "b66ab26cebff689d0d3257f56912b9bb03c20567"
-SRC_URI[sha256sum] =
"033a21d19fbdc7617b8c5b58d4be5951e29be5be787a45875b615f4d4dcf3f5b"
-
-do_install() {
- cd ${WORKDIR}/firmware-nonfree-${SRCREV}/brcm
- install -v -d ${D}/lib/firmware/brcm/
- install -v -m 644 brcmfmac43430-sdio.txt ${D}/lib/firmware/brcm/
- install -v -m 644 brcmfmac43455-sdio.clm_blob ${D}/lib/firmware/brcm/
- install -v -m 644 brcmfmac43455-sdio.txt ${D}/lib/firmware/brcm/
-}
--
2.31.1
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/0504d918-6c5e-54e2-17bf-81ac081cabc1%40web.de.
