Commit graph

6865 commits

Author SHA1 Message Date
Colin Cross
91a4160f5c am 26321284: am 02ac0bfd: Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2
* commit '263212845432865236b9b6ccdca807385603db68':
  Fix fastbootd's <linux/kexec.h> reference.
  Fastbootd: Comments and general cleaning
  Fastbootd: General fixes and changes
  Revert "Revert "Fastbootd: flashing certification""
  Fastbootd: auto ssh server start
  Fastbootd: network auto discovery
  Fastbootd: socket and network transport
  Fastbootd: build breakage fix
  Revert "Fastbootd: flashing certification"
  Fastbootd: flashing certification
  Fastbootd: improved operations on gpt
  Remove a homebrew mmap64.
  Fastbootd: fixed missing file in Android.mk
  fastbootd: erase, boot and partitioning commands
2013-12-05 02:45:20 +00:00
Colin Cross
2632128454 am 02ac0bfd: Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2
* commit '02ac0bfdc1c80a2f18487d28aa56dcd8499de246':
  Fix fastbootd's <linux/kexec.h> reference.
  Fastbootd: Comments and general cleaning
  Fastbootd: General fixes and changes
  Revert "Revert "Fastbootd: flashing certification""
  Fastbootd: auto ssh server start
  Fastbootd: network auto discovery
  Fastbootd: socket and network transport
  Fastbootd: build breakage fix
  Revert "Fastbootd: flashing certification"
  Fastbootd: flashing certification
  Fastbootd: improved operations on gpt
  Remove a homebrew mmap64.
  Fastbootd: fixed missing file in Android.mk
  fastbootd: erase, boot and partitioning commands
2013-12-04 15:18:10 -08:00
Colin Cross
02ac0bfdc1 Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2
* changes:
  Fix fastbootd's <linux/kexec.h> reference.
  Fastbootd: Comments and general cleaning
  Fastbootd: General fixes and changes
  Revert "Revert "Fastbootd: flashing certification""
  Fastbootd: auto ssh server start
  Fastbootd: network auto discovery
  Fastbootd: socket and network transport
  Fastbootd: build breakage fix
  Revert "Fastbootd: flashing certification"
  Fastbootd: flashing certification
  Fastbootd: improved operations on gpt
  Remove a homebrew mmap64.
  Fastbootd: fixed missing file in Android.mk
  fastbootd: erase, boot and partitioning commands
2013-12-04 23:11:55 +00:00
Elliott Hughes
9536b8c997 Fix fastbootd's <linux/kexec.h> reference.
Change-Id: I28ce0288a6377153a96d3a98d6913d1271e3112f
2013-12-04 15:00:52 -08:00
Szymon Starzycki
baf4c4bdef Fastbootd: Comments and general cleaning
Alignment fix for fastbootd gpt_mmap

Change-Id: I86482e1645672daae1c8e4a4455c6291c0805fb0
2013-12-04 15:00:52 -08:00
Szymon Starzycki
55b61f4c9b Fastbootd: General fixes and changes
read data once bug fix
ability to run fastbootd without network and named socket configuration in init.rc
vendortrigger name changed to fastbootd
deleted unused function from default implementation of OEM library

Change-Id: Ib957fae8172530f20d51bb51b5e07bccab07e555
2013-12-04 15:00:52 -08:00
Szymon Starzycki
4662a114a4 Revert "Revert "Fastbootd: flashing certification""
CMS functionality is now available

This reverts commit 068b71dd9c.

Conflicts:
	fastbootd/Android.mk
	fastbootd/fastbootd.c
	fastbootd/utils.c
	fastbootd/utils.h

