SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

Compare commits

base: SHS:e57719c11871b2b9cae0eef4890740ade164b89b
Branches Tags
SHS:master SHS:pico_sdk SHS:winconsole_u16 SHS:pimap SHS:zmq SHS:concurrent SHS:old
...
compare: SHS:7b52f6d70d6c0cf6f498f50477963efa185cfa0f
Branches Tags
SHS:pico_sdk SHS:master SHS:winconsole_u16 SHS:pimap SHS:zmq SHS:concurrent SHS:old

2 Commits
e57719c118 ... 7b52f6d70d

Author SHA1 Message Date
Бычков Андрей
7b52f6d70d fix get mtu (#186) 
Reviewed-on: #186
 2025-06-26 10:52:36 +03:00
andrey.bychkov
19fe33383a Fix cmake module path (#185) 
Если в cmake передаётся кастомная папка с cmake-модулями, например в toolchain файле, то pip перестаёт добавлять ./cmake в путь поиска модулей. Это приводит к ошибке `can't find PIPMacros.cmake`. Не  очень понимаю зачем так было сделано, поэтому просто убрал условие пустого CMAKE_MODULE_PATH.

Reviewed-on: #185
Co-authored-by: andrey.bychkov <andrey@signalmodelling.ru>
Co-committed-by: andrey.bychkov <andrey@signalmodelling.ru>
 2025-06-26 10:52:04 +03:00
2 changed files with 5 additions and 5 deletions
Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -45,9 +45,7 @@ ExternalProject_Add(cmake
set(GIT_CMAKE_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake-src") set(GIT_CMAKE_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake-src")
endif() endif()
if ("x${CMAKE_MODULE_PATH}" STREQUAL "x") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
endif()
if (NOT "x${GIT_CMAKE_DIR}" STREQUAL "x") if (NOT "x${GIT_CMAKE_DIR}" STREQUAL "x")
list(APPEND CMAKE_MODULE_PATH "${GIT_CMAKE_DIR}") list(APPEND CMAKE_MODULE_PATH "${GIT_CMAKE_DIR}")
endif() endif()
@@ -117,7 +115,6 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
file(GLOB_RECURSE ASRC "${SOURCES}/*.cpp" "${SOURCES}/*.c") file(GLOB_RECURSE ASRC "${SOURCES}/*.cpp" "${SOURCES}/*.c")
list(APPEND CPPS ${ASRC}) list(APPEND CPPS ${ASRC})
endif() endif()
#message("${NAME} HS = ${HS}")
list(APPEND HDRS ${HS}) list(APPEND HDRS ${HS})
list(APPEND PHDRS ${PHS}) list(APPEND PHDRS ${PHS})

5
libs/main/io_devices/piethernet.cpp
View File

@@ -1243,9 +1243,12 @@ PIEthernet::InterfaceList PIEthernet::interfaces() {
# else # else
if (s != -1) { if (s != -1) {
struct ifreq ir; struct ifreq ir;
strcpy(ir.ifr_name, cif->ifa_name); memset(&ir, 0, sizeof(ir));
strncpy(ir.ifr_name, cif->ifa_name, sizeof(ir.ifr_name));
if (ioctl(s, SIOCGIFHWADDR, &ir) == 0) { if (ioctl(s, SIOCGIFHWADDR, &ir) == 0) {
ci.mac = macFromBytes(PIByteArray(ir.ifr_hwaddr.sa_data, 6)); ci.mac = macFromBytes(PIByteArray(ir.ifr_hwaddr.sa_data, 6));
}
if (ioctl(s, SIOCGIFMTU, &ir) == 0) {
ci.mtu = ir.ifr_mtu; ci.mtu = ir.ifr_mtu;
} }
} }