From e24ec9ca5111f3a1f2d77ec78aa81c0a5f7aaf18 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 30 Dec 2023 13:29:49 +0100 Subject: [PATCH] Rework JetHub symlinking --- config/sources/families/jethub.conf | 7 +++++-- packages/bsp/jethub/jethubj100/BCM4345C0.hcd | 1 - .../jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.bin | 1 - .../jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.txt | 1 - .../jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.bin | 1 - .../jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.txt | 1 - 6 files changed, 5 insertions(+), 7 deletions(-) delete mode 120000 packages/bsp/jethub/jethubj100/BCM4345C0.hcd delete mode 120000 packages/bsp/jethub/jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.bin delete mode 120000 packages/bsp/jethub/jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.txt delete mode 120000 packages/bsp/jethub/jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.bin delete mode 120000 packages/bsp/jethub/jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.txt diff --git a/config/sources/families/jethub.conf b/config/sources/families/jethub.conf index 683d5a2b77..ff81a592b8 100644 --- a/config/sources/families/jethub.conf +++ b/config/sources/families/jethub.conf @@ -159,8 +159,11 @@ buildjethomecmds() { # Wifi & Bluetooth run_host_command_logged mkdir -pv --mode=755 "$destination/lib/firmware/" || exit_with_error "Unable to mkdir firmware" run_host_command_logged mkdir -v --mode=775 "$destination/lib/firmware/brcm/" || exit_with_error "Unable to mkdir brcm" - run_host_command_logged cp -Pv "$SRC"/packages/bsp/jethub/"$BOARD"/{BCM4345C0.hcd,'brcmfmac43455-sdio.jethome,jethub-j100.txt','brcmfmac43455-sdio.jethome,jethub-j100.bin','brcmfmac43456-sdio.jethome,jethub-j100.txt','brcmfmac43456-sdio.jethome,jethub-j100.bin'} "$destination/lib/firmware/brcm/" || exit_with_error "Unable to copy brcm firmware symlinks" - + run_host_command_logged ln -s "../BCM4345C0.hcd" "$destination/lib/firmware/brcm/BCM4345C0.hcd" + run_host_command_logged ln -s "brcmfmac43455-sdio.bin" "$destination/lib/firmware/brcm/brcmfmac43455-sdio.jethome,jethub-j100.bin" + run_host_command_logged ln -s "brcmfmac43455-sdio.txt" "$destination/lib/firmware/brcm/brcmfmac43455-sdio.jethome,jethub-j100.txt" + run_host_command_logged ln -s "brcmfmac43456-sdio.bin" "$destination/lib/firmware/brcm/brcmfmac43456-sdio.jethome,jethub-j100.bin" + run_host_command_logged ln -s "brcmfmac43456-sdio.txt" "$destination/lib/firmware/brcm/brcmfmac43456-sdio.jethome,jethub-j100.txt" else exit_with_error "Unexpected board \"$BOARD\"" fi diff --git a/packages/bsp/jethub/jethubj100/BCM4345C0.hcd b/packages/bsp/jethub/jethubj100/BCM4345C0.hcd deleted file mode 120000 index 2a59ba7656..0000000000 --- a/packages/bsp/jethub/jethubj100/BCM4345C0.hcd +++ /dev/null @@ -1 +0,0 @@ -../BCM4345C0.hcd \ No newline at end of file diff --git a/packages/bsp/jethub/jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.bin b/packages/bsp/jethub/jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.bin deleted file mode 120000 index e44aa55aa4..0000000000 --- a/packages/bsp/jethub/jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.bin +++ /dev/null @@ -1 +0,0 @@ -brcmfmac43455-sdio.bin \ No newline at end of file diff --git a/packages/bsp/jethub/jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.txt b/packages/bsp/jethub/jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.txt deleted file mode 120000 index 2aba486e0f..0000000000 --- a/packages/bsp/jethub/jethubj100/brcmfmac43455-sdio.jethome,jethub-j100.txt +++ /dev/null @@ -1 +0,0 @@ -brcmfmac43455-sdio.txt \ No newline at end of file diff --git a/packages/bsp/jethub/jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.bin b/packages/bsp/jethub/jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.bin deleted file mode 120000 index a8909e1192..0000000000 --- a/packages/bsp/jethub/jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.bin +++ /dev/null @@ -1 +0,0 @@ -brcmfmac43456-sdio.bin \ No newline at end of file diff --git a/packages/bsp/jethub/jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.txt b/packages/bsp/jethub/jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.txt deleted file mode 120000 index 94cd555b2b..0000000000 --- a/packages/bsp/jethub/jethubj100/brcmfmac43456-sdio.jethome,jethub-j100.txt +++ /dev/null @@ -1 +0,0 @@ -brcmfmac43456-sdio.txt \ No newline at end of file