commit 6e9e5fa9565383e56df2518222cd436db363816d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 16 23:16:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 16 23:16:30 2022 +0000
tree 9789e4ab1073611fff356df1f4c5f9e8d435e58a
parent 029362c77c8fe6ba80dc8fb4215ec1dbae46390d
parent 01d3d1df3ffe66172d497a4bd5fdc5618933f1f1

Merge "Make the linux and mac configs match the device config."

.config-linux

diff --git a/.config-linux b/.config-linux
index 6a09224..2036e9d 100644
--- a/.config-linux
+++ b/.config-linux
@@ -6,6 +6,7 @@
 # General settings.
 #
 
+CONFIG_TOYBOX=y
 # CONFIG_TOYBOX_DEBUG is not set
 CONFIG_TOYBOX_FLOAT=y
 CONFIG_TOYBOX_FORK=y
@@ -15,14 +16,13 @@
 CONFIG_TOYBOX_LIBCRYPTO=y
 CONFIG_TOYBOX_LIBZ=y
 CONFIG_TOYBOX_LSM_NONE=y
-# CONFIG_TOYBOX_NORECURSE is not set
+CONFIG_TOYBOX_NORECURSE=y
 # CONFIG_TOYBOX_ON_ANDROID is not set
 # CONFIG_TOYBOX_SELINUX is not set
 # CONFIG_TOYBOX_SMACK is not set
-CONFIG_TOYBOX_SUID=y
+# CONFIG_TOYBOX_SUID is not set
 CONFIG_TOYBOX_UID_SYS=100
 CONFIG_TOYBOX_UID_USR=500
-CONFIG_TOYBOX=y
 
 #
 # Selected toys.

.config-mac

diff --git a/.config-mac b/.config-mac
index 389de7d..1a43575 100644
--- a/.config-mac
+++ b/.config-mac
@@ -6,6 +6,7 @@
 # General settings.
 #
 
+CONFIG_TOYBOX=y
 # CONFIG_TOYBOX_DEBUG is not set
 CONFIG_TOYBOX_FLOAT=y
 CONFIG_TOYBOX_FORK=y
@@ -15,14 +16,13 @@
 CONFIG_TOYBOX_LIBCRYPTO=y
 CONFIG_TOYBOX_LIBZ=y
 CONFIG_TOYBOX_LSM_NONE=y
-# CONFIG_TOYBOX_NORECURSE is not set
+CONFIG_TOYBOX_NORECURSE=y
 # CONFIG_TOYBOX_ON_ANDROID is not set
 # CONFIG_TOYBOX_SELINUX is not set
 # CONFIG_TOYBOX_SMACK is not set
-CONFIG_TOYBOX_SUID=y
+# CONFIG_TOYBOX_SUID is not set
 CONFIG_TOYBOX_UID_SYS=100
 CONFIG_TOYBOX_UID_USR=500
-CONFIG_TOYBOX=y
 
 #
 # Selected toys.