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

Update logic

Browse Source 
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
This commit is contained in:
Vivek Reddy Karri 2023-03-29 22:37:37 +00:00
parent f7b272c089
commit 23193446ad
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ $(MLNX_HW_MANAGEMENT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
SONIC_MAKE_DEBS += $(MLNX_HW_MANAGEMENT) SONIC_MAKE_DEBS += $(MLNX_HW_MANAGEMENT)
# override this for other branches # override this for other branches
SONIC_BRANCH = master BRANCH_SONIC = master
TEMP_HW_MGMT_DIR = /tmp/hw_mgmt TEMP_HW_MGMT_DIR = /tmp/hw_mgmt
PTCH_DIR = $(TEMP_HW_MGMT_DIR)/patch_dir/ PTCH_DIR = $(TEMP_HW_MGMT_DIR)/patch_dir/
NON_UP_PTCH_DIR = $(TEMP_HW_MGMT_DIR)/non_up_patch_dir/ NON_UP_PTCH_DIR = $(TEMP_HW_MGMT_DIR)/non_up_patch_dir/
@ -34,27 +34,25 @@ PTCH_LIST = $(TEMP_HW_MGMT_DIR)/series
KCFG_LIST = $(TEMP_HW_MGMT_DIR)/kconfig KCFG_LIST = $(TEMP_HW_MGMT_DIR)/kconfig
HWMGMT_NONUP_LIST = $(BUILD_WORKDIR)/$($(MLNX_HW_MANAGEMENT)_SRC_PATH)/hwmgmt_nonup_patches HWMGMT_NONUP_LIST = $(BUILD_WORKDIR)/$($(MLNX_HW_MANAGEMENT)_SRC_PATH)/hwmgmt_nonup_patches
USER_OUTFILE = $(BUILD_WORKDIR)/integrate-mlnx-hw-mgmt_user.out USER_OUTFILE = $(BUILD_WORKDIR)/integrate-mlnx-hw-mgmt_user.out
TMPFILE = /tmp/intg-hw-mgmt.out TMPFILE_OUT := $(shell mktemp)
SB_HEAD = $(shell git rev-parse --short HEAD)
FIND_HEAD = $(eval COMMIT_HEAD=$(shell git rev-parse --short HEAD)) SLK_HEAD = $(shell cd src/sonic-linux-kernel; git rev-parse --short HEAD)
integrate-mlnx-hw-mgmt: integrate-mlnx-hw-mgmt:
$(FLUSH_LOG) $(FLUSH_LOG)
rm -rf $(TEMP_HW_MGMT_DIR) $(TMPFILE) rm -rf $(TEMP_HW_MGMT_DIR) $(TMPFILE_OUT)
mkdir -p $(PTCH_DIR) $(NON_UP_PTCH_DIR) mkdir -p $(PTCH_DIR) $(NON_UP_PTCH_DIR)
touch $(PTCH_LIST) $(KCFG_LIST) touch $(PTCH_LIST) $(KCFG_LIST)
# clean up existing untracked files # clean up existing untracked files
pushd $(BUILD_WORKDIR); git stash; git clean -f -- platform/mellanox/ pushd $(BUILD_WORKDIR); git clean -f -- platform/mellanox/
$(FIND_HEAD) git checkout -B "$(BRANCH_SONIC)_$(SB_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION)" HEAD
echo $(BRANCH_SONIC)_$(COMMIT_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION) branch created echo $(BRANCH_SONIC)_$(SB_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION) branch created in sonic-buildimage
git checkout -B "$(BRANCH_SONIC)_$(COMMIT_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION)" $(COMMIT_HEAD) popd
git stash pop; popd
pushd $(BUILD_WORKDIR)/src/sonic-linux-kernel; git stash; git clean -f -- patch/ pushd $(BUILD_WORKDIR)/src/sonic-linux-kernel; git clean -f -- patch/
$(FIND_HEAD) git checkout -B "$(BRANCH_SONIC)_$(SLK_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION)" HEAD
echo $(BRANCH_SONIC)_$(COMMIT_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION) branch created echo $(BRANCH_SONIC)_$(SLK_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION) branch created in sonic-linux-kernel
git checkout -B "$(BRANCH_SONIC)_$(COMMIT_HEAD)_integrate_$(MLNX_HW_MANAGEMENT_VERSION)" $(COMMIT_HEAD)
popd popd
echo "#### Integrate HW-MGMT ${MLNX_HW_MANAGEMENT_VERSION} Kernel Patches into SONiC" > ${USER_OUTFILE} echo "#### Integrate HW-MGMT ${MLNX_HW_MANAGEMENT_VERSION} Kernel Patches into SONiC" > ${USER_OUTFILE}
@ -99,8 +97,8 @@ integrate-mlnx-hw-mgmt:
git diff --no-color HEAD~1 HEAD -- patch/kconfig-exclusions >> ${USER_OUTFILE} git diff --no-color HEAD~1 HEAD -- patch/kconfig-exclusions >> ${USER_OUTFILE}
echo -en '\n###-> Summary of files updated in sonic-linux-kernel <-###\n' >> ${USER_OUTFILE} echo -en '\n###-> Summary of files updated in sonic-linux-kernel <-###\n' >> ${USER_OUTFILE}
git diff --no-color HEAD~1 HEAD --stat --output=${TMPFILE} git diff --no-color HEAD~1 HEAD --stat --output=${TMPFILE_OUT}
cat ${TMPFILE} | tee -a ${USER_OUTFILE} cat ${TMPFILE_OUT} | tee -a ${USER_OUTFILE}
popd popd
# Commit the changes in buildimage and log the diff # Commit the changes in buildimage and log the diff
@ -114,8 +112,8 @@ integrate-mlnx-hw-mgmt:
git diff --no-color HEAD~1 HEAD -- $($(MLNX_HW_MANAGEMENT)_SRC_PATH)/hwmgmt_nonup_patches >> ${USER_OUTFILE} git diff --no-color HEAD~1 HEAD -- $($(MLNX_HW_MANAGEMENT)_SRC_PATH)/hwmgmt_nonup_patches >> ${USER_OUTFILE}
echo -en '\n###-> Summary of buildimage changes <-###\n' >> ${USER_OUTFILE} echo -en '\n###-> Summary of buildimage changes <-###\n' >> ${USER_OUTFILE}
git diff --no-color HEAD~1 HEAD --stat --output=${TMPFILE} -- $(PLATFORM_PATH) git diff --no-color HEAD~1 HEAD --stat --output=${TMPFILE_OUT} -- $(PLATFORM_PATH)
cat ${TMPFILE} | tee -a ${USER_OUTFILE} cat ${TMPFILE_OUT} | tee -a ${USER_OUTFILE}
popd popd
popd $(LOG_SIMPLE) popd $(LOG_SIMPLE)