Merge branch 'dev' into agent-master

Merge pull request #290 from draios/no-rules-files-in-engine
Move rules cmakefiles from engine to falco itself
2026-03-30 08:32:17 +00:00 · 2017-10-12 13:33:08 +02:00 · 2017-10-10 15:59:32 -07:00 · 2017-10-10 14:47:33 -07:00 · 2017-10-10 11:51:23 -07:00 · 2017-10-10 11:20:36 -07:00
3 changed files with 3 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -392,6 +392,8 @@ endif()
 install(FILES falco.yaml
 	DESTINATION "${FALCO_ETC_DIR}")

+add_subdirectory(rules)
+
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	add_subdirectory("${SYSDIG_DIR}/driver" "${PROJECT_BINARY_DIR}/driver")
 endif()
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 #### Latest release

-**v0.8.0**
+**v0.8.1**
 Read the [change log](https://github.com/draios/falco/blob/dev/CHANGELOG.md)

 Dev Branch: [![Build Status](https://travis-ci.org/draios/falco.svg?branch=dev)](https://travis-ci.org/draios/falco)<br />
@@ -33,7 +33,6 @@ Documentation

 Join the Community
 ---
-* Contact the [official mailing list](https://groups.google.com/forum/#!forum/falco) for support and to talk with other users.
 * Follow us on [Twitter](https://twitter.com/sysdig) for general falco and sysdig news.
 * This is our [blog](https://sysdig.com/blog/), where you can find the latest [falco](https://sysdig.com/blog/tag/falco/) posts.
 * Join our [Public Slack](https://slack.sysdig.com) channel for sysdig and falco announcements and discussions.
--- a/userspace/engine/CMakeLists.txt
+++ b/userspace/engine/CMakeLists.txt
@@ -27,5 +27,3 @@ install(DIRECTORY lua
 	DESTINATION "${FALCO_SHARE_DIR}"
 	FILES_MATCHING PATTERN *.lua)
 endif()
-
-add_subdirectory("${PROJECT_SOURCE_DIR}/../falco/rules" "${PROJECT_BINARY_DIR}/rules")
Author	SHA1	Message	Date
Luca Marturana	31482c2a18	Merge branch 'dev' into agent-master	2017-10-12 13:33:08 +02:00
Mark Stemm	5b65fe11f1	Merge pull request #290 from draios/no-rules-files-in-engine Move rules cmakefiles from engine to falco itself	2017-10-10 15:59:32 -07:00
Mark Stemm	5d21936f60	Move rules cmakefiles from engine to falco itself The rules CMakeLists.txt, which controls the installation of the falco rules files, was in the engine CMakeLists.txt, which meant that programs that included the engine would also include rules files. This may not always be desired, so move the rules CMakeLists.txt to the main falco CMakeLists.txt instead.	2017-10-10 14:47:33 -07:00
Mark Stemm	5f688d89e4	Merge pull request #289 from draios/update-readme-no-mailing-list Update README to drop mailing list	2017-10-10 11:51:23 -07:00
Mark Stemm	2bda0f7ed5	Update README to drop mailing list Also update the version.	2017-10-10 11:20:36 -07:00
Mark Stemm	498d083980	Merge branch 'dev' into agent-master	2017-09-25 10:58:36 -07:00
Luca Marturana	6fd7f0d628	Merge branch 'dev' into agent-master	2017-08-23 10:30:27 +02:00
Thom van Os	d6fe29b47d	Merge branch 'dev' into agent-master	2017-07-27 14:04:16 -07:00
Riccardo Schirone	a71cbcd7ee	Merge branch 'dev' into agent-master	2017-07-03 12:18:10 +02:00
Mark Stemm	99d6bccc81	Merge branch 'dev' into agent-master	2017-06-06 10:13:23 -07:00
Brett	f92f74eaa8	Merge branch 'dev' into agent-master	2017-05-05 12:01:57 -07:00
Luca Marturana	d42d0e2dd1	Merge branch 'dev' into agent-master	2017-04-14 14:57:56 +02:00
Luca Marturana	135b4d9975	Merge branch 'dev' into agent-master	2017-03-30 14:46:44 +02:00
Luca Marturana	a25166b7ac	Merge branch 'dev' into agent-master	2017-03-20 15:45:29 +01:00
Luca Marturana	800a3f1ea1	Merge branch 'dev' into agent-master	2017-02-21 11:47:36 +01:00
Luca Marturana	31464de885	Merge branch 'dev' into agent-master	2017-02-07 11:06:22 +01:00
Luca Marturana	9b308d2793	Merge branch 'dev' into agent-master	2017-02-02 12:35:47 +01:00
Luca Marturana	a99f09da96	Merge branch 'dev' into agent-master	2017-01-31 11:47:33 +01:00
Luca Marturana	1e0ddba11a	Merge branch 'dev' into agent-master	2017-01-25 18:08:35 +01:00
Luca Marturana	b6d1101cb6	Merge branch 'agent-master' into dev	2017-01-17 10:55:07 +01:00