From c3aa12549e0209e8e4afffbec0b888d3b2787cdc Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Sat, 1 Jul 2017 12:10:05 -0700 Subject: [PATCH 1/2] Update pkgutils submodule --- pkgutils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgutils b/pkgutils index bf8cc11dd..c7a89531e 160000 --- a/pkgutils +++ b/pkgutils @@ -1 +1 @@ -Subproject commit bf8cc11ddcc649c3be3e97055ab6a7f4060b7946 +Subproject commit c7a89531e1a788a8e5a96f12c8949f9a2a8e9bdb From e098418b0e363b18aa19ebfdace59a068c4bd319 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Sat, 1 Jul 2017 12:10:22 -0700 Subject: [PATCH 2/2] Use symlinks instead of scripts --- recipes/dash/recipe.sh | 3 +-- recipes/gcc/recipe.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/dash/recipe.sh b/recipes/dash/recipe.sh index 27c87435f..26c147b78 100644 --- a/recipes/dash/recipe.sh +++ b/recipes/dash/recipe.sh @@ -44,7 +44,6 @@ function recipe_clean { function recipe_stage { dest="$(realpath $1)" make DESTDIR="$dest" install - echo -e '#!/bin/ion\ndash @args[1..]' > "$1/bin/sh" - chmod a+x "$1/bin/sh" + ln -s "dash" "$1/bin/sh" skip=1 } diff --git a/recipes/gcc/recipe.sh b/recipes/gcc/recipe.sh index a27002e6d..fecb84728 100644 --- a/recipes/gcc/recipe.sh +++ b/recipes/gcc/recipe.sh @@ -53,7 +53,6 @@ function recipe_stage { dest="$(realpath $1)" make DESTDIR="$dest" install-gcc install-target-libgcc find "$dest"/{bin,libexec} -exec x86_64-elf-redox-strip {} ';' 2> /dev/null - echo -e '#!/bin/ion\ngcc @args[1..]' > "$1/bin/cc" - chmod a+x "$1/bin/cc" + ln -s "gcc" "$1/bin/cc" skip=1 }