From d1abeb8e4443e0ae5492904c4c01a5bb8428def9 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Mon, 31 Jan 2022 13:08:01 +0100 Subject: [PATCH] rust-remove_dir_all: New package. Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer --- config/rootfiles/common/rust-remove_dir_all | 9 +++ lfs/rust-remove_dir_all | 81 +++++++++++++++++++ make.sh | 1 + ...st-remove_dir_all-0.5.3-fix-metadata.patch | 9 +++ 4 files changed, 100 insertions(+) create mode 100644 config/rootfiles/common/rust-remove_dir_all create mode 100644 lfs/rust-remove_dir_all create mode 100644 src/patches/rust-remove_dir_all-0.5.3-fix-metadata.patch diff --git a/config/rootfiles/common/rust-remove_dir_all b/config/rootfiles/common/rust-remove_dir_all new file mode 100644 index 0000000000..39ddef8e12 --- /dev/null +++ b/config/rootfiles/common/rust-remove_dir_all @@ -0,0 +1,9 @@ +#usr/share/cargo/registry/remove_dir_all-0.5.3 +#usr/share/cargo/registry/remove_dir_all-0.5.3/.cargo-checksum.json +#usr/share/cargo/registry/remove_dir_all-0.5.3/Cargo.toml +#usr/share/cargo/registry/remove_dir_all-0.5.3/LICENCE-APACHE +#usr/share/cargo/registry/remove_dir_all-0.5.3/LICENCE-MIT +#usr/share/cargo/registry/remove_dir_all-0.5.3/README.md +#usr/share/cargo/registry/remove_dir_all-0.5.3/src +#usr/share/cargo/registry/remove_dir_all-0.5.3/src/fs.rs +#usr/share/cargo/registry/remove_dir_all-0.5.3/src/lib.rs diff --git a/lfs/rust-remove_dir_all b/lfs/rust-remove_dir_all new file mode 100644 index 0000000000..da430436a9 --- /dev/null +++ b/lfs/rust-remove_dir_all @@ -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 = 0.5.3 + +THISAPP = remove_dir_all-$(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 = 0538d1da369f3e3f0412aa4d735c1b61 + +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-remove_dir_all-0.5.3-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 13c74bba4a..07ce2bfb5b 100755 --- a/make.sh +++ b/make.sh @@ -1272,6 +1272,7 @@ buildipfire() { lfsmake2 rust-crossbeam-channel lfsmake2 rust-rayon-core lfsmake2 rust-rayon + lfsmake2 rust-remove_dir_all lfsmake2 gdb lfsmake2 grub lfsmake2 efivar diff --git a/src/patches/rust-remove_dir_all-0.5.3-fix-metadata.patch b/src/patches/rust-remove_dir_all-0.5.3-fix-metadata.patch new file mode 100644 index 0000000000..2ceb3b6791 --- /dev/null +++ b/src/patches/rust-remove_dir_all-0.5.3-fix-metadata.patch @@ -0,0 +1,9 @@ +--- remove_dir_all-0.5.3/Cargo.toml.orig 2022-01-28 14:45:52.179136723 +0000 ++++ remove_dir_all-0.5.3/Cargo.toml 2022-01-28 14:46:03.559249000 +0000 +@@ -23,6 +23,4 @@ + repository = "https://github.com/XAMPPRocky/remove_dir_all.git" + [dev-dependencies.doc-comment] + version = "0.3" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" + features = ["std", "errhandlingapi", "winerror", "fileapi", "winbase"] -- 2.39.5