Commit graph

330 commits

Author SHA1 Message Date
Alessandro Astone
63a51e8a6c mksh: don't use /data/local for TMPDIR in recovery
* Leaving MKSH_DEFAULT_TMPDIR undefined will make it use /tmp

Change-Id: If084b5e1699031fb093148035365093305faf96b
2024-09-08 13:44:01 +02:00
Michael Bestas
83bfe5c499 mksh: Mark mkshrc as recovery_available
Change-Id: I71361987a9cf4006bf74716d5974e1db1a4924c1
2024-09-08 13:43:45 +02:00
Elliott Hughes
695e5e51cd [automerger skipped] mksh: fix ulimit. am: 55d30846c5 -s ours am: f09c13ab76 -s ours am: 655c158f95 -s ours am: 82063b818f -s ours
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: Ib74b25067a49b1cb6690fa1ce8fe2c567d9ecd2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:21:25 +00:00
Elliott Hughes
be03fe09bb [automerger skipped] mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 -s ours am: 3cbfffa4e3 -s ours am: 31716df5d4 -s ours
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: I946cdb97e5d4c1e14b1a463c31cb223607d83125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:01:16 +00:00
Elliott Hughes
0a10778b6a Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3 am: ec9b7ce0da am: e596627a3a am: 016bcc6a4c am: ea81a89e4c
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945

Change-Id: Ibab4027fdf8a211967809b7ba7c832d0f3f2cf2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:36:20 +00:00
Elliott Hughes
8d7b00d9c2 [automerger skipped] mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 am: 4dd862cffa am: 47e2c9f1bb -s ours
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 55d30846c5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: Ia940197eff71416106f9337e033e4a988c814787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:10:19 +00:00
Elliott Hughes
82063b818f [automerger skipped] mksh: fix ulimit. am: 55d30846c5 -s ours am: f09c13ab76 -s ours am: 655c158f95 -s ours
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: I3317b6b3d3904b143a16145e65e123c87caa1fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:05:43 +00:00
Elliott Hughes
31716df5d4 [automerger skipped] mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 -s ours am: 3cbfffa4e3 -s ours
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: I3a1effac647b23724ff6a07d3ab60f3972cb888e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:00:38 +00:00
Elliott Hughes
ea81a89e4c Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3 am: ec9b7ce0da am: e596627a3a am: 016bcc6a4c
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945

Change-Id: Ie4fb71bf2cb53aa7459d3088f1086c944ea0d9c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:41:17 +00:00
Elliott Hughes
47e2c9f1bb mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 am: 4dd862cffa
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: I84c1afe16d1ee60c99f487736d2e9ab3fd66bf62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:22:30 +00:00
Elliott Hughes
655c158f95 [automerger skipped] mksh: fix ulimit. am: 55d30846c5 -s ours am: f09c13ab76 -s ours
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: Ibad55a55b3e00ccc433614e8091278e06c76a17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:36:39 +00:00
Elliott Hughes
4dd862cffa mksh: fix ulimit. am: 55d30846c5 am: e99a70b190
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: I880e8e8c240e83866321afb35235f39d305068ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:36:25 +00:00
Elliott Hughes
3cbfffa4e3 [automerger skipped] mksh: fix ulimit. am: 55d30846c5 am: e99a70b190 -s ours
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: I0bd29f2504238db07093c13ca3f90e33c684ccdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:32:34 +00:00
Elliott Hughes
016bcc6a4c Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3 am: ec9b7ce0da am: e596627a3a
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945

Change-Id: Ifd4a9074c892f45d34918764f3541e1fbb14d7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:13:22 +00:00
Elliott Hughes
bc157bb397 mksh: fix ulimit. am: 55d30846c5 am: 6a00e5063e
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: I02a306cc6baab1e87adc1cb88d8d9821a6e4a57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:05:31 +00:00
Elliott Hughes
f09c13ab76 [automerger skipped] mksh: fix ulimit. am: 55d30846c5 -s ours
am skip reason: Merged-In I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b with SHA-1 3c75470b27 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: I0c848295d88a99b2c8d269af69ff00fbc33df775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 18:44:31 +00:00
Elliott Hughes
e99a70b190 mksh: fix ulimit. am: 55d30846c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: Icb1290528ef516993e7c025c9f3187b646b0b72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 18:41:57 +00:00
Elliott Hughes
6a00e5063e mksh: fix ulimit. am: 55d30846c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/23169034

