From 48a3d031ae9c27e1f0ad9f61d802c26fae494f14 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Mon, 31 Jan 2022 13:00:18 +0100 Subject: [PATCH] rust-num_cpus: New package. Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer --- config/rootfiles/common/rust-num_cpus | 35 ++++++++ lfs/rust-num_cpus | 81 +++++++++++++++++++ make.sh | 1 + .../rust-num_cpus-1.13.1-fix-metadata.patch | 10 +++ 4 files changed, 127 insertions(+) create mode 100644 config/rootfiles/common/rust-num_cpus create mode 100644 lfs/rust-num_cpus create mode 100644 src/patches/rust-num_cpus-1.13.1-fix-metadata.patch diff --git a/config/rootfiles/common/rust-num_cpus b/config/rootfiles/common/rust-num_cpus new file mode 100644 index 0000000000..8a2c706b4a --- /dev/null +++ b/config/rootfiles/common/rust-num_cpus @@ -0,0 +1,35 @@ +#usr/share/cargo/registry/num_cpus-1.13.1 +#usr/share/cargo/registry/num_cpus-1.13.1/.cargo-checksum.json +#usr/share/cargo/registry/num_cpus-1.13.1/CHANGELOG.md +#usr/share/cargo/registry/num_cpus-1.13.1/CONTRIBUTING.md +#usr/share/cargo/registry/num_cpus-1.13.1/Cargo.toml +#usr/share/cargo/registry/num_cpus-1.13.1/Cargo.toml.deps +#usr/share/cargo/registry/num_cpus-1.13.1/LICENSE-APACHE +#usr/share/cargo/registry/num_cpus-1.13.1/LICENSE-MIT +#usr/share/cargo/registry/num_cpus-1.13.1/README.md +#usr/share/cargo/registry/num_cpus-1.13.1/ci +#usr/share/cargo/registry/num_cpus-1.13.1/ci/cgroups +#usr/share/cargo/registry/num_cpus-1.13.1/ci/cgroups/Dockerfile +#usr/share/cargo/registry/num_cpus-1.13.1/examples +#usr/share/cargo/registry/num_cpus-1.13.1/examples/values.rs +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups/ceil +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups/ceil/cpu.cfs_period_us +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups/ceil/cpu.cfs_quota_us +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups/good +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups/good/cpu.cfs_period_us +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups/good/cpu.cfs_quota_us +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups/zero-period +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups/zero-period/cpu.cfs_period_us +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/cgroups/zero-period/cpu.cfs_quota_us +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/proc +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/proc/cgroups +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/proc/cgroups/cgroup +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/proc/cgroups/mountinfo +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/proc/cgroups/mountinfo_multi_opt +#usr/share/cargo/registry/num_cpus-1.13.1/fixtures/cgroups/proc/cgroups/mountinfo_zero_opt +#usr/share/cargo/registry/num_cpus-1.13.1/src +#usr/share/cargo/registry/num_cpus-1.13.1/src/lib.rs +#usr/share/cargo/registry/num_cpus-1.13.1/src/linux.rs diff --git a/lfs/rust-num_cpus b/lfs/rust-num_cpus new file mode 100644 index 0000000000..d5dcaa6bbe --- /dev/null +++ b/lfs/rust-num_cpus @@ -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 = 1.13.1 + +THISAPP = num_cpus-$(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 = c5e50e299295e662ad19c58428d6e085 + +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-num_cpus-1.13.1-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 2e6e747e59..c0b89af4a2 100755 --- a/make.sh +++ b/make.sh @@ -1261,6 +1261,7 @@ buildipfire() { lfsmake2 rust-rdrand lfsmake2 rust-rand-0.4 lfsmake2 rust-log + lfsmake2 rust-num_cpus lfsmake2 gdb lfsmake2 grub lfsmake2 efivar diff --git a/src/patches/rust-num_cpus-1.13.1-fix-metadata.patch b/src/patches/rust-num_cpus-1.13.1-fix-metadata.patch new file mode 100644 index 0000000000..8d5f5bf6a7 --- /dev/null +++ b/src/patches/rust-num_cpus-1.13.1-fix-metadata.patch @@ -0,0 +1,10 @@ +--- num_cpus-1.13.1/Cargo.toml.orig 2022-01-28 14:11:47.332191720 +0000 ++++ num_cpus-1.13.1/Cargo.toml 2022-01-28 14:11:52.848099901 +0000 +@@ -20,7 +20,5 @@ + categories = ["hardware-support"] + license = "MIT OR Apache-2.0" + repository = "https://github.com/seanmonstar/num_cpus" +-[target."cfg(all(any(target_arch = \"x86_64\", target_arch = \"aarch64\"), target_os = \"hermit\"))".dependencies.hermit-abi] +-version = "0.1.3" + [target."cfg(not(windows))".dependencies.libc] + version = "0.2.26" -- 2.39.5