Change-Id: I1a27459b41d9297603deb124c65f237ff971e5b6
2013-12-04 15:00:52 -08:00
Szymon Starzycki
27ea99fb99 Fastbootd: auto ssh server start
Change-Id: I3e9c53c3d834726c3747e9ee0665ed027f55b08c
2013-12-04 15:00:52 -08:00
Szymon Starzycki
bc849f1453 Fastbootd: network auto discovery
Change-Id: I91082f5832412e775244b3974c0ab00952905ad5
2013-12-04 15:00:52 -08:00
Szymon Starzycki
2a656c332b Fastbootd: socket and network transport
Change-Id: I395e5361d0484bd11421225c152f9aec00305f11
2013-12-04 15:00:52 -08:00
Szymon Starzycki
00f4e93730 Fastbootd: build breakage fix
Change-Id: I6a01ff6f785adc58581d0d9f44e71c94cbb4e3b5
2013-12-04 15:00:52 -08:00
Colin Cross
b80e4c725d Revert "Fastbootd: flashing certification"
This reverts commit 5ccecfd26d.

Change-Id: I0ca31094c115e14982a27c258d9139a723da8428
2013-12-04 15:00:52 -08:00
Szymon Starzycki
5621248d74 Fastbootd: flashing certification
Change-Id: I564086908942463eebee69449d484ba03effc50e
2013-12-04 15:00:51 -08:00
Szymon Starzycki
b88fa3292d Fastbootd: improved operations on gpt
Change-Id: Ieabdcb1c52094d7408b169681e073ebf6613af20
2013-12-04 15:00:51 -08:00
Elliott Hughes
ae2e69b9c0 Remove a homebrew mmap64.
This should have been fixed in bionic, and now has been.

Change-Id: Ib9b21771ed7fbb6b4082b52d0b590f2867f344d4
2013-12-04 15:00:51 -08:00
Szymon Starzycki
c50dfd178e Fastbootd: fixed missing file in Android.mk
Change-Id: I10927f488e35c688483f2d1d8c9f5b7ea1d7912d
2013-12-04 15:00:51 -08:00
Szymon Starzycki
b6c5f2880e fastbootd: erase, boot and partitioning commands
Change-Id: I49ba2ba2e002fd5b6bbd37cc3fd0caa106f42010
2013-12-04 15:00:51 -08:00
JP Abgrall
58c5303649 adb: Don't clobber block devices during push
In the past, an adb push would ALWAYS unlink the target path.
Now, we only links and regular files (and links).
This allows the following to work:

   adb shell ls -l /dev/block/mmcblk0p8
     # brw------- root     root     179,   8 2013-11-28 07:43 mmcblk0p8
   adb push n7.jpa.mda.post_jb_encryption.raw  /dev/block/mmcblk0p8

Bug: 11984121
Change-Id: I982c7a1cd87986621f2bebdcb41c4e281f67f772
2013-12-03 14:52:39 -08:00
Greg Hackmann
db7d933b98 am 0ddf436e: am b097ece8: Merge "libadf: add helper to set up a simple post"
* commit '0ddf436ef9450b7ecd4bce1206758f8d75267bfa':
  libadf: add helper to set up a simple post
2013-12-03 18:44:14 +00:00
Greg Hackmann
4e053f2df9 am b88d8e50: am 0e292002: Merge "libadf: filter overlay engines by a list of acceptable formats"
* commit 'b88d8e50645fc03f61e65cadac280c80fe14e50e':
  libadf: filter overlay engines by a list of acceptable formats
2013-12-03 18:44:14 +00:00
Greg Hackmann
b6a32b6188 am b11ab0f4: am 4635df34: Merge "add libadfhwc"
* commit 'b11ab0f497121c4f4ce9ea8648fe4f8e22faa124':
  add libadfhwc
2013-12-03 18:44:13 +00:00
Greg Hackmann
dfb61e9098 am 67afb1fa: am 4b95c2bb: Merge "add libadf"
* commit '67afb1fa399d3a64e639cb9051fa62caab56ffa8':
  add libadf
2013-12-03 18:44:12 +00:00
Greg Hackmann
0ddf436ef9 am b097ece8: Merge "libadf: add helper to set up a simple post"
* commit 'b097ece8271d13c7852d77c1784e237301e7e617':
  libadf: add helper to set up a simple post