Change-Id: I3d95a159741b20971e97598122772d3efdbd5113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 18:41:10 +00:00
Elliott Hughes
e596627a3a Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3 am: ec9b7ce0da
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945

Change-Id: I8356db8b4d242cefad1a52c10749262246189f8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 18:15:10 +00:00
Elliott Hughes
ec9b7ce0da Merge "mksh: fix ulimit." am: bc57fc9617 am: 69f93583f3
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945

Change-Id: Iae27d50d0b8b2e22494704f08342796f44290e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 17:31:46 +00:00
Elliott Hughes
69f93583f3 Merge "mksh: fix ulimit." am: bc57fc9617
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2585945

Change-Id: Ifea2c7e7105cbc6688738d5c39f9ad69761d3589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 16:51:11 +00:00
Elliott Hughes
55d30846c5 mksh: fix ulimit.
In the absence of the correct #define, mksh was falling back to a trivial
internal list of limits (that doubly annoyingly wasn't reflected in the
usage output).

Bug: http://b/281900697
Test: ulimit -a
(cherry picked from https://android-review.googlesource.com/q/commit:3c75470b2730985cfd83a4c0d83a3f7e81e7c2f8)
Merged-In: I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b
Change-Id: I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b
2023-05-11 16:07:20 +00:00
Elliott Hughes
bc57fc9617 Merge "mksh: fix ulimit." 2023-05-11 16:04:02 +00:00
Elliott Hughes
3c75470b27 mksh: fix ulimit.
In the absence of the correct #define, mksh was falling back to a trivial
internal list of limits (that doubly annoyingly wasn't reflected in the
usage output).

Bug: http://b/281900697
Test: ulimit -a
Change-Id: I89a157db76cd69c2cc2c9e4a8a8c67364a7a6c4b
2023-05-10 15:53:25 -07:00
Sadaf Ebrahimi
04e0047498 Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: 958fc64917 am: 71a7c1787d am: 6627e6eaef
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224

Change-Id: I7579772e7cfc79221c7baf401e4619b98d7ee843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:41:04 +00:00
Sadaf Ebrahimi
d6cfeacd75 Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: 958fc64917 am: 71a7c1787d am: a390932b46
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224

Change-Id: I651b3a44e86ee8bedb73173c8de292f8e3977291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:37:35 +00:00
Sadaf Ebrahimi
6627e6eaef Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: 958fc64917 am: 71a7c1787d
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224

Change-Id: Id6480e09db25291dc87c62e64888930ef1594e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:12:22 +00:00
Sadaf Ebrahimi
a390932b46 Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: 958fc64917 am: 71a7c1787d
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224

Change-Id: I67d3fb0131ea69bf963cdb4439b22ed359bda893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:12:08 +00:00
Sadaf Ebrahimi
71a7c1787d Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f am: 958fc64917
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224

Change-Id: Ifeb65479e8fbe5daaad1f0584ff4966fdf9b1cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 16:07:09 +00:00
Sadaf Ebrahimi
958fc64917 Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115 am: b3138b6b4f
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224

Change-Id: I8799dd924d3272e71c7635d7ac499b1b8b1cfd12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 15:37:16 +00:00
Sadaf Ebrahimi
b3138b6b4f Merge "Upgrade mksh to mksh-R59c" am: 6d742e9115
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/2517224

Change-Id: I27a5c421d637305f2c684fe49d36e8e1e22c62df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 15:08:12 +00:00
Sadaf Ebrahimi
6d742e9115 Merge "Upgrade mksh to mksh-R59c" 2023-04-03 14:34:28 +00:00
Sadaf Ebrahimi
b02792c9ac Upgrade mksh to mksh-R59c
Test: TreeHugger
Change-Id: I6d4f4497e54fd97672ee0d634b322277326a9748
2023-03-31 18:22:13 +00:00
Xin Li
e249d87246 Merge sc-mainline-prod
Bug: 189946434
Change-Id: I348d71f485ecad207189ee3593244d828e94ef6d
2021-06-02 16:50:10 +00:00
Xin Li
c3a3913525 [automerger skipped] Mark ab/7061308 as merged in stage. am: aa41ff0074 -s ours am: 643b30239f -s ours am: 1f066f7861 -s ours
am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c10a9b8a8aa080c004d51df0c22c42128201034
2021-02-20 13:15:28 +00:00
Xin Li
2b879bdf81 [automerger skipped] Mark ab/7061308 as merged in stage. am: aa41ff0074 -s ours am: 643b30239f -s ours am: 1f066f7861 -s ours
am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf6cc55ceda87395eca42a8558d2a009bf247276
2021-02-20 13:15:00 +00:00
Xin Li
1f066f7861 [automerger skipped] Mark ab/7061308 as merged in stage. am: aa41ff0074 -s ours am: 643b30239f -s ours
am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcaa752432a78ec0ada6a266296bd06702375f4b
2021-02-20 12:03:01 +00:00
Xin Li
643b30239f [automerger skipped] Mark ab/7061308 as merged in stage. am: aa41ff0074 -s ours
am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic924b86facbce84cfb9f97b80ce8ce33ec6ddef8
2021-02-20 09:56:36 +00:00
Xin Li
aa41ff0074 Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f
Change-Id: I3ad6ab4a3b9edea1cb083d3ea392ae16298805bc
2021-02-20 00:24:14 -08:00
Treehugger Robot
d7aaee10b3 Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895 am: 1931681ea6 am: ae89a37910 am: 68829923d3
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I661537928243e65654c700cfb9ea1aaf32e00271
2021-02-05 20:21:19 +00:00
Treehugger Robot
a812af98b7 Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895 am: 1931681ea6 am: ae89a37910 am: 68829923d3
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7656deab45345ec93104c9386611d9f407a8d8aa
2021-02-05 20:21:15 +00:00
Treehugger Robot
68829923d3 Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895 am: 1931681ea6 am: ae89a37910
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c84ae34b153609bc67fb139c590279a14cd36d9
2021-02-05 19:29:05 +00:00
Treehugger Robot
ae89a37910 Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895 am: 1931681ea6
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6491ddec7e0ab33ee6a8a967c11d33eb07771ad
2021-02-05 19:11:20 +00:00
Treehugger Robot
1931681ea6 Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie23d2aed3fb99f7e15aa131d7733983d155d63d1
2021-02-05 18:52:57 +00:00
Treehugger Robot
07c71e8895 Merge "Add LOCAL_LICENSE_KINDS to external/mksh" 2021-02-05 18:21:38 +00:00
Bob Badour
05879a987a Add LOCAL_LICENSE_KINDS to external/mksh
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT
    SPDX-license-identifier-Unicode-DFS legacy_notice
to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Idf14d4318a318ee583c80d3f67fe5996e9c17e8d
2021-02-05 16:38:11 +00:00
Xin Li
e893e752e8 Mark ab/6881855 as merged am: bdb8c8575e am: a4c9705ad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/13111226

Change-Id: I709433e79aa3915d8fc7244ac4351dd24574626b
2020-11-24 00:39:15 +00:00
Xin Li
a4c9705ad2 Mark ab/6881855 as merged am: bdb8c8575e
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/13111226

Change-Id: I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f
2020-11-24 00:13:59 +00:00
Xin Li
bdb8c8575e Mark ab/6881855 as merged
Bug: 172690556
Change-Id: I0b534f2aa924e47a24351c8d026222f41906791a
2020-11-23 11:30:22 -08:00
Yifan Hong
665e7d3d5f Merge "Introduce sh.vendor_ramdisk." am: 3139f96069 am: c7cff8ed5d am: 7b8ded2414 am: 1ec623f5f9
Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1469768

Change-Id: Ibd2963d135cb27babe84ad85887c8af7eb86e509
2020-10-29 19:15:51 +00:00