Closed sprataa closed 2 years ago
Here follows the verbose output for git apply JH_2538_2592_ZNP_USB_20201010.patch --ignore-space-change -v
git apply JH_2538_2592_ZNP_USB_20201010.patch --ignore-space-change -v
JH_2538_2592_ZNP_USB_20201010.patch:478: trailing whitespace. bool requestNewTrustCenterLinkKey = FALSE;//TRUE; JH_2538_2592_ZNP_USB_20201010.patch:1482: trailing whitespace. @REM JH_2538_2592_ZNP_USB_20201010.patch:1485: trailing whitespace. @echo off JH_2538_2592_ZNP_USB_20201010.patch:1487: trailing whitespace. if not "%~1" == "" goto debugFile JH_2538_2592_ZNP_USB_20201010.patch:1489: trailing whitespace. @echo on Checking patch .gitignore... error: .gitignore: No such file or directory Checking patch Components/bsp/srf06eb_cc2538/drivers/source/bsp.h... Checking patch Components/hal/include/hal_led.h... Checking patch Components/hal/target/CC2538ZNP/hal_board_cfg.h... Checking patch Components/hal/target/CC2538ZNP/hal_led.c... Checking patch Components/hal/target/CC2538ZNP/hal_uart_isr.c... Checking patch Components/hal/target/CC2538ZNP/startup_ewarm.c... Checking patch Components/mt/MT_SYS.c... Checking patch Components/mt/MT_UTIL.c... Checking patch Components/mt/MT_VERSION.c... Checking patch Components/mt/revision_info.h... Checking patch Components/osal/mcu/cc2538/osal_nv.c... Checking patch Components/stack/af/AF.c... Checking patch Components/stack/bdb/bdb_FindingAndBinding.c... Checking patch Components/stack/nwk/nwk_globals.c... Checking patch Components/stack/sys/ZGlobals.c... Checking patch Components/stack/zdo/ZDObject.c... Checking patch Components/stack/zdo/ZDSecMgr.c... Checking patch Components/zmac/ZMAC.h... Checking patch Projects/zstack/Tools/CC2538DB/CC2538.icf... Checking patch Projects/zstack/Tools/CC2538DB/f8wConfig.cfg... Checking patch Projects/zstack/ZMain/TI2538ZNP/OnBoard.h... Checking patch Projects/zstack/ZMain/TI2538ZNP/ZMain.c... Checking patch Projects/zstack/ZNP/CC2538/ZNP.ewd... Checking patch Projects/zstack/ZNP/CC2538/ZNP.ewp... error: while searching for: <name>General</name> <archiveVersion>3</archiveVersion> <data> <version>30</version> <wantNonLocal>1</wantNonLocal> <debug>1</debug> <option> error: patch failed: Projects/zstack/ZNP/CC2538/ZNP.ewp:11 error: Projects/zstack/ZNP/CC2538/ZNP.ewp: patch does not apply Checking patch Projects/zstack/ZNP/CC2538/settings/ZNP.CC2538ZNP-Debug.cspy.bat... error: Projects/zstack/ZNP/CC2538/settings/ZNP.CC2538ZNP-Debug.cspy.bat: already exists in working directory Checking patch Projects/zstack/ZNP/Source/znp.cfg... Checking patch Projects/zstack/ZNP/Source/znp_app.c... Checking patch note.txt...
Is there a patch that needs to be applied before this one? I am actually able to apply JH_2538_2592_ZNP_USB_20200427.patch on top of base 3.0.2 but all other patches fail.
JH_2538_2592_ZNP_USB_20200427.patch
Cheers
Here follows the verbose output for
git apply JH_2538_2592_ZNP_USB_20201010.patch --ignore-space-change -v
Is there a patch that needs to be applied before this one? I am actually able to apply
JH_2538_2592_ZNP_USB_20200427.patch
on top of base 3.0.2 but all other patches fail.Cheers