suricata: Remove unneeded stuff during build

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
index 859879db0fa05b28d58eca9b228598b352b6a5a7..ac48dbce9ad117f5da7786415e5b9d69d58d5187 100644 (file)
--- a/config/rootfiles/common/suricata
+++ b/config/rootfiles/common/suricata
@@ -1,36 +1,6 @@
 etc/suricata
 etc/suricata/suricata.yaml
 usr/bin/suricata
-#usr/bin/suricatactl
-#usr/bin/suricatasc
-#usr/lib/python2.7/site-packages/suricata
-#usr/lib/python2.7/site-packages/suricata-4.1.3-py2.7.egg-info
-#usr/lib/python2.7/site-packages/suricata/__init__.py
-#usr/lib/python2.7/site-packages/suricata/__init__.pyc
-#usr/lib/python2.7/site-packages/suricata/config
-#usr/lib/python2.7/site-packages/suricata/config/__init__.py
-#usr/lib/python2.7/site-packages/suricata/config/__init__.pyc
-#usr/lib/python2.7/site-packages/suricata/config/defaults.py
-#usr/lib/python2.7/site-packages/suricata/config/defaults.pyc
-#usr/lib/python2.7/site-packages/suricata/ctl
-#usr/lib/python2.7/site-packages/suricata/ctl/__init__.py
-#usr/lib/python2.7/site-packages/suricata/ctl/__init__.pyc
-#usr/lib/python2.7/site-packages/suricata/ctl/filestore.py
-#usr/lib/python2.7/site-packages/suricata/ctl/filestore.pyc
-#usr/lib/python2.7/site-packages/suricata/ctl/loghandler.py
-#usr/lib/python2.7/site-packages/suricata/ctl/loghandler.pyc
-#usr/lib/python2.7/site-packages/suricata/ctl/main.py
-#usr/lib/python2.7/site-packages/suricata/ctl/main.pyc
-#usr/lib/python2.7/site-packages/suricata/ctl/test_filestore.py
-#usr/lib/python2.7/site-packages/suricata/ctl/test_filestore.pyc
-#usr/lib/python2.7/site-packages/suricata/sc
-#usr/lib/python2.7/site-packages/suricata/sc/__init__.py
-#usr/lib/python2.7/site-packages/suricata/sc/__init__.pyc
-#usr/lib/python2.7/site-packages/suricata/sc/suricatasc.py
-#usr/lib/python2.7/site-packages/suricata/sc/suricatasc.pyc
-#usr/lib/python2.7/site-packages/suricatasc
-#usr/lib/python2.7/site-packages/suricatasc/__init__.py
-#usr/lib/python2.7/site-packages/suricatasc/__init__.pyc
 #usr/share/doc/suricata
 #usr/share/doc/suricata/AUTHORS
 #usr/share/doc/suricata/Basic_Setup.txt
@@ -44,23 +14,6 @@ usr/bin/suricata
 #usr/share/doc/suricata/TODO
 #usr/share/doc/suricata/Third_Party_Installation_Guides.txt
 #usr/share/man/man1/suricata.1
-#usr/share/suricata
-#usr/share/suricata/rules
-#usr/share/suricata/rules/app-layer-events.rules
-#usr/share/suricata/rules/decoder-events.rules
-#usr/share/suricata/rules/dnp3-events.rules
-#usr/share/suricata/rules/dns-events.rules
-#usr/share/suricata/rules/files.rules
-#usr/share/suricata/rules/http-events.rules
-#usr/share/suricata/rules/ipsec-events.rules
-#usr/share/suricata/rules/kerberos-events.rules
-#usr/share/suricata/rules/modbus-events.rules
-#usr/share/suricata/rules/nfs-events.rules
-#usr/share/suricata/rules/ntp-events.rules
-#usr/share/suricata/rules/smb-events.rules
-#usr/share/suricata/rules/smtp-events.rules
-#usr/share/suricata/rules/stream-events.rules
-#usr/share/suricata/rules/tls-events.rules
 var/lib/suricata
 var/lib/suricata/classification.config
 var/lib/suricata/reference.config

diff --git a/lfs/suricata b/lfs/suricata
index 07dfed25b7c9d0e1a3835c5b95e29f5985528d60..0a561ef8ba5c98ce28f5c38ca9df9ec8f39b5c06 100644 (file)
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -78,7 +78,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --disable-gccmarch-native \
                --enable-non-bundled-htp \
                --enable-nfqueue \
-               --disable-static
+               --disable-static \
+               --disable-python \
+               --disable-suricata-update
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && make install-conf
@@ -89,6 +91,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Install IPFire related config file.
        install -m 0644 $(DIR_SRC)/config/suricata/suricata.yaml /etc/suricata
 
+       # Remove shipped rules.
+       rm -rvf /usr/share/suricata
+
        # Create emtpy rules directory.
        -mkdir -p /var/lib/suricata