speccy88 opened a new pull request, #3567: URL: https://github.com/apache/nuttx-apps/pull/3567
Berry upstream stores `default/berry.c` with CRLF line endings, while the local NuttX patch is LF. Fresh Make and CMake builds can therefore fail before Berry is compiled because GNU patch rejects the hunks as line-ending mismatches. Normalize the downloaded Berry `default/berry.c` before applying the existing NuttX patch in both Make and CMake fetch paths. Tested: - Fresh Berry archive: `fix-crlf.py` + `patch -l -p1` applies and updates `OS_NAME` / `optvalue`. - `./tools/configure.sh -a ../apps sim:berry && make olddefconfig && make -j8` - Simulator smoke: `berry -v` prints `Berry 1.1.0`; `berry -e print(40+2)` prints `42`. - `./tools/testbuild.sh -m -C -N -x -j 8 -a ../apps -t /tmp/nuttx_current_berry /tmp/berry-cmake-testlist.dat` - `tools/checkpatch.sh -c -u -m -g origin/master..HEAD` - ESP32-C3 hardware smoke on `/dev/cu.usbmodem101`: flashed `esp32c3-devkit:usbconsole` with Berry enabled; `berry -v` prints `Berry 1.1.0`; `berry -e print(40+2)` prints `42`. Signed-off-by: Frederick Blais <[email protected]> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
