matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Update the branch creation logic"

Browse Source 
This reverts commit 6df9d54035.
This commit is contained in:
Vivek Reddy Karri 2023-03-29 22:00:38 +00:00
parent efd24cc748
commit 8ca933e33c
22 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/barefoot/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit 7deff3f0256a5d0c905d8fde1df0b466a4065104
Subproject commit 99378f0b5b0f28790d91bc317a0fe21e3a2cf6c9

2
platform/broadcom/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit 7deff3f0256a5d0c905d8fde1df0b466a4065104
Subproject commit 99378f0b5b0f28790d91bc317a0fe21e3a2cf6c9

13
platform/mellanox/hw-management.mk
View File

@ -41,17 +41,8 @@ integrate-mlnx-hw-mgmt:
touch $(PTCH_LIST) $(KCFG_LIST)
# clean up existing untracked files
pushd $(BUILD_WORKDIR); git stash; git clean -f -- platform/mellanox/
$(FIND_HEAD)
echo $(BRANCH_SONIC)_$(COMMIT_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION) branch created
git checkout -B "$(BRANCH_SONIC)_$(COMMIT_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION)" $(COMMIT_HEAD)
git stash pop; popd
pushd $(BUILD_WORKDIR)/src/sonic-linux-kernel; git stash; git clean -f -- patch/
$(FIND_HEAD)
echo $(BRANCH_SONIC)_$(COMMIT_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION) branch created
git checkout -B "$(BRANCH_SONIC)_$(COMMIT_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION)" $(COMMIT_HEAD)
popd
pushd $(BUILD_WORKDIR); git stash; git clean -f -- platform/mellanox/; popd
pushd $(BUILD_WORKDIR)/src/sonic-linux-kernel; git stash; git clean -f -- patch/; popd
echo "#### Integrate HW-MGMT ${MLNX_HW_MANAGEMENT_VERSION} Kernel Patches into SONiC" > ${USER_OUTFILE}
pushd $(BUILD_WORKDIR)/$(PLATFORM_PATH) $(LOG_SIMPLE)

2
rules/linux-kernel.mk
View File

@ -12,7 +12,7 @@ endif
# Place an URL here to .tar.gz file if you want to include those patches
EXTERNAL_KERNEL_PATCH_URL =
# Set y to include non upstream patches tarball provided by the corresponding platform
INCLUDE_EXTERNAL_PATCHES = y
INCLUDE_EXTERNAL_PATCHES = n
# platforms should override this and provide an absolute location to the patches
EXTERNAL_KERNEL_PATCH_LOC =

2
src/dhcprelay

@ -1 +1 @@
Subproject commit 46a450b7407c4d172f58763dfea6c94f25940c18
Subproject commit 5b3eea1899ebf8f9ced19d4641ae3beb9903fd42

2
src/linkmgrd

@ -1 +1 @@
Subproject commit ac24ad14b0144b1036b8012762f2e1887e4ae532
Subproject commit a062c19c310d1203b27b445902bc98b8ce5b651f

2
src/sonic-dbsyncd

@ -1 +1 @@
Subproject commit 0d67faf36b362be4fb38fdd449b98d67ff867c63
Subproject commit fa8b709dc0df771341dad0ebc07c0e7f8fd1177c

2
src/sonic-frr/frr

@ -1 +1 @@
Subproject commit 88351c8f6df5450e9098f773813738f62abb2f5e
Subproject commit 79188bf710e92acf42fb5b9b0a2e9593a5ee9b05

2
src/sonic-gnmi

@ -1 +1 @@
Subproject commit d922a076ca3490792009ba67c1fe6436fe01cb11
Subproject commit 50123efb6737909c81e5e0797de33ee7101f20f8

2
src/sonic-host-services

@ -1 +1 @@
Subproject commit 121330a287d139439ef4a539b84822292e3a654d
Subproject commit 66778525e75d9badeb77812c6fce39648221fabc

2
src/sonic-linux-kernel

@ -1 +1 @@
Subproject commit 00da94437aac642bf8cbec33c0a78da4a778f5d0
Subproject commit 6847319e76291edfc7f048f9829fc9c1f695d59a

2
src/sonic-mgmt-framework

@ -1 +1 @@
Subproject commit 744602bbd8541546dfe977f598f917e3471f85d0
Subproject commit 5c3c670ed34ba1db52f0ac3f837df7e01a999cee

2
src/sonic-platform-common

@ -1 +1 @@
Subproject commit 85c20cdee2650f89351bf3a78053ebf58ccd9846
Subproject commit bbaa678241c6ef3c6269bb138b786ae67a69a1c1

2
src/sonic-platform-daemons

@ -1 +1 @@
Subproject commit 05dd3bd3e6b3c94cf64e36302f735a101a60ea53
Subproject commit e815bdf95e3753d38c92310c9008bd6ee85fa968

2
src/sonic-platform-pde

@ -1 +1 @@
Subproject commit f18ebc297d8b751c162dffd120d284d784aa977d
Subproject commit 133566a91e0c3aeac017dd34bdbe70c5ba1cc0e6

2
src/sonic-restapi

@ -1 +1 @@
Subproject commit dac446feb2be3aa348f633a4d2e3c64993d7483a
Subproject commit 47e4b534df75fd71af6f902759f69cc0fc8b7a3c

2
src/sonic-sairedis

@ -1 +1 @@
Subproject commit 4d86af3474c7b4299557293c2ee4516753aff169
Subproject commit 92c86676375aaf00cde13fafb658dbfa00cbbcd6

2
src/sonic-swss

@ -1 +1 @@
Subproject commit baa302e232d61a49880b23b3ef1098e47cf6d1ce
Subproject commit c5fa616bde68d39e24445add0d5350b09a21bd92

2
src/sonic-swss-common

@ -1 +1 @@
Subproject commit 6b6842a9690507d300a5beb4c0baff47094c94a5
Subproject commit a50f74a251c2d67ee7655dcde9ee3823aff4ef44

2
src/sonic-utilities

@ -1 +1 @@
Subproject commit 33e85d37f6abd4e7707d4c2436c9014239ce8d06
Subproject commit b81734289b7ca361b365cbf1c845d31b0a81657e

2
src/sonic-ztp

@ -1 +1 @@
Subproject commit f7dd3c54ec57848f7cb6d3eec748a4d8e54d0e6c
Subproject commit 92340ff4193bf31746ca9dfa74ef3cd9ef779ad8

2
src/wpasupplicant/sonic-wpa-supplicant

@ -1 +1 @@
Subproject commit 24f5051481910677b9e5937c01b8b941185086d3
Subproject commit 2c69e2cda085a1a8e9111a6246bdd6759102bd26