From ae02288e62a075d7beec4e3418c6adb5b1ca0474 Mon Sep 17 00:00:00 2001 From: Pavan Naregundi Date: Tue, 30 Jul 2024 10:06:55 +0000 Subject: [PATCH] Rename master-bookworm to master Signed-off-by: Pavan Naregundi --- .../0001-Falcon-usb-disk-hung_task-WA.patch | 0 .../0001-Marvell-teralynx-generate_dump.patch | 0 .../0001-Redis-timeout-WA.patch | 0 .../0001-SAI-switch-create-timeout-WA.patch | 0 .../0001-dts-for-armada-IPD6448M.patch | 0 ...l-ac5-Support-boards-with-more-that-4G-DDR.patch | 0 .../0001-marvell-arm64-Enable-pde-docker.patch | 0 files/{master-bookworm => master}/3135.patch | 0 files/{master-bookworm => master}/3192.patch | 0 .../{master-bookworm => master}/prestera_hwsku.tgz | Bin .../series_marvell_amd64 | 0 .../series_marvell_arm64 | 0 sonic_202405_apply_patch_teralynx.sh | 2 +- sonic_master_apply_patch_teralynx.sh | 2 +- 14 files changed, 2 insertions(+), 2 deletions(-) rename files/{master-bookworm => master}/0001-Falcon-usb-disk-hung_task-WA.patch (100%) rename files/{master-bookworm => master}/0001-Marvell-teralynx-generate_dump.patch (100%) rename files/{master-bookworm => master}/0001-Redis-timeout-WA.patch (100%) rename files/{master-bookworm => master}/0001-SAI-switch-create-timeout-WA.patch (100%) rename files/{master-bookworm => master}/0001-dts-for-armada-IPD6448M.patch (100%) rename files/{master-bookworm => master}/0001-marvell-ac5-Support-boards-with-more-that-4G-DDR.patch (100%) rename files/{master-bookworm => master}/0001-marvell-arm64-Enable-pde-docker.patch (100%) rename files/{master-bookworm => master}/3135.patch (100%) rename files/{master-bookworm => master}/3192.patch (100%) rename files/{master-bookworm => master}/prestera_hwsku.tgz (100%) rename files/{master-bookworm => master}/series_marvell_amd64 (100%) rename files/{master-bookworm => master}/series_marvell_arm64 (100%) diff --git a/files/master-bookworm/0001-Falcon-usb-disk-hung_task-WA.patch b/files/master/0001-Falcon-usb-disk-hung_task-WA.patch similarity index 100% rename from files/master-bookworm/0001-Falcon-usb-disk-hung_task-WA.patch rename to files/master/0001-Falcon-usb-disk-hung_task-WA.patch diff --git a/files/master-bookworm/0001-Marvell-teralynx-generate_dump.patch b/files/master/0001-Marvell-teralynx-generate_dump.patch similarity index 100% rename from files/master-bookworm/0001-Marvell-teralynx-generate_dump.patch rename to files/master/0001-Marvell-teralynx-generate_dump.patch diff --git a/files/master-bookworm/0001-Redis-timeout-WA.patch b/files/master/0001-Redis-timeout-WA.patch similarity index 100% rename from files/master-bookworm/0001-Redis-timeout-WA.patch rename to files/master/0001-Redis-timeout-WA.patch diff --git a/files/master-bookworm/0001-SAI-switch-create-timeout-WA.patch b/files/master/0001-SAI-switch-create-timeout-WA.patch similarity index 100% rename from files/master-bookworm/0001-SAI-switch-create-timeout-WA.patch rename to files/master/0001-SAI-switch-create-timeout-WA.patch diff --git a/files/master-bookworm/0001-dts-for-armada-IPD6448M.patch b/files/master/0001-dts-for-armada-IPD6448M.patch similarity index 100% rename from files/master-bookworm/0001-dts-for-armada-IPD6448M.patch rename to files/master/0001-dts-for-armada-IPD6448M.patch diff --git a/files/master-bookworm/0001-marvell-ac5-Support-boards-with-more-that-4G-DDR.patch b/files/master/0001-marvell-ac5-Support-boards-with-more-that-4G-DDR.patch similarity index 100% rename from files/master-bookworm/0001-marvell-ac5-Support-boards-with-more-that-4G-DDR.patch rename to files/master/0001-marvell-ac5-Support-boards-with-more-that-4G-DDR.patch diff --git a/files/master-bookworm/0001-marvell-arm64-Enable-pde-docker.patch b/files/master/0001-marvell-arm64-Enable-pde-docker.patch similarity index 100% rename from files/master-bookworm/0001-marvell-arm64-Enable-pde-docker.patch rename to files/master/0001-marvell-arm64-Enable-pde-docker.patch diff --git a/files/master-bookworm/3135.patch b/files/master/3135.patch similarity index 100% rename from files/master-bookworm/3135.patch rename to files/master/3135.patch diff --git a/files/master-bookworm/3192.patch b/files/master/3192.patch similarity index 100% rename from files/master-bookworm/3192.patch rename to files/master/3192.patch diff --git a/files/master-bookworm/prestera_hwsku.tgz b/files/master/prestera_hwsku.tgz similarity index 100% rename from files/master-bookworm/prestera_hwsku.tgz rename to files/master/prestera_hwsku.tgz diff --git a/files/master-bookworm/series_marvell_amd64 b/files/master/series_marvell_amd64 similarity index 100% rename from files/master-bookworm/series_marvell_amd64 rename to files/master/series_marvell_amd64 diff --git a/files/master-bookworm/series_marvell_arm64 b/files/master/series_marvell_arm64 similarity index 100% rename from files/master-bookworm/series_marvell_arm64 rename to files/master/series_marvell_arm64 diff --git a/sonic_202405_apply_patch_teralynx.sh b/sonic_202405_apply_patch_teralynx.sh index 7b67166b3..d08e4ae28 100644 --- a/sonic_202405_apply_patch_teralynx.sh +++ b/sonic_202405_apply_patch_teralynx.sh @@ -24,7 +24,7 @@ LOG_FILE=patches_result.log FULL_PATH=`pwd` # Path for 202211 patches -WGET_PATH="https://raw.githubusercontent.com/Marvell-switching/sonic-scripts/master/files/master-bookworm/" +WGET_PATH="https://raw.githubusercontent.com/Marvell-switching/sonic-scripts/master/files/master/" # Patches SERIES="" diff --git a/sonic_master_apply_patch_teralynx.sh b/sonic_master_apply_patch_teralynx.sh index 59ffcd8e9..0634c037a 100644 --- a/sonic_master_apply_patch_teralynx.sh +++ b/sonic_master_apply_patch_teralynx.sh @@ -24,7 +24,7 @@ LOG_FILE=patches_result.log FULL_PATH=`pwd` # Path for 202211 patches -WGET_PATH="https://raw.githubusercontent.com/Marvell-switching/sonic-scripts/master/files/master-bookworm/" +WGET_PATH="https://raw.githubusercontent.com/Marvell-switching/sonic-scripts/master/files/master/" # Patches SERIES=""