From 15cbcef62c274ae8cd2dd8622a34cd126e50f158 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 10 Aug 2021 17:32:56 -0600
Subject: [PATCH] Update uutils
---
recipes/uutils/recipe.sh | 91 --------------------------------------
recipes/uutils/recipe.toml | 30 +++++--------
2 files changed, 11 insertions(+), 110 deletions(-)
delete mode 100644 recipes/uutils/recipe.sh
diff --git a/recipes/uutils/recipe.sh b/recipes/uutils/recipe.sh
deleted file mode 100644
index e032fe5ad..000000000
--- a/recipes/uutils/recipe.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/uutils.git
-BRANCH=redox-unix
-GIT_UPSTREAM=https://github.com/uutils/coreutils.git
-CARGOFLAGS="--no-default-features --features redox --bin uutils -- -C lto"
-
-BINS=(
- base32
- base64
- basename
- cat
- chmod
- cksum
- comm
- cp
- cut
- date
- dircolors
- dirname
- echo
- env
- expand
- expr
- factor
- false
- fmt
- fold
- hashsum
- head
- install
- join
- link
- ln
- ls
- md5sum
- mkdir
- mktemp
- more
- mv
- nl
- od
- paste
- printenv
- printf
- ptx
- pwd
- readlink
- realpath
- relpath
- rm
- rmdir
- seq
- sha1sum
- sha224sum
- sha256sum
- sha3-224sum
- sha3-256sum
- sha3-384sum
- sha3-512sum
- sha384sum
- sha3sum
- sha512sum
- shake128sum
- shake256sum
- shred
- shuf
- sleep
- sort
- split
- sum
- tac
- tail
- tee
- test
- tr
- true
- truncate
- tsort
- uname
- unexpand
- uniq
- wc
- yes
-)
-
-function recipe_stage {
- mkdir -p "$1/bin"
- for bin in "${BINS[@]}"
- do
- ln -s uutils "$1/bin/$bin"
- done
-}
diff --git a/recipes/uutils/recipe.toml b/recipes/uutils/recipe.toml
index c2f4f921f..8416f6b5f 100644
--- a/recipes/uutils/recipe.toml
+++ b/recipes/uutils/recipe.toml
@@ -1,14 +1,14 @@
[source]
git = "https://gitlab.redox-os.org/redox-os/uutils.git"
-branch = "redox-unix"
+branch = "redox"
[build]
template = "custom"
script = """
COOKBOOK_CARGO_FLAGS+=(
--no-default-features
- --features redox
- --bin uutils
+ --features feat_os_unix_redox
+ --bin coreutils
)
cookbook_cargo
@@ -16,15 +16,20 @@ BINS=(
base32
base64
basename
+ basenc
cat
chmod
cksum
comm
cp
+ csplit
cut
date
+ dd
+ df
dircolors
dirname
+ du
echo
env
expand
@@ -40,14 +45,14 @@ BINS=(
link
ln
ls
- md5sum
mkdir
mktemp
- more
mv
nl
+ numfmt
od
paste
+ pr
printenv
printf
ptx
@@ -58,18 +63,6 @@ BINS=(
rm
rmdir
seq
- sha1sum
- sha224sum
- sha256sum
- sha3-224sum
- sha3-256sum
- sha3-384sum
- sha3-512sum
- sha384sum
- sha3sum
- sha512sum
- shake128sum
- shake256sum
shred
shuf
sleep
@@ -88,11 +81,10 @@ BINS=(
unexpand
uniq
wc
- yes
)
for bin in "${BINS[@]}"
do
- ln -sv uutils "${COOKBOOK_STAGE}/bin/$bin"
+ ln -sv coreutils "${COOKBOOK_STAGE}/bin/$bin"
done
"""
--
GitLab