summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild2
-rwxr-xr-xinclude/lib.sh13
-rwxr-xr-xinclude/vendor.sh2
-rwxr-xr-xscript/roms4
-rwxr-xr-xscript/trees2
5 files changed, 5 insertions, 18 deletions
diff --git a/build b/build
index 19ed8875..834fd50b 100755
--- a/build
+++ b/build
@@ -119,7 +119,7 @@ build_release()
fetch_trees()
{
- for x in $(items config/git); do
+ for x in $(ls -1 config/git); do
./update trees -f "$x" || $err "$_xm: fetch $x"
singletree "$x" || x_ rm -Rf "src/$x/$x"
done
diff --git a/include/lib.sh b/include/lib.sh
index c2ad87ed..a329fa3f 100755
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -118,19 +118,6 @@ done
relname="$projectname-$version"
export LOCALVERSION="-$projectname-${version%%-*}"
-items()
-{
- rval=1
- e "$1" d not && return 1
- for x in "$1/"*; do
- # -e used because this is for files *or* directories
- [ -e "$x" ] || continue
- printf "%s\n" "${x##*/}" 2>/dev/null
- rval=0
- done
- return $rval
-}
-
scan_config()
{
awkstr=" /\{.*$1.*}{/ {flag=1;next} /\}/{flag=0} flag { print }"
diff --git a/include/vendor.sh b/include/vendor.sh
index b2fc5346..b5fda8f3 100755
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -241,7 +241,7 @@ vendor_inject()
set +u +e
[ $# -lt 1 ] && $err "No options specified."
- [ "$1" = "listboards" ] && eval "items config/coreboot || :; exit 0"
+ [ "$1" = "listboards" ] && eval "ls -1 config/coreboot || :; exit 0"
archive="$1"
diff --git a/script/roms b/script/roms
index 88ab8cd1..3890eddc 100755
--- a/script/roms
+++ b/script/roms
@@ -36,7 +36,7 @@ main()
elif [ "$1" = "serprog" ]; then
shift 1; handle_serprog $@; return 0
elif [ "$1" = "list" ]; then
- x_ items config/coreboot; return 0
+ x_ ls -1 config/coreboot; return 0
else
[ "$1" = "all" ] && shift && continue
boards="$1 $boards"
@@ -44,7 +44,7 @@ main()
fi
done
- [ -n "$boards" ] || boards="$(items config/coreboot)" || \
+ [ -n "$boards" ] || boards="$(ls -1 config/coreboot)" || \
$err "Cannot generate list of boards for building"
for x in $boards; do
[ -d "config/coreboot/$x/config" ] && \
diff --git a/script/trees b/script/trees
index 4d9a5d08..f090f539 100755
--- a/script/trees
+++ b/script/trees
@@ -87,7 +87,7 @@ build_targets()
# Build for all targets if no argument is given
[ $# -gt 0 ] && target1="$1"
[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && shift 1
- targets="$(items "$cfgsdir")" || $err "Can't get options for $cfgsdir"
+ targets="$(ls -1 "$cfgsdir")" || $err "Can't get options for $cfgsdir"
[ $# -gt 0 ] && targets=$@
handle_targets