From 62d1644d16202479451a4d24655d54edac098d7c Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Mon, 31 Jan 2022 12:38:17 +0100 Subject: [PATCH] rust-walkdir: New package. Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer --- config/rootfiles/common/rust-walkdir | 21 +++++ lfs/rust-walkdir | 81 +++++++++++++++++++ make.sh | 1 + .../rust-walkdir-2.3.2-fix-metadata.patch | 17 ++++ 4 files changed, 120 insertions(+) create mode 100644 config/rootfiles/common/rust-walkdir create mode 100644 lfs/rust-walkdir create mode 100644 src/patches/rust-walkdir-2.3.2-fix-metadata.patch diff --git a/config/rootfiles/common/rust-walkdir b/config/rootfiles/common/rust-walkdir new file mode 100644 index 0000000000..1a1f8a55e7 --- /dev/null +++ b/config/rootfiles/common/rust-walkdir @@ -0,0 +1,21 @@ +#usr/share/cargo/registry/walkdir-2.3.2 +#usr/share/cargo/registry/walkdir-2.3.2/.cargo-checksum.json +#usr/share/cargo/registry/walkdir-2.3.2/COPYING +#usr/share/cargo/registry/walkdir-2.3.2/Cargo.toml +#usr/share/cargo/registry/walkdir-2.3.2/Cargo.toml.deps +#usr/share/cargo/registry/walkdir-2.3.2/LICENSE-MIT +#usr/share/cargo/registry/walkdir-2.3.2/README.md +#usr/share/cargo/registry/walkdir-2.3.2/UNLICENSE +#usr/share/cargo/registry/walkdir-2.3.2/compare +#usr/share/cargo/registry/walkdir-2.3.2/compare/nftw.c +#usr/share/cargo/registry/walkdir-2.3.2/compare/walk.py +#usr/share/cargo/registry/walkdir-2.3.2/rustfmt.toml +#usr/share/cargo/registry/walkdir-2.3.2/src +#usr/share/cargo/registry/walkdir-2.3.2/src/dent.rs +#usr/share/cargo/registry/walkdir-2.3.2/src/error.rs +#usr/share/cargo/registry/walkdir-2.3.2/src/lib.rs +#usr/share/cargo/registry/walkdir-2.3.2/src/tests +#usr/share/cargo/registry/walkdir-2.3.2/src/tests/mod.rs +#usr/share/cargo/registry/walkdir-2.3.2/src/tests/recursive.rs +#usr/share/cargo/registry/walkdir-2.3.2/src/tests/util.rs +#usr/share/cargo/registry/walkdir-2.3.2/src/util.rs diff --git a/lfs/rust-walkdir b/lfs/rust-walkdir new file mode 100644 index 0000000000..87aeacc5af --- /dev/null +++ b/lfs/rust-walkdir @@ -0,0 +1,81 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team # +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.3.2 + +THISAPP = walkdir-$(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 = 580dd7d12690c726da7d5075f3442a74 + +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-walkdir-2.3.2-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 c32dc56f6c..d0a39ccf1e 100755 --- a/make.sh +++ b/make.sh @@ -1240,6 +1240,7 @@ buildipfire() { lfsmake2 rust-semver-parser lfsmake2 rust-semver lfsmake2 rust-same-file + lfsmake2 rust-walkdir lfsmake2 gdb lfsmake2 grub lfsmake2 efivar diff --git a/src/patches/rust-walkdir-2.3.2-fix-metadata.patch b/src/patches/rust-walkdir-2.3.2-fix-metadata.patch new file mode 100644 index 0000000000..5d804a2284 --- /dev/null +++ b/src/patches/rust-walkdir-2.3.2-fix-metadata.patch @@ -0,0 +1,17 @@ +--- walkdir-2.3.2/Cargo.toml.orig 2022-01-28 10:48:41.943483058 +0000 ++++ walkdir-2.3.2/Cargo.toml 2022-01-28 10:48:54.391464719 +0000 +@@ -28,14 +28,6 @@ + version = "1.0.1" + [dev-dependencies.doc-comment] + version = "0.3" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["std", "winnt"] +- +-[target."cfg(windows)".dependencies.winapi-util] +-version = "0.1.1" +-[badges.appveyor] +-repository = "BurntSushi/walkdir" + + [badges.travis-ci] + repository = "BurntSushi/walkdir" -- 2.39.5