rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation error.
All checks were successful
the build was successful
Details

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-04-24 18:13:21 +02:00
parent a14e1356d9
commit 17fbcd6877
13 changed files with 90 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vscode/ipch/8d8f9b55eaa54a62/mmap_address.bin vendored Normal file
View File

Binary file not shown.

BIN
.vscode/ipch/8d8f9b55eaa54a62/mount.ipch vendored Normal file
View File

Binary file not shown.

BIN
.vscode/ipch/8f7c2d7ba4cc8ea3/mmap_address.bin vendored Normal file
View File

Binary file not shown.

BIN
.vscode/ipch/dd1ea27255710e70/mmap_address.bin vendored Normal file
View File

Binary file not shown.

2
bsp/buildroot_external/package/netifd/netifd.mk
View File

@@ -12,7 +12,7 @@ NETIFD_INSTALL_STAGING = YES
NETIFD_DEPENDENCIES = libubox json-c ubus uci libnl NETIFD_DEPENDENCIES = libubox json-c ubus uci libnl
NETIFD_CONF = INC_DIR=$(WORKSPACE_DIR)buildroot/staging/usr/include NETIFD_CONF = INC_DIR=$(WORKSPACE_DIR)/buildroot/target/usr/include
NETIFD_CONF_ENV = $(NETIFD_CONF) NETIFD_CONF_ENV = $(NETIFD_CONF)
NETIFD_MAKE_ENV = $(NETIFD_CONF) NETIFD_MAKE_ENV = $(NETIFD_CONF)

24
src/3P/mountd/builders/cmake/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.0)
project (mountd) project (mountd)
ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations) ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations -Wno-format-truncation)
set (CMAKE_MODULE_PATH "${MODULE_PATH}") set (CMAKE_MODULE_PATH "${MODULE_PATH}")
@@ -13,17 +13,17 @@ include (br)
# mountd # mountd
add_executable (mountd add_executable (mountd
$ENV{SRC_DIR}/src/3P/mountd/main.c ${workspaceRoot}/src/3P/mountd/main.c
$ENV{SRC_DIR}/src/3P/mountd/log.c ${workspaceRoot}/src/3P/mountd/log.c
$ENV{SRC_DIR}/src/3P/mountd/sys.c ${workspaceRoot}/src/3P/mountd/sys.c
$ENV{SRC_DIR}/src/3P/mountd/autofs.c ${workspaceRoot}/src/3P/mountd/autofs.c
$ENV{SRC_DIR}/src/3P/mountd/mount.c ${workspaceRoot}/src/3P/mountd/mount.c
$ENV{SRC_DIR}/src/3P/mountd/timer.c ${workspaceRoot}/src/3P/mountd/timer.c
$ENV{SRC_DIR}/src/3P/mountd/signal.c ${workspaceRoot}/src/3P/mountd/signal.c
$ENV{SRC_DIR}/src/3P/mountd/ucix.c ${workspaceRoot}/src/3P/mountd/ucix.c
$ENV{SRC_DIR}/src/3P/mountd/led.c ${workspaceRoot}/src/3P/mountd/led.c
$ENV{SRC_DIR}/src/3P/mountd/fs.c ${workspaceRoot}/src/3P/mountd/fs.c
$ENV{SRC_DIR}/src/3P/mountd/ucix.c ${workspaceRoot}/src/3P/mountd/ucix.c
) )
target_link_libraries (mountd ubox uci) target_link_libraries (mountd ubox uci)

44
src/3P/netifd/builders/cmake/CMakeLists.txt
View File

