Fix compilation of netifd and uci.

bsp/buildroot_external/Config.in

@@ -12,6 +12,12 @@ source "$BR2_EXTERNAL/package/ubox/Config.in"
 # UBUS
 source "$BR2_EXTERNAL/package/ubus/Config.in"
 
+# UCI
+source "$BR2_EXTERNAL/package/uci/Config.in"
+
+# NETIFD
+source "$BR2_EXTERNAL/package/netifd/Config.in"
+
 endmenu # Third parties  
 
 menu "Domo"

bsp/buildroot_external/package/netifd/Config.in

@@ -1,5 +1,5 @@
 config BR2_PACKAGE_NETIFD
-	bool "procd"
+	bool "netifd"
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_UBUS
 	select BR2_PACKAGE_UCI

bsp/buildroot_external/package/netifd/netifd.mk

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

bsp/buildroot_external/package/uci/uci.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #
-# UBOX TOOLS
+# UCI
 #
 ################################################################################
 

projects/pi_domo/configs/buildroot.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2016.08.1-g94ec12e-dirty Configuration
+# Buildroot 2016.08.1-gc269a1c-dirty Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_HOST_GCC_AT_LEAST_4_6=y
@@ -1351,7 +1351,8 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBNFNETLINK is not set
 # BR2_PACKAGE_LIBNFTNL is not set
 # BR2_PACKAGE_LIBNICE is not set
-# BR2_PACKAGE_LIBNL is not set
+BR2_PACKAGE_LIBNL=y
+# BR2_PACKAGE_LIBNL_TOOLS is not set
 # BR2_PACKAGE_LIBOAUTH is not set
 # BR2_PACKAGE_LIBOPING is not set
 # BR2_PACKAGE_LIBOSIP2 is not set
@@ -2431,6 +2432,8 @@ BR2_PACKAGE_PROCD=y
 # BR2_PACKAGE_PROCD_DISABLE_INIT is not set
 BR2_PACKAGE_UBOX=y
 BR2_PACKAGE_UBUS=y
+BR2_PACKAGE_UCI=y
+BR2_PACKAGE_NETIFD=y
 
 #
 # Domo

projects/sun8i-h2_domo/configs/buildroot.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2016.08.1-ge0c4c18 Configuration
+# Buildroot 2016.08.1-gc269a1c-dirty Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_HOST_GCC_AT_LEAST_4_6=y
@@ -2442,6 +2442,8 @@ BR2_PACKAGE_PROCD=y
 # BR2_PACKAGE_PROCD_DISABLE_INIT is not set
 BR2_PACKAGE_UBOX=y
 BR2_PACKAGE_UBUS=y
+BR2_PACKAGE_UCI=y
+BR2_PACKAGE_NETIFD=y
 
 #
 # Domo

src/3P/netifd/builders/cmake/CMakeLists.txt

@@ -4,6 +4,8 @@ project (netifd)
 
 ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -Wmissing-declarations)
 
+include_directories ($ENV{INC_DIR}/libnl3)
+
 set (CMAKE_MODULE_PATH "${MODULE_PATH}")
 
 set(DISABLE_TARGET_OPTIMIZATION ON)
@@ -41,6 +43,6 @@ file (
 
 
 add_executable (netifd ${source_files})
-target_link_libraries (netifd ubox ubus json-c blobmsg_json)
+target_link_libraries (netifd ubox ubus json-c blobmsg_json uci nl-3)
 
 install (TARGETS netifd RUNTIME DESTINATION ../sbin)

src/3P/netifd/config.c

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <uci.h>
+#include <uci/uci.h>
 
 #include "netifd.h"
 #include "interface.h"

src/3P/netifd/config.h

@@ -15,7 +15,7 @@
 #define __NETIFD_CONFIG_H
 
 #include <libubox/blobmsg.h>
-#include <uci_blob.h>
+#include <uci/uci_blob.h>
 
 extern bool config_init;
 

src/3P/netifd/netifd.h

@@ -24,7 +24,7 @@
 #include <libubox/ustream.h>
 #include <libubox/utils.h>
 
-#include <libubus.h>
+#include <ubus/libubus.h>
 
 #include "utils.h"
 

src/3P/netifd/utils.h

@@ -16,7 +16,7 @@
 
 #include <unistd.h>
 #include <stdio.h>
-#include <uci_blob.h>
+#include <uci/uci_blob.h>
 #include <libubox/list.h>
 #include <libubox/avl.h>
 #include <libubox/avl-cmp.h>