Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[build/deps] Moving shells from test/spec-bin
- busybox ash working - bash has a weird error on Fedora only! - zsh still does too - yash somehow doesn't support out-of-tree builds, which conflicts with WEDGE - however it's also not totally necessary - though I think we might build it into some Soil images, in which case I should probably fix this
- Loading branch information
Andy C
committed
Jan 23, 2024
1 parent
2a5c3c9
commit 58df065
Showing
4 changed files
with
147 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# Wedge definition for bash | ||
# | ||
# Loaded by deps/wedge.sh. | ||
|
||
set -o nounset | ||
set -o pipefail | ||
set -o errexit | ||
|
||
# sourced | ||
WEDGE_NAME='bash' | ||
WEDGE_VERSION='4.4' | ||
|
||
wedge-make() { | ||
local src_dir=$1 | ||
local build_dir=$2 | ||
local install_dir=$3 | ||
|
||
time $src_dir/configure --prefix=$install_dir | ||
|
||
time make | ||
} | ||
|
||
wedge-install() { | ||
local build_dir=$1 | ||
|
||
pushd $build_dir | ||
|
||
time make install | ||
|
||
popd | ||
} | ||
|
||
wedge-smoke-test() { | ||
local install_dir=$1 | ||
|
||
$install_dir/bin/bash -c 'echo "hi from bash"' | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# Wedge definition for busybox | ||
# | ||
# Loaded by deps/wedge.sh. | ||
|
||
set -o nounset | ||
set -o pipefail | ||
set -o errexit | ||
|
||
# sourced | ||
WEDGE_NAME='busybox' | ||
WEDGE_VERSION='1.35.0' | ||
|
||
wedge-make() { | ||
local src_dir=$1 | ||
local build_dir=$2 | ||
local install_dir=$3 | ||
|
||
# Out of tree instructions from INSTALL | ||
make KBUILD_SRC=$src_dir -f $src_dir/Makefile defconfig | ||
|
||
time make | ||
} | ||
|
||
wedge-install() { | ||
local build_dir=$1 | ||
local install_dir=$2 | ||
|
||
cp -v $build_dir/busybox $install_dir | ||
ln -s -f -v busybox $install_dir/ash | ||
} | ||
|
||
wedge-smoke-test() { | ||
local install_dir=$1 | ||
|
||
$install_dir/ash -c 'echo "hi from busybox ash"' | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# Wedge definition for yash | ||
# | ||
# Loaded by deps/wedge.sh. | ||
|
||
set -o nounset | ||
set -o pipefail | ||
set -o errexit | ||
|
||
# sourced | ||
WEDGE_NAME='yash' | ||
WEDGE_VERSION='2.49' | ||
|
||
wedge-make() { | ||
local src_dir=$1 | ||
local build_dir=$2 | ||
local install_dir=$3 | ||
|
||
# 9/2021: from VirtualBox VM | ||
# The terminfo (curses) library is unavailable! | ||
# Add the "--disable-lineedit" option and try again. | ||
time $src_dir/configure --disable-lineedit --prefix=$install_dir | ||
|
||
time make | ||
} | ||
|
||
wedge-install() { | ||
local build_dir=$1 | ||
|
||
pushd $build_dir | ||
|
||
time make install | ||
|
||
popd | ||
} | ||
|
||
wedge-smoke-test() { | ||
local install_dir=$1 | ||
|
||
$install_dir/bin/yash -c 'echo "hi from yash"' | ||
} |