rust-parking_lot_core: 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-parking_lot_core b/config/rootfiles/common/rust-parking_lot_core
new file mode 100644 (file)
index 0000000..01fd241
--- /dev/null
+++ b/config/rootfiles/common/rust-parking_lot_core
@@ -0,0 +1,26 @@
+#usr/share/cargo/registry/parking_lot_core-0.8.5
+#usr/share/cargo/registry/parking_lot_core-0.8.5/.cargo-checksum.json
+#usr/share/cargo/registry/parking_lot_core-0.8.5/Cargo.toml
+#usr/share/cargo/registry/parking_lot_core-0.8.5/Cargo.toml.deps
+#usr/share/cargo/registry/parking_lot_core-0.8.5/LICENSE-APACHE
+#usr/share/cargo/registry/parking_lot_core-0.8.5/LICENSE-MIT
+#usr/share/cargo/registry/parking_lot_core-0.8.5/build.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/lib.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/parking_lot.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/spinwait.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/generic.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/linux.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/mod.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/redox.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/sgx.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/unix.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/wasm.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/wasm_atomic.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/windows
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/windows/keyed_event.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/windows/mod.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/thread_parker/windows/waitaddress.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/util.rs
+#usr/share/cargo/registry/parking_lot_core-0.8.5/src/word_lock.rs

diff --git a/lfs/rust-parking_lot_core b/lfs/rust-parking_lot_core
new file mode 100644 (file)
index 0000000..fdacf44
--- /dev/null
+++ b/lfs/rust-parking_lot_core
@@ -0,0 +1,81 @@
+###############################################################################
+#                                                                             #
+# 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        = 0.8.5
+
+THISAPP    = parking_lot_core-$(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 = 233dee08f26c9cbe78f29b66c0c20ccd
+
+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) && patch -Np1 < $(DIR_SRC)/src/patches/rust-parking_lot_core-0.8.5-fix-metadata.patch
+       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 9012c50843915ca035fb62c2bfd849795bb8b1d4..a08c2468a806151e511fc62e184173244ac5e6ca 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1287,6 +1287,7 @@ buildipfire() {
   lfsmake2 rust-instant
   lfsmake2 rust-lock_api
   lfsmake2 rust-smallvec
+  lfsmake2 rust-parking_lot_core
   lfsmake2 gdb
   lfsmake2 grub
   lfsmake2 efivar

diff --git a/src/patches/rust-parking_lot_core-0.8.5-fix-metadata.patch b/src/patches/rust-parking_lot_core-0.8.5-fix-metadata.patch
new file mode 100644 (file)
index 0000000..a42273a
--- /dev/null
+++ b/src/patches/rust-parking_lot_core-0.8.5-fix-metadata.patch
@@ -0,0 +1,13 @@
+--- parking_lot_core-0.8.5/Cargo.toml.orig     2022-01-28 15:27:51.382373138 +0000
++++ parking_lot_core-0.8.5/Cargo.toml  2022-01-28 15:28:01.218817389 +0000
+@@ -43,10 +43,5 @@
+ [features]
+ deadlock_detection = ["petgraph", "thread-id", "backtrace"]
+ nightly = []
+-[target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
+-version = "0.2.8"
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2.95"
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.9"
+-features = ["winnt", "ntstatus", "minwindef", "winerror", "winbase", "errhandlingapi", "handleapi"]