aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2023-04-20 00:34:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-20 00:34:05 +0000
commit75d9870dc92f33387fdc579aac8fd817de8c89ec (patch)
tree5dbbb5fd7edc0e5025ee19f52aea2a52fee72b1c
parenta9b27e7155ae09fd3d38a0ea72598c8f7058e44a (diff)
parentfbf78d6325e9928c45c8cfa958a0bb5a1e700c87 (diff)
downloadtoybox-75d9870dc92f33387fdc579aac8fd817de8c89ec.tar.gz
Upgrade toybox to d45ee3a2bc6271110312f01be867a9b6b91dd07f am: 1e28eea058 am: 4af69acb07 am: fbf78d6325android14-dev
Original change: https://android-review.googlesource.com/c/platform/external/toybox/+/2549351 Change-Id: Id0d628f497adda8fa202e520fdf81bbcceb7c745 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--METADATA4
-rw-r--r--www/roadmap.html23
2 files changed, 13 insertions, 14 deletions
diff --git a/METADATA b/METADATA
index 727a0aef..0f8e19e8 100644
--- a/METADATA
+++ b/METADATA
@@ -13,11 +13,11 @@ third_party {
type: GIT
value: "https://github.com/landley/toybox"
}
- version: "827dfe3fe1bc9da2c215f54a5124fb0edcc9321c"
+ version: "d45ee3a2bc6271110312f01be867a9b6b91dd07f"
license_type: UNENCUMBERED
last_upgrade_date {
year: 2023
month: 4
- day: 18
+ day: 19
}
}
diff --git a/www/roadmap.html b/www/roadmap.html
index e10ebd49..7c32b2a7 100644
--- a/www/roadmap.html
+++ b/www/roadmap.html
@@ -488,37 +488,36 @@ echo egrep env expr find fuser getconf getopt git grep gzip head hexdump
hostname id jar java javap ln ls lsof m4 make md5sum mkdir mktemp mv od openssl
paste patch pgrep pkill ps pstree pwd python python2.7 python3 readlink
realpath rm rmdir rsync sed setsid sh sha1sum sha256sum sha512sum
-sleep sort stat tar tail tee todos touch tr true uname uniq unix2dos unzip
+sleep sort stat tar tail tee touch tr true uname uniq unix2dos unzip
wc which whoami xargs xxd xz zip zipinfo
</b></blockquote>
<p>The following are already in the tree and will be used directly:</p>
<blockquote><b>
-awk bzip2 jar java javap m4 make python python2.7 python3 xz
+awk bc bzip2 jar java javap m4 make python python2.7 python3 xz
</b></blockquote>
<p>Subtracting what's already in toybox (including the following toybox toys
-that are still in pending: <code>bc dd diff expr gzip lsof tar tr</code>),
+that are still in pending: <code>dd diff expr getopt gzip lsof tr</code>),
that leaves:</p>
<blockquote><b>
-bash fuser getopt git hexdump openssl pstree rsync sh todos unzip zip zipinfo
+bash dlv fuser git hexdump openssl pstree rsync sh unzip zip zipinfo
</b></blockquote>
-<p>For AOSP, zip/zipinfo/unzip are likely to be libziparchive based. The
-todos callers will use unix2dos instead if it's available. git/openssl
-seem like they should just be brought in to the tree. rsync is used to
-work around a Mac <code>cp -Rf</code> bug with broken symbolic links. That
-leaves:</p>
+<p>For AOSP, zip/zipinfo/unzip are likely to be libziparchive based.
+git/openssl seem like they should just be brought in to the tree. rsync is
+used to work around a Mac <code>cp -Rf</code> bug with broken symbolic links.
+That leaves:</p>
<blockquote><b>
-bash fuser getopt hexdump pstree
+bash fuser hexdump pstree
</b></blockquote>
<p>(Why are fuser and pstree used during the AOSP build? They're used for
-diagnostics if something goes wrong. So it's really just bash, getopt,
-and hexdump that are actually used to build.)</p>
+diagnostics if something goes wrong. So it's really just bash and hexdump
+that are actually used to build.)</p>
<hr />
<h2><a name=tizen /><a href="#tizen">Use case: Tizen Core</a></h2>