rust-either: New package.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/rust-either b/config/rootfiles/common/rust-either
new file mode 100644 (file)
index 0000000..f712674
--- /dev/null
+++ b/config/rootfiles/common/rust-either
@@ -0,0 +1,12 @@
+#usr/share/cargo/registry/either-1.6.1
+#usr/share/cargo/registry/either-1.6.1/.cargo-checksum.json
+#usr/share/cargo/registry/either-1.6.1/Cargo.toml
+#usr/share/cargo/registry/either-1.6.1/Cargo.toml.deps
+#usr/share/cargo/registry/either-1.6.1/LICENSE-APACHE
+#usr/share/cargo/registry/either-1.6.1/LICENSE-MIT
+#usr/share/cargo/registry/either-1.6.1/README-crates.io.md
+#usr/share/cargo/registry/either-1.6.1/README.rst
+#usr/share/cargo/registry/either-1.6.1/src
+#usr/share/cargo/registry/either-1.6.1/src/lib.rs
+#usr/share/cargo/registry/either-1.6.1/src/serde_untagged.rs
+#usr/share/cargo/registry/either-1.6.1/src/serde_untagged_optional.rs

diff --git a/lfs/rust-either b/lfs/rust-either
new file mode 100644 (file)
index 0000000..895ffe6
--- /dev/null
+++ b/lfs/rust-either
@@ -0,0 +1,80 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.6.1
+
+THISAPP    = either-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = b4e2b229c362ad0dd313ff631816d5db
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && $(CARGO_PREPARE)
+       cd $(DIR_APP) && $(CARGO_BUILD)
+       cd $(DIR_APP) && $(CARGO_INSTALL)
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 1d0ed3b7741973c8ca627a2e4406b1704cfd8ab2..3f3fd181c08b22c61f126a685dba353ed0386d44 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1268,6 +1268,7 @@ buildipfire() {
   lfsmake2 rust-scopeguard
   lfsmake2 rust-crossbeam-epoch
   lfsmake2 rust-crossbeam-deque
+  lfsmake2 rust-either
   lfsmake2 gdb
   lfsmake2 grub
   lfsmake2 efivar