From da13f66e2924ccc81b519a39307f610d107499a1 Mon Sep 17 00:00:00 2001
From: jbnadal <jbnadal@awox.com>
Date: Mon, 20 Mar 2017 14:47:42 +0100
Subject: [PATCH] procd compile it with the official cmake instead of the
 rewritten.

---
 bsp/buildroot_external/package/procd/procd.mk |  2 +-
 src/3P/procd/builders/cmake/CMakeLists.txt    | 78 -------------------
 2 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 src/3P/procd/builders/cmake/CMakeLists.txt

diff --git a/bsp/buildroot_external/package/procd/procd.mk b/bsp/buildroot_external/package/procd/procd.mk
index 1f13c710..a03bb3ba 100644
--- a/bsp/buildroot_external/package/procd/procd.mk
+++ b/bsp/buildroot_external/package/procd/procd.mk
@@ -6,7 +6,7 @@
 
 PROCD_VERSION:= 2017.02.08
 
-PROCD_SITE = $(TOPDIR)/../../src/3P/procd/builders/cmake
+PROCD_SITE = $(TOPDIR)/../../src/3P/procd
 PROCD_SITE_METHOD = local
 PROCD_INSTALL_STAGING = YES
 
diff --git a/src/3P/procd/builders/cmake/CMakeLists.txt b/src/3P/procd/builders/cmake/CMakeLists.txt
deleted file mode 100644
index f76eb7ad..00000000
--- a/src/3P/procd/builders/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-cmake_minimum_required (VERSION 3.0)
-
-project (procd)
-
-ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations  -D_GNU_SOURCE)
-
-set (CMAKE_MODULE_PATH "${MODULE_PATH}")
-
-set(DISABLE_TARGET_OPTIMIZATION ON)
-
-include (br)
-
-file (
-	GLOB_RECURSE
-	init_source_files
-	
-	$ENV{SRC_DIR}/src/3P/procd/initd/init.c
-	$ENV{SRC_DIR}/src/3P/procd/initd/early.c
-	$ENV{SRC_DIR}/src/3P/procd/initd/preinit.c
-	$ENV{SRC_DIR}/src/3P/procd/initd/mkdev.c
-	$ENV{SRC_DIR}/src/3P/procd/watchdog.c
-	$ENV{SRC_DIR}/src/3P/procd/utils/utils.c
-	)
-
-# Init
-IF(NOT DISABLE_INIT)
-add_executable (init ${init_source_files})
-target_link_libraries (init ubox ubus)
-
-install (TARGETS init RUNTIME DESTINATION ../sbin)
-ENDIF()
-
-# procd
-file (
-	GLOB_RECURSE
-	procd_source_files
-
-	$ENV{SRC_DIR}/src/3P/procd/procd.c
-	$ENV{SRC_DIR}/src/3P/procd/signal.c
-	$ENV{SRC_DIR}/src/3P/procd/state.c
-	$ENV{SRC_DIR}/src/3P/procd/inittab.c
-	$ENV{SRC_DIR}/src/3P/procd/rcS.c
-	$ENV{SRC_DIR}/src/3P/procd/ubus.c
-	$ENV{SRC_DIR}/src/3P/procd/system.c
-	$ENV{SRC_DIR}/src/3P/procd/service/service.c
-	$ENV{SRC_DIR}/src/3P/procd/service/instance.c
-	$ENV{SRC_DIR}/src/3P/procd/service/validate.c
-	$ENV{SRC_DIR}/src/3P/procd/service/trigger.c
-	$ENV{SRC_DIR}/src/3P/procd/service/watch.c
-	$ENV{SRC_DIR}/src/3P/procd/utils/utils.c
-	)
-
-IF(DISABLE_INIT)
-	ADD_DEFINITIONS(-DDISABLE_INIT)
-ENDIF()
-
-IF(NOT DISABLE_INIT)
-list (APPEND procd_source_files
-
-	$ENV{SRC_DIR}/src/3P/procd/watchdog.c
-	$ENV{SRC_DIR}/src/3P/procd/plug/coldplug.c
-	$ENV{SRC_DIR}/src/3P/procd/plug/hotplug.c
-)
-ENDIF()
-
-IF(DEBUG)
-  ADD_DEFINITIONS(-DDEBUG -g3)
-ENDIF()
-
-add_executable (procd ${procd_source_files})
-target_link_libraries (procd ubox ubus json-c blobmsg_json json_script)
-
-install (TARGETS procd RUNTIME DESTINATION ../sbin)
-
-# udevtrigger
-add_executable (udevtrigger $ENV{SRC_DIR}/src/3P/procd/plug/udevtrigger.c)
-install (TARGETS udevtrigger
-	RUNTIME DESTINATION ../sbin)