[Mellanox] fix hw-mgmt patches (#9539)

- Why I did it To fix an issue that hw-mgmt patches were not applied. One patch was already in upstream hw-mgmt package thus applying it again caused an error and no other patches were applied. Also, I did it to improve the Makefile, so that the make will fail in case patches fail to apply. - How I did it Removed obsolete patch, made applying patches a hard failure in the build. - How to verify it Run the make and verify patches are applied. Signed-off-by: Stepan Blyschak <[email protected]>
sonic-net · Dec 16, 2021 · f3df6e2 · f3df6e2
1 parent 734b1bf
commit f3df6e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 29 deletions.
diff --git a/platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch b/platform/mellanox/hw-management/0002-hw-mgmt-system-MSN4600-A1-BU-config1-fix.patch
diff --git a/platform/mellanox/hw-management/Makefile b/platform/mellanox/hw-management/Makefile
@@ -6,7 +6,8 @@ MAIN_TARGET = hw-management_1.mlnx.$(MLNX_HW_MANAGEMENT_VERSION)_amd64.deb
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	pushd hw-mgmt
-	git am ../*.patch
+	git stash
+	git apply -3 ../*.patch || exit 1
 	chmod +x ./debian/rules
 	KVERSION=$(KVERSION) dpkg-buildpackage -us -uc -b -rfakeroot -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd