add comment, remove unused patch

This commit is contained in:
Travis Staton 2023-02-12 21:57:53 -05:00
parent 8a5316db2a
commit eee4a9ccca
2 changed files with 5 additions and 19 deletions

View file

@ -1,19 +0,0 @@
diff --git a/src/libcamera/source_paths.cpp b/src/libcamera/source_paths.cpp
index 19689585..1380dfae 100644
--- a/src/libcamera/source_paths.cpp
+++ b/src/libcamera/source_paths.cpp
@@ -39,14 +39,6 @@ namespace {
*/
bool isLibcameraInstalled()
{
- /*
- * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on
- * install.
- */
- for (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) {
- if (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH)
- return false;
- }
return true;
}

View file

@ -40,6 +40,11 @@ stdenvNoCC.mkDerivation {
# CM4 symlink must be added since it's missing from upstream # CM4 symlink must be added since it's missing from upstream
pushd $out/lib/firmware/brcm &>/dev/null pushd $out/lib/firmware/brcm &>/dev/null
ln -s "./brcmfmac43455-sdio.txt" "$out/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt" ln -s "./brcmfmac43455-sdio.txt" "$out/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt"
# There are two options for the brcmfmac43455 binary: minimal or
# standard. For more info see the readme at:
# https://github.com/RPi-Distro/firmware-nonfree/blob/bullseye/debian/config/brcm80211/cypress/README.txt
ln -sf ../cypress/cyfmac43455-sdio-minimal.bin brcmfmac43455-sdio.bin ln -sf ../cypress/cyfmac43455-sdio-minimal.bin brcmfmac43455-sdio.bin
popd &>/dev/null popd &>/dev/null