[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cafef39aa21b4786c2317967689ec741055d0b97

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cafef39aa21b4786c2317967689ec741055d0b97

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2793 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  cafef39aa21b4786c2317967689ec741055d0b97 (commit)
       via  52d57e97483ba466b0f23fa9eb524eb4b6288ba0 (commit)
      from  42c2acc2187861abc00420c3e272cebd8aa53db3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cafef39aa21b4786c2317967689ec741055d0b97
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 18 20:39:47 2019 +0200

    Revert "suricata: Enable rust support"
    
    This reverts commit 5b87687cb1d37d81dbc701706e40f40f2cb16348.

commit 52d57e97483ba466b0f23fa9eb524eb4b6288ba0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 18 20:37:50 2019 +0200

    rust: disabled build
    
    rust build code with illegal instructions on armv5tel
    so this need more checking
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/suricata | 2 --
 lfs/rust                         | 2 ++
 lfs/suricata                     | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
index 41b02525d..ac48dbce9 100644
--- a/config/rootfiles/common/suricata
+++ b/config/rootfiles/common/suricata
@@ -1,7 +1,5 @@
 etc/suricata
 etc/suricata/suricata.yaml
-#root/.cargo
-#root/.cargo/.package-cache
 usr/bin/suricata
 #usr/share/doc/suricata
 #usr/share/doc/suricata/AUTHORS
diff --git a/lfs/rust b/lfs/rust
index 47e9a0ea5..950599069 100644
--- a/lfs/rust
+++ b/lfs/rust
@@ -32,6 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)-$(RUST_BOOTSTRAP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+SUP_ARCH   = none
+
 ifeq "$(BUILD_ARCH)" "i586"
 	RUST_ARCH = i686
 else
diff --git a/lfs/suricata b/lfs/suricata
index f6e4a593c..12dcfe08c 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -82,9 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-python \
 		--with-libjansson-libraries=/usr/lib \
 		--with-libjansson-includes=/usr/include \
-		--disable-suricata-update \
-		--enable-rust
-
+		--disable-suricata-update
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && make install-conf


hooks/post-receive
--
IPFire 2.x development tree