From 129a28a4d13e24361c50d69f1e76268acd7e9d99 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 7 Jun 2019 18:39:29 -0600
Subject: [PATCH] Port some improvements from master branch
---
recipes/curl/recipe.sh | 2 +-
recipes/mesa/recipe.sh | 2 +-
recipes/redoxerd/recipe.sh | 13 +++++++++++++
recipes/userutils/recipe.sh | 2 +-
4 files changed, 16 insertions(+), 3 deletions(-)
create mode 100755 recipes/redoxerd/recipe.sh
diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh
index 0bf0d3882..988c35e35 100644
--- a/recipes/curl/recipe.sh
+++ b/recipes/curl/recipe.sh
@@ -1,7 +1,7 @@
VERSION="7.62.0"
#TAR=https://curl.haxx.se/download/curl-$VERSION.tar.gz
GIT=https://gitlab.redox-os.org/redox-os/curl.git
-GIT_BRANCH=redox
+BRANCH=redox
BUILD_DEPENDS=(nghttp2 openssl zlib)
DEPENDS="ca-certificates"
diff --git a/recipes/mesa/recipe.sh b/recipes/mesa/recipe.sh
index 861cb33a1..16b053a38 100644
--- a/recipes/mesa/recipe.sh
+++ b/recipes/mesa/recipe.sh
@@ -1,6 +1,6 @@
GIT=https://gitlab.redox-os.org/redox-os/mesa.git
GIT_UPSTREAM=git://anongit.freedesktop.org/mesa/mesa
-GIT_BRANCH=redox
+BRANCH=redox
BUILD_DEPENDS=(expat llvm zlib)
function recipe_version {
diff --git a/recipes/redoxerd/recipe.sh b/recipes/redoxerd/recipe.sh
new file mode 100755
index 000000000..6b0fbc5ca
--- /dev/null
+++ b/recipes/redoxerd/recipe.sh
@@ -0,0 +1,13 @@
+GIT=https://gitlab.redox-os.org/redox-os/redoxer.git
+
+function recipe_update {
+ cd daemon
+}
+
+function recipe_build {
+ cd daemon
+}
+
+function recipe_stage {
+ mv daemon/target target
+}
diff --git a/recipes/userutils/recipe.sh b/recipes/userutils/recipe.sh
index 13936c86e..52b8d8187 100644
--- a/recipes/userutils/recipe.sh
+++ b/recipes/userutils/recipe.sh
@@ -28,7 +28,7 @@ function recipe_stage {
for bin in "${BINS[@]}"
do
- cp -v "target/$TARGET/$build/$bin" "$1/bin"
+ "$STRIP" -v "target/$TARGET/$build/$bin" -o "$1/bin/$bin"
done
cp -Rv "res" "$1/etc"
--
GitLab