2013-12-03 10:38:52 -08:00
Greg Hackmann
b88d8e5064 am 0e292002: Merge "libadf: filter overlay engines by a list of acceptable formats"
* commit '0e292002c2da581bc0ff2bbc3d057bfe2f573d44':
  libadf: filter overlay engines by a list of acceptable formats
2013-12-03 10:35:29 -08:00
Greg Hackmann
b11ab0f497 am 4635df34: Merge "add libadfhwc"
* commit '4635df3433780371ff59e9c9c4577a7ca8d53f7f':
  add libadfhwc
2013-12-03 10:35:28 -08:00
Greg Hackmann
67afb1fa39 am 4b95c2bb: Merge "add libadf"
* commit '4b95c2bbf096b6438673659547914ae61ac4f127':
  add libadf
2013-12-03 10:35:28 -08:00
Greg Hackmann
b097ece827 Merge "libadf: add helper to set up a simple post" 2013-12-03 18:31:00 +00:00
Greg Hackmann
0e292002c2 Merge "libadf: filter overlay engines by a list of acceptable formats" 2013-12-03 18:28:41 +00:00
Greg Hackmann
4635df3433 Merge "add libadfhwc" 2013-12-03 18:27:58 +00:00
Greg Hackmann
4b95c2bbf0 Merge "add libadf" 2013-12-03 18:27:36 +00:00
Nick Kralevich
f374fb84af am 5e362c87: am 71e096c8: Merge "Increase buffer size, use bounds checking functions"
* commit '5e362c871a7b79b12e91a8737606988163f84dcf':
  Increase buffer size, use bounds checking functions
2013-12-02 23:31:11 +00:00
Nick Kralevich
5e362c871a am 71e096c8: Merge "Increase buffer size, use bounds checking functions"
* commit '71e096c894b2b49b0ae63a852c0a8a5a6de0c8a7':
  Increase buffer size, use bounds checking functions
2013-11-27 16:05:24 -08:00
Nick Kralevich
71e096c894 Merge "Increase buffer size, use bounds checking functions" 2013-11-27 23:57:20 +00:00
Nick Kralevich
4ec2910fb6 Increase buffer size, use bounds checking functions
Increase the size of the user/group buffer from 16 bytes
to 32 bytes. Some OEMs are creating usernames longer than
15 bytes, causing problems.

Use bounds checking functions when handling user/group
data, to avoid overflowing buffers.

Change-Id: I4a5824b819b0c37662ba4f33573af0d0e071b444
2013-11-27 15:47:16 -08:00
Elliott Hughes
45c0aa4700 am 79fb7be4: am 1899628a: Merge "Switch ARM debuggerd over to <sys/user.h>."
* commit '79fb7be4f572297ea2c67d16f101e5e1d665f882':
  Switch ARM debuggerd over to <sys/user.h>.
2013-11-27 17:09:20 +00:00
Greg Hackmann
bf5e7ed84e am 5ebd8e43: am b2406973: Merge changes I727d9135,I3bd1b59d,I0d05aa28
* commit '5ebd8e43ba992d12fcdac4aedf7da51b50d6b949':
  rootdir: add ueventd.rc rule for adf subsystem
  init: add subsystem rules to ueventd.rc
  init: handle ueventd path truncation better
2013-11-27 17:09:20 +00:00
Greg Hackmann
dde75d940a am 675c9966: am 0914e01e: Merge "init: limit visibility of init_parser.c helpers"
* commit '675c996651e0513e9c7b657d356c55f9b05c7c9f':
  init: limit visibility of init_parser.c helpers
2013-11-27 17:09:20 +00:00
Elliott Hughes
7b1791e153 am 8bda6ce5: am 121400a4: Merge "Make init distinguish between orderly exit and being killed by signals."
* commit '8bda6ce55700e46760f8d59820406b72964fa171':
  Make init distinguish between orderly exit and being killed by signals.
