procd could now be compiled.

This commit is contained in:
jbnadal
2016-12-09 18:12:24 +01:00
parent 3084c88ee0
commit 54075802e1
2 changed files with 31 additions and 31 deletions

View File

@@ -6,20 +6,20 @@
PROCD_VERSION:= 2016.07.29 PROCD_VERSION:= 2016.07.29
PROCD_SITE = $(TOPDIR)/../../../AwoxAudio/Products/External/procd/builders/cmake PROCD_SITE = $(TOPDIR)/../../src/3P/procd/builders/cmake
PROCD_SITE_METHOD = local PROCD_SITE_METHOD = local
PROCD_INSTALL_STAGING = YES PROCD_INSTALL_STAGING = YES
PROCD_DEPENDENCIES = libubox-aw libubus json-c PROCD_DEPENDENCIES = libubox json-c ubus
CONF = AWOXCVS4=$(TOPDIR)/../../../ PROCD_CONF = SRC_DIR=$(TOPDIR)/../..
ifeq ($(BR2_PACKAGE_PROCD_DISABLE_INIT),y) ifeq ($(BR2_PACKAGE_PROCD_DISABLE_INIT),y)
PROCD_CONF_OPTS += -DDISABLE_INIT=ON PROCD_CONF_OPTS += -DDISABLE_INIT=ON
endif endif
PROCD_CONF_ENV = $(CONF) PROCD_CONF_ENV = $(PROCD_CONF)
PROCD_MAKE_ENV = $(CONF) PROCD_MAKE_ENV = $(PROCD_CONF)
PROCD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) PROCD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

View File

@@ -2,24 +2,24 @@ cmake_minimum_required (VERSION 3.0)
project (procd) project (procd)
ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations) ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations -D_GNU_SOURCE)
set (CMAKE_MODULE_PATH "${MODULE_PATH}") set (CMAKE_MODULE_PATH "${MODULE_PATH}")
set(DISABLE_TARGET_OPTIMIZATION ON) set(DISABLE_TARGET_OPTIMIZATION ON)
include (aw) include (br)
file ( file (
GLOB_RECURSE GLOB_RECURSE
init_source_files init_source_files
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/initd/init.c $ENV{SRC_DIR}/src/3P/procd/initd/init.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/initd/early.c $ENV{SRC_DIR}/src/3P/procd/initd/early.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/initd/preinit.c $ENV{SRC_DIR}/src/3P/procd/initd/preinit.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/initd/mkdev.c $ENV{SRC_DIR}/src/3P/procd/initd/mkdev.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/watchdog.c $ENV{SRC_DIR}/src/3P/procd/watchdog.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/utils/utils.c $ENV{SRC_DIR}/src/3P/procd/utils/utils.c
) )
# Init # Init
@@ -35,19 +35,19 @@ file (
GLOB_RECURSE GLOB_RECURSE
procd_source_files procd_source_files
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/procd.c $ENV{SRC_DIR}/src/3P/procd/procd.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/signal.c $ENV{SRC_DIR}/src/3P/procd/signal.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/state.c $ENV{SRC_DIR}/src/3P/procd/state.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/inittab.c $ENV{SRC_DIR}/src/3P/procd/inittab.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/rcS.c $ENV{SRC_DIR}/src/3P/procd/rcS.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/ubus.c $ENV{SRC_DIR}/src/3P/procd/ubus.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/system.c $ENV{SRC_DIR}/src/3P/procd/system.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/service/service.c $ENV{SRC_DIR}/src/3P/procd/service/service.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/service/instance.c $ENV{SRC_DIR}/src/3P/procd/service/instance.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/service/validate.c $ENV{SRC_DIR}/src/3P/procd/service/validate.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/service/trigger.c $ENV{SRC_DIR}/src/3P/procd/service/trigger.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/service/watch.c $ENV{SRC_DIR}/src/3P/procd/service/watch.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/utils/utils.c $ENV{SRC_DIR}/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{AWOXCVS}/AwoxAudio/Products/External/procd/watchdog.c $ENV{SRC_DIR}/src/3P/procd/watchdog.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/plug/coldplug.c $ENV{SRC_DIR}/src/3P/procd/plug/coldplug.c
$ENV{AWOXCVS}/AwoxAudio/Products/External/procd/plug/hotplug.c $ENV{SRC_DIR}/src/3P/procd/plug/hotplug.c
) )
ENDIF() ENDIF()
@@ -73,6 +73,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{AWOXCVS}/AwoxAudio/Products/External/procd/plug/udevtrigger.c) add_executable (udevtrigger $ENV{SRC_DIR}/src/3P/procd/plug/udevtrigger.c)
install (TARGETS udevtrigger install (TARGETS udevtrigger
RUNTIME DESTINATION ../sbin) RUNTIME DESTINATION ../sbin)