@@ -16,29 +16,29 @@ file (
GLOB_RECURSE GLOB_RECURSE
source_files source_files
$ENV{SRC_DIR}/src/3P/netifd/main.c ${workspaceRoot}/src/3P/netifd/main.c
$ENV{SRC_DIR}/src/3P/netifd/utils.c ${workspaceRoot}/src/3P/netifd/utils.c
$ENV{SRC_DIR}/src/3P/netifd/system.c ${workspaceRoot}/src/3P/netifd/system.c
$ENV{SRC_DIR}/src/3P/netifd/tunnel.c ${workspaceRoot}/src/3P/netifd/tunnel.c
$ENV{SRC_DIR}/src/3P/netifd/handler.c ${workspaceRoot}/src/3P/netifd/handler.c
$ENV{SRC_DIR}/src/3P/netifd/interface.c ${workspaceRoot}/src/3P/netifd/interface.c
$ENV{SRC_DIR}/src/3P/netifd/interface-ip.c ${workspaceRoot}/src/3P/netifd/interface-ip.c
$ENV{SRC_DIR}/src/3P/netifd/interface-event.c ${workspaceRoot}/src/3P/netifd/interface-event.c
$ENV{SRC_DIR}/src/3P/netifd/iprule.c ${workspaceRoot}/src/3P/netifd/iprule.c
$ENV{SRC_DIR}/src/3P/netifd/proto.c ${workspaceRoot}/src/3P/netifd/proto.c
$ENV{SRC_DIR}/src/3P/netifd/proto-static.c ${workspaceRoot}/src/3P/netifd/proto-static.c
$ENV{SRC_DIR}/src/3P/netifd/proto-shell.c ${workspaceRoot}/src/3P/netifd/proto-shell.c
$ENV{SRC_DIR}/src/3P/netifd/config.c ${workspaceRoot}/src/3P/netifd/config.c
$ENV{SRC_DIR}/src/3P/netifd/device.c ${workspaceRoot}/src/3P/netifd/device.c
$ENV{SRC_DIR}/src/3P/netifd/bridge.c ${workspaceRoot}/src/3P/netifd/bridge.c
$ENV{SRC_DIR}/src/3P/netifd/vlan.c ${workspaceRoot}/src/3P/netifd/vlan.c
$ENV{SRC_DIR}/src/3P/netifd/alias.c ${workspaceRoot}/src/3P/netifd/alias.c
$ENV{SRC_DIR}/src/3P/netifd/macvlan.c ${workspaceRoot}/src/3P/netifd/macvlan.c
$ENV{SRC_DIR}/src/3P/netifd/ubus.c ${workspaceRoot}/src/3P/netifd/ubus.c
$ENV{SRC_DIR}/src/3P/netifd/vlandev.c ${workspaceRoot}/src/3P/netifd/vlandev.c
$ENV{SRC_DIR}/src/3P/netifd/wireless.c ${workspaceRoot}/src/3P/netifd/wireless.c
$ENV{SRC_DIR}/src/3P/netifd/system-linux.c ${workspaceRoot}/src/3P/netifd/system-linux.c
) )

13
src/3P/netifd/vlan.c
View File

@@ -61,13 +61,15 @@ static int vlan_set_device_state(struct device *dev, bool up)
return ret; return ret;
} }
static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev) static int vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
{ {
char name[IFNAMSIZ]; char *name;
name = alloca(strlen(dev->ifname) + sizeof(".2147483647\0"));
vldev->dev.hidden = dev->hidden; vldev->dev.hidden = dev->hidden;
snprintf(name, IFNAMSIZ, "%s.%d", dev->ifname, vldev->id); sprintf(name, "%s.%d", dev->ifname, vldev->id);
device_set_ifname(&vldev->dev, name);
return device_set_ifname(&vldev->dev, name);
} }
static void vlan_dev_cb(struct device_user *dep, enum device_event ev) static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
@@ -83,7 +85,8 @@ static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
device_set_present(&vldev->dev, new_state); device_set_present(&vldev->dev, new_state);
break; break;
case DEV_EVENT_UPDATE_IFNAME: case DEV_EVENT_UPDATE_IFNAME:
vlan_dev_set_name(vldev, dep->dev); if (vlan_dev_set_name(vldev, dep->dev) < 0)
free_vlan_if(&vldev->dev);
break; break;
case DEV_EVENT_TOPO_CHANGE: case DEV_EVENT_TOPO_CHANGE:
/* Propagate topo changes */ /* Propagate topo changes */

46
src/3P/procd/builders/cmake/CMakeLists.txt
View File

@@ -14,12 +14,12 @@ file (
GLOB_RECURSE GLOB_RECURSE
init_source_files init_source_files
$ENV{SRC_DIR}/src/3P/procd/initd/init.c ${workspaceRoot}/src/3P/procd/initd/init.c
$ENV{SRC_DIR}/src/3P/procd/initd/early.c ${workspaceRoot}/src/3P/procd/initd/early.c
$ENV{SRC_DIR}/src/3P/procd/initd/preinit.c ${workspaceRoot}/src/3P/procd/initd/preinit.c
$ENV{SRC_DIR}/src/3P/procd/initd/mkdev.c ${workspaceRoot}/src/3P/procd/initd/mkdev.c
$ENV{SRC_DIR}/src/3P/procd/watchdog.c ${workspaceRoot}/src/3P/procd/watchdog.c
$ENV{SRC_DIR}/src/3P/procd/utils/utils.c ${workspaceRoot}/src/3P/procd/utils/utils.c
) )
# Init # Init
@@ -35,19 +35,19 @@ file (
GLOB_RECURSE GLOB_RECURSE
procd_source_files procd_source_files
$ENV{SRC_DIR}/src/3P/procd/procd.c ${workspaceRoot}/src/3P/procd/procd.c
$ENV{SRC_DIR}/src/3P/procd/signal.c ${workspaceRoot}/src/3P/procd/signal.c
$ENV{SRC_DIR}/src/3P/procd/state.c ${workspaceRoot}/src/3P/procd/state.c
$ENV{SRC_DIR}/src/3P/procd/inittab.c ${workspaceRoot}/src/3P/procd/inittab.c
$ENV{SRC_DIR}/src/3P/procd/rcS.c ${workspaceRoot}/src/3P/procd/rcS.c
$ENV{SRC_DIR}/src/3P/procd/ubus.c ${workspaceRoot}/src/3P/procd/ubus.c
$ENV{SRC_DIR}/src/3P/procd/system.c ${workspaceRoot}/src/3P/procd/system.c
$ENV{SRC_DIR}/src/3P/procd/service/service.c ${workspaceRoot}/src/3P/procd/service/service.c
$ENV{SRC_DIR}/src/3P/procd/service/instance.c ${workspaceRoot}/src/3P/procd/service/instance.c
$ENV{SRC_DIR}/src/3P/procd/service/validate.c ${workspaceRoot}/src/3P/procd/service/validate.c
$ENV{SRC_DIR}/src/3P/procd/service/trigger.c ${workspaceRoot}/src/3P/procd/service/trigger.c
$ENV{SRC_DIR}/src/3P/procd/service/watch.c ${workspaceRoot}/src/3P/procd/service/watch.c
$ENV{SRC_DIR}/src/3P/procd/utils/utils.c ${workspaceRoot}/src/3P/procd/utils/utils.c
) )
IF(DISABLE_INIT) IF(DISABLE_INIT)
@@ -57,9 +57,9 @@ ENDIF()
IF(NOT DISABLE_INIT) IF(NOT DISABLE_INIT)
list (APPEND procd_source_files list (APPEND procd_source_files
$ENV{SRC_DIR}/src/3P/procd/watchdog.c ${workspaceRoot}/src/3P/procd/watchdog.c
$ENV{SRC_DIR}/src/3P/procd/plug/coldplug.c ${workspaceRoot}/src/3P/procd/plug/coldplug.c
$ENV{SRC_DIR}/src/3P/procd/plug/hotplug.c ${workspaceRoot}/src/3P/procd/plug/hotplug.c
) )
ENDIF() ENDIF()
@@ -77,6 +77,6 @@ target_link_libraries (procd ubox ubus json-c blobmsg_json json_script)
install (TARGETS procd RUNTIME DESTINATION ../sbin) install (TARGETS procd RUNTIME DESTINATION ../sbin)
# udevtrigger # udevtrigger
add_executable (udevtrigger $ENV{SRC_DIR}/src/3P/procd/plug/udevtrigger.c) add_executable (udevtrigger ${workspaceRoot}/src/3P/procd/plug/udevtrigger.c)
install (TARGETS udevtrigger install (TARGETS udevtrigger
RUNTIME DESTINATION ../sbin) RUNTIME DESTINATION ../sbin)

12
src/3P/ubox/builders/cmake/CMakeLists.txt
View File

@@ -13,28 +13,28 @@ include (br)
# Logd # Logd
add_executable (logd add_executable (logd
$ENV{SRC_DIR}/src/3P/ubox/log/logd.c ${workspaceRoot}/src/3P/ubox/log/logd.c
$ENV{SRC_DIR}/src/3P/ubox/log/syslog.c) ${workspaceRoot}/src/3P/ubox/log/syslog.c)
target_link_libraries (logd ubox ubus) target_link_libraries (logd ubox ubus)
install (TARGETS logd RUNTIME DESTINATION sbin) install (TARGETS logd RUNTIME DESTINATION sbin)
# Logread # Logread
add_executable (logread add_executable (logread
$ENV{SRC_DIR}/src/3P/ubox/log/logread.c) ${workspaceRoot}/src/3P/ubox/log/logread.c)
target_link_libraries (logread ubox ubus json-c blobmsg_json) target_link_libraries (logread ubox ubus json-c blobmsg_json)
install (TARGETS logread RUNTIME DESTINATION sbin) install (TARGETS logread RUNTIME DESTINATION sbin)
# kmodloader # kmodloader
add_executable (kmodloader add_executable (kmodloader
$ENV{SRC_DIR}/src/3P/ubox/kmodloader.c) ${workspaceRoot}/src/3P/ubox/kmodloader.c)
target_link_libraries (kmodloader ubox) target_link_libraries (kmodloader ubox)
install (TARGETS kmodloader RUNTIME DESTINATION ../sbin) install (TARGETS kmodloader RUNTIME DESTINATION ../sbin)
# validate_data # validate_data
add_executable (validate_data add_executable (validate_data
$ENV{SRC_DIR}/src/3P/ubox/validate/cli.c ${workspaceRoot}/src/3P/ubox/validate/cli.c
$ENV{SRC_DIR}/src/3P/ubox/validate/validate.c) ${workspaceRoot}/src/3P/ubox/validate/validate.c)
target_link_libraries (validate_data ubox uci) target_link_libraries (validate_data ubox uci)
install (TARGETS validate_data RUNTIME DESTINATION ../sbin) install (TARGETS validate_data RUNTIME DESTINATION ../sbin)

20
src/3P/uci/builders/cmake/CMakeLists.txt
View File

@@ -8,23 +8,23 @@ set(DISABLE_TARGET_OPTIMIZATION ON)
include (br) include (br)
include_directories ($ENV{SRC_DIR}/src/3P/uci) include_directories (${workspaceRoot}/src/3P/uci)
ADD_DEFINITIONS (-Werror --std=gnu99 -Wmissing-declarations) ADD_DEFINITIONS (-Werror --std=gnu99 -Wmissing-declarations)
CONFIGURE_FILE ($ENV{SRC_DIR}/src/3P/uci/uci_config.h.in $ENV{SRC_DIR}/src/3P/uci/uci_config.h) CONFIGURE_FILE (${workspaceRoot}/src/3P/uci/uci_config.h.in ${workspaceRoot}/src/3P/uci/uci_config.h)
# uci library # uci library
file ( file (
GLOB_RECURSE GLOB_RECURSE
lib_source_files lib_source_files
$ENV{SRC_DIR}/src/3P/uci/libuci.c ${workspaceRoot}/src/3P/uci/libuci.c
$ENV{SRC_DIR}/src/3P/uci/file.c ${workspaceRoot}/src/3P/uci/file.c
$ENV{SRC_DIR}/src/3P/uci/util.c ${workspaceRoot}/src/3P/uci/util.c
$ENV{SRC_DIR}/src/3P/uci/delta.c ${workspaceRoot}/src/3P/uci/delta.c
$ENV{SRC_DIR}/src/3P/uci/parse.c ${workspaceRoot}/src/3P/uci/parse.c
$ENV{SRC_DIR}/src/3P/uci/blob.c ${workspaceRoot}/src/3P/uci/blob.c
) )
# Library # Library
@@ -35,12 +35,12 @@ target_include_directories (uci PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
install (TARGETS uci LIBRARY DESTINATION local/lib) install (TARGETS uci LIBRARY DESTINATION local/lib)
file (GLOB uci_headers $ENV{SRC_DIR}/src/3P/uci/*.h) file (GLOB uci_headers ${workspaceRoot}/src/3P/uci/*.h)
install (FILES ${uci_headers} DESTINATION include/uci/) install (FILES ${uci_headers} DESTINATION include/uci/)
# cmd line tool. # cmd line tool.
add_executable (uci_cli $ENV{SRC_DIR}/src/3P/uci/cli.c) add_executable (uci_cli ${workspaceRoot}/src/3P/uci/cli.c)
set_target_properties (uci_cli PROPERTIES OUTPUT_NAME uci) set_target_properties (uci_cli PROPERTIES OUTPUT_NAME uci)
target_link_libraries (uci_cli LINK_PUBLIC uci ubox blobmsg_json) target_link_libraries (uci_cli LINK_PUBLIC uci ubox blobmsg_json)

8
src/prog/chacond/builders/cmake/CMakeLists.txt
View File

@@ -6,15 +6,15 @@ set (CMAKE_MODULE_PATH "${MODULE_PATH}")
include (br) include (br)
include_directories ($ENV{SRC_DIR}/src/prog/chacond) include_directories (${workspaceRoot}/src/prog/chacond)
file ( file (
GLOB_RECURSE GLOB_RECURSE
source_files source_files
$ENV{SRC_DIR}/src/prog/chacond/src/main.c ${workspaceRoot}/src/prog/chacond/src/main.c
$ENV{SRC_DIR}/src/prog/chacond/src/ubus-model.c ${workspaceRoot}/src/prog/chacond/src/ubus-model.c
$ENV{SRC_DIR}/src/prog/chacond/src/chacon.c ${workspaceRoot}/src/prog/chacond/src/chacon.c
) )
add_executable (chacond ${source_files}) add_executable (chacond ${source_files})

8
src/prog/sprinklerd/builders/cmake/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ set (CMAKE_CXX_STANDARD 11)
include (br) include (br)
include_directories ($ENV{SRC_DIR}/src/prog/sprinklerd) include_directories (${workspaceRoot}/src/prog/sprinklerd)
# set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror=strict-aliasing") # set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror=strict-aliasing")
@@ -15,9 +15,9 @@ file(
GLOB_RECURSE GLOB_RECURSE
source_files source_files
$ENV{SRC_DIR}/src/prog/sprinklerd/src/main.cpp ${workspaceRoot}/src/prog/sprinklerd/src/main.cpp
$ENV{SRC_DIR}/src/prog/sprinklerd/src/ubus-sprinkler-model.cpp ${workspaceRoot}/src/prog/sprinklerd/src/ubus-sprinkler-model.cpp
$ENV{SRC_DIR}/src/prog/sprinklerd/src/sprinklers.cpp ${workspaceRoot}/src/prog/sprinklerd/src/sprinklers.cpp
) )
add_executable (sprinklerd ${source_files}) add_executable (sprinklerd ${source_files})