2013-11-27 17:09:20 +00:00
Elliott Hughes
79fb7be4f5 am 1899628a: Merge "Switch ARM debuggerd over to <sys/user.h>."
* commit '1899628a2e1aad79eaf46b091ba60aa7d89add98':
  Switch ARM debuggerd over to <sys/user.h>.
2013-11-27 08:12:25 -08:00
Elliott Hughes
1899628a2e Merge "Switch ARM debuggerd over to <sys/user.h>." 2013-11-27 04:52:04 +00:00
Elliott Hughes
9e7d2180c7 Switch ARM debuggerd over to <sys/user.h>.
Change-Id: I106d4e80a2e819f1d47ca81893340f567bb8b4d9
2013-11-26 18:01:29 -08:00
Greg Hackmann
1832635319 libadf: add helper to set up a simple post
Change-Id: I381b47f924b02c208ea6f20cf887abdef1035830
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 15:40:02 -08:00
Greg Hackmann
47e0c8d849 libadf: filter overlay engines by a list of acceptable formats
Change-Id: Ibb294f0520a7a7a6a2a89e1e3eb3c335906d3e66
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 15:40:02 -08:00
Greg Hackmann
ebb26c71fe add libadfhwc
Helper library for implementing a hwcomposer HAL on top of libadf

Change-Id: I2af0617416fb4a6b3a1d182a22e809bfdc54a532
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 15:40:02 -08:00
Greg Hackmann
b85d12a307 add libadf
Helper library to enumerate ADF objects, wrap ADF ioctls, and read event
data

Change-Id: I7aa7f88935174e650a40b2f9db3212280121f760
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 15:39:50 -08:00
Greg Hackmann
5ebd8e43ba am b2406973: Merge changes I727d9135,I3bd1b59d,I0d05aa28
* commit 'b240697339b1ff1f45217a48dc9d3fa8a2f21a2b':
  rootdir: add ueventd.rc rule for adf subsystem
  init: add subsystem rules to ueventd.rc
  init: handle ueventd path truncation better
2013-11-26 14:01:04 -08:00
Greg Hackmann
b240697339 Merge changes I727d9135,I3bd1b59d,I0d05aa28
* changes:
  rootdir: add ueventd.rc rule for adf subsystem
  init: add subsystem rules to ueventd.rc
  init: handle ueventd path truncation better
2013-11-26 21:25:20 +00:00
Greg Hackmann
95b348c5d7 rootdir: add ueventd.rc rule for adf subsystem
Change-Id: I727d91355229692c11e0e309c0fcac051269eba3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 13:18:26 -08:00
Greg Hackmann
3312aa8379 init: add subsystem rules to ueventd.rc
By default ueventd creates device nodes under /dev based on the ueventd
DEVPATH.  Several subsystems have special rules which are hardcoded in
devices.c.  Moving forward these special rules should go in ueventd.rc.

Special rules have the syntax:

	subsystem <s>
		devname (uevent_devname|uevent_devpath)
		[dirname <dir>]

Devices matching SUBSYSTEM=<s> will be populated under <dir>.  dirname
is optional and defaults to /dev.  If dirname is provided, <dir> must
start with "/".

If devname is uevent_devname, ueventd will create the device node as
<dir>/DEVNAME.  DEVNAME may include intermediate subdirectories, which
ueventd will automatically create.

If devname is uevent_devpath, ueventd will use the legacy behavior of
computing DEVPATH_BASE=basepath(DEVPATH), and creating the device node
as <dir>/DEVPATH_BASE.

The new parsing code is based on init_parser.c, with small tweaks to
handle commands which don't fall under a section header.

Change-Id: I3bd1b59d7e62dfc9d289cf6ae889e237fb5bd7c5
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 13:18:23 -08:00
Greg Hackmann
f6e009ee26 init: handle ueventd path truncation better
Log an error before discarding problematic events, and add a missing
truncation check to the usb subsystem's unique codepath

Change-Id: I0d05aa287ffc63b46d1752d2a7409d35dc8caca7
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-11-26 13:17:35 -08:00