Commit Graph
349 Commits
Author SHA1 Message Date
osm0sis d4f81e628e AK2: add reset_ak(), fix patch_cmdline(), improve AVBv1 signing
- introduce reset_ak function to reset the /tmp/anykernel directory to allow for multi-partition mods; use after changing the AK2 shell (block, etc.) variables again
- make patch_cmdline more intuitive; match the string, and if it doesn't exist add the replacement string, and if so replace with it
- allow AVBv1 signing of recovery by adding simple partition type detection based on name
- restore LD_LIBRARY_PATH after AVBv1 signing to be friendly to recovery when flashed in between other zips
2018-01-15 02:41:23 -04:00
osm0sis 79f1c391ea AK2: allow U-Boot uImage without ramdisk 2018-01-13 17:47:37 -04:00
osm0sis c3ca17f3cf README: update for elftool 2018-01-13 17:47:27 -04:00
osm0sis fb44ff18e1 AK2: add support for repacking as Sony ELF
- add built-in support for elftool for older Sony devices which don't support AOSP boot.img repacks (see: #3, https://forum.xda-developers.com/xperia-j-e/development/arm-elftool-pack-unpack-boot-image-sony-t2146022)
2018-01-13 17:15:51 -04:00
Chris Renshaw 4e31cbd461 Merge pull request #14 from nathanchance/module-contexts
Backend: Only apply contexts to new modules
2018-01-08 12:36:12 -04:00
Nathan Chancellor b0b754c094 Backend: Only apply contexts to new modules
After working on the OnePlus 5/T with custom ROMs on Android 8.1.0, I
have noticed that several of them have modules in /system/lib/modules
with a context of "u:object_r:vendor_file:s0", which goes against the
assumption made in commit 6b11373 ("update-binary: Change how we handle
modules"). Because the context is changed, there is an SELinux denial
when trying to load the module during init.

While it would be nice for ROMs to fix that on their own, I suspect
they are not entirely at fault. Google's documentation does state that
all modules should be loaded from vendor whenever possible so I would
guess Google decided to force *.ko objects to have a vendor_file
context. This is all speculation as I haven't cared to do research into
the subject.

Easiest way around this is to just worry about applying contexts to new
modules. cp does not override contexts so if the module was already
present, we can assume it has the correct context to begin with.

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
2018-01-08 07:27:12 -07:00
Chris Renshaw d0648af3a5 Merge pull request #13 from nathanchance/moar-modules
Backend: Allow multiple module directories
2018-01-02 09:05:36 -05:00
Nathan Chancellor a0b6db2784 example: Update modules folder for new location handling
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
2018-01-02 06:45:40 -07:00
Nathan Chancellor 218b5774d2 README: Update documentation for modules
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
2018-01-02 06:43:59 -07:00
Nathan Chancellor 6b11373d4a update-binary: Change how we handle modules
As of Oreo, Google is requiring that kernel modules be used whenever
possible and that their location be in /vendor. With Lineage 15.1,
devices without a separate /vendor partition will use /system/vendor,
which symlinked to /vendor.

To make this more flexible and future proof, allow developers to specify
where each module needs to go by setting the path in the modules folder.
If a module needs to go to /system/vendor/lib/modules, then the module
should be placed in modules/system/vendor/lib/modules. Contexts and
permissions will still be updated automatically.

Android documentation: https://source.android.com/devices/architecture/kernel/modular-kernels

Lineage 15.1 commit: https://github.com/LineageOS/android_vendor_lineage/commit/bf38db2a5e358a5449458b3dee2dd9d4015b8147

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
2018-01-02 06:38:00 -07:00
osm0sis 81066ed3d7 README: document "OG AK" mode 2017-12-14 13:19:08 -04:00
osm0sis 7f47e21362 AK2: add "OG AK" mode by making the unpack/repack procedure more granular
- split dump_boot into split_boot + unpack_ramdisk and write_boot into repack_ramdisk + flash_boot
- fully backwards compatible as dump_boot and write_boot still exist and call these new functions (i.e. no changes needed to anykernel.sh)
- those that wish to do zImage-only AK2 packages can now use split_boot intead of dump_boot and and flash_boot instead of repack_ramdisk in their anykernel.sh
- add failsafe check for failed boot-new.img creation to ensure abort before wiping target partition in edge cases
2017-12-14 13:03:23 -04:00
osm0sis 13f2018ee3 tools: update to latest builds
Compiled from my own updated forks:
https://github.com/osm0sis/mkbootimg

ARM binaries; see AIK-mobile v3.0 for other architectures and optional binaries:
https://forum.xda-developers.com/showthread.php?t=2073775
2017-12-14 11:45:44 -04:00
osm0sis 79df8fcf0b AK2+Backend: misc fixes
- hide some expected stderr for AK2 mods with no additional ramdisk files
- fix U-Boot support by passing correct repacked ramdisk filename
- fix multi-compression support during repack derp
- fix cleanup on successful flash not working due to double match from cleanuponabort
2017-12-03 08:50:51 -04:00
osm0sis df1999911b README: update for dtbo support 2017-11-29 13:50:02 -04:00
osm0sis 3269b51d28 AK2: add dtbo and Pixel 2 slot prop support
- dtbo may be added as dtbo or dtbo.img to the base of the zip
- new Pixel 2 ro.boot.slot doesn't contain _ like Pixel ro.boot.slot_suffix does

Thanks @nathanchance for the majority of the work and research on this one, via #12
2017-11-29 13:34:51 -04:00
osm0sis 5da00cb54d Example: remove AK2 attribute command confusing to new adopters
DO NOT MERGE if you have already updated your ramdisk properly for your device
2017-11-26 18:19:10 -04:00
osm0sis c578db07ff anykernel: underp ownership, thanks @attack11 2017-11-26 18:14:11 -04:00
osm0sis 45766e2afc AK2: tidy up compression support a little more 2017-11-22 19:31:34 -04:00
osm0sis 34631228b0 README: update documentation for ramdisk_compression variable 2017-11-22 13:45:39 -04:00
osm0sis 02b9dd7d21 anykernel: add ramdisk_compression shell variable, see 0535fd7ca0 2017-11-22 13:32:06 -04:00
osm0sis 0535fd7ca0 AK2: allow forcing repack ramdisk compression format of choice
- ramdisk_compression=auto; (or undefined) in anykernel.sh is the default, automatically repacking with the detected unpack format
- changing auto to gz lzo lzma xz bz2 lz4-l (for lz4 legacy) or lz4 force the repack as that format
2017-11-22 13:28:47 -04:00
osm0sis e6b8326197 README: update documentation for multiple compression support 2017-11-22 09:59:18 -04:00
osm0sis 1ffbf0d1af AK2+tools: add support for alternate ramdisk compression formats
- to this point only gzip was supported, so add support for bzip2, lzop, lzma, xz and lz4 by detecting file magic via plaintext od dump comparison
- busybox contains all necessary formats except for lzma/xz compression (has decompression), and lz4 so add both of these binaries to the minimal default setup

ARM binaries; see AIK-mobile v2.9 for other architectures and optional binaries:
https://forum.xda-developers.com/showthread.php?t=2073775
2017-11-22 09:58:20 -04:00
Nathan Chancellor 8decdd4624 AK2: Allow users to use either "" or " " for empty strings
Either one is now valid:
patch_fstab fstab.qcom /system ext4 options "discard" " "
patch_fstab fstab.qcom /system ext4 options "discard" ""

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
2017-10-15 22:27:34 -03:00
Nathan Chancellor d907653c78 AK2: Sanitize patch_fstab for proper commas
Users may forget to place the commas for removal or they may want to
remove something in the middle. This will remove all commas at the
beginning and end and will make sure there are only single commas
between entries.

Examples:

Options: ro,barrier=1,discard,errors=panic

patch_fstab fstab.qcom /system ext4 options "discard,errors=panic" ""
patch_fstab fstab.qcom /system ext4 options ",errors=panic" ""
patch_fstab fstab.qcom /system ext4 options "errors=panic" ""
patch_fstab fstab.qcom /system ext4 options "discard" ""

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
2017-10-15 22:27:34 -03:00
Nathan Chancellor cf764ee768 AK2: Improve patch_fstab
After aa1377c, trying to remove part of the original string was not
possible.

Example:
patch_fstab fstab.qcom /system ext4 flags “wait,verify” “wait”

Because "wait" is within "wait,verify", the entire if block will miss
since grep will succeed in finding it. To work around this, we'll
allow users to leave the last part blank and put in the part they
want to remove as the fifth parameter.

Example:
patch_fstab fstab.qcom /system ext4 flags “,verify” “”

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
2017-10-15 22:27:34 -03:00
osm0sis 6bcf2668e4 AK2: improve cpio ramdisk unpacking
- add workaround for malformed ramdisks without leading directory cpio entries
- explicitly set ramdisk root directory to 755 (AOSP default) to avoid issues in some environments
2017-10-14 13:42:51 -03:00
osm0sis e7faefc0b9 anykernel: be clear ownership is also necessary to be set 2017-10-14 13:36:23 -03:00
osm0sis 721c5db7c2 Example: clean ups and fixes for current functions
- remove more things confusing to new adopters (AK2 does not root)
- update patch_fstab examples for corrected syntax

DO NOT MERGE if you have already updated your ramdisk properly for your device
2017-10-14 13:34:00 -03:00
osm0sis aa1377c9ab AK2: fix patch_fstab substring replacement
- the 'original string' ($5) was not being used, instead the entire part was always being replaced with the 'replacement string' ($6)
- replace the target 'original string' of the entry part with 'replacement string' as expected/intended

NOTE: any properly written patch_fstab commands with original string as the complete original part WILL remain working as this is a backwards compatible change
2017-09-22 01:35:51 -03:00
osm0sis 65019b0f49 Backend: fix -debugging functionality on abort, clean up abort 2017-09-22 00:18:31 -03:00
osm0sis 4863f79152 AK2: fix abort ui_prints from slot detection checks 2017-09-22 00:16:10 -03:00
osm0sis 8db96bb746 README: add rkcrc to optional binaries 2017-09-11 12:13:37 -03:00
osm0sis 66b221ef99 AK2: add KRNL and NOOK signed image support
- add built-in support for rkcrc for Rockchip board devices signed ramdisk image (see: https://github.com/rockchip-linux/rkflashtool)
- add built-in detection and support for Barnes & Noble Nook 'Green Loader/Green Recovery' signature
2017-09-11 12:10:14 -03:00
osm0sis c867216f91 tools: update to latest builds, including busybox (1.27.2)
Compiled from my own updated forks:
https://github.com/osm0sis/mkbootimg
https://github.com/osm0sis/android-busybox-ndk

ARM binaries; see AIK-mobile v2.9 for other architectures and optional binaries:
https://forum.xda-developers.com/showthread.php?t=2073775
2017-09-10 23:26:12 -03:00
osm0sis d5c58cdadb README: optional binaries update 2017-09-10 23:14:17 -03:00
osm0sis d60281c8b2 AK2: add DHTB signed image support
- add built-in support for dhtbsign for Samsung/Spreadtrum board devices signature header (see: https://github.com/osm0sis/dhtbsign)
2017-09-10 23:05:47 -03:00
osm0sis 1787580bf9 AK2: rename pxa1088- AOSP variant tools to pxa- per upcoming AIK release 2017-09-10 22:55:53 -03:00
osm0sis ce29998bf9 AK2: silence possible expected mount stderr with AVB signing 2017-08-20 01:00:53 -03:00
osm0sis e6d3b4271e Backend: miscellaneous fixes
- fix busybox getting permissions on some devices where chmod does not accept -R to recurse
- use busybox for more possibly non-standard broken recovery shell commands
- silence some more generally expected/inconsequential stderr
2017-08-20 01:00:45 -03:00
Chris Renshaw db7cb4f306 Backend: fix module copying on devices with links
- symlinks under /system/lib/modules were getting broken, so follow them instead to replace the target file, avoiding issues with multiple versions of the same module and running out of free space (e.g. OnePlus devices link /system/lib/modules/wlan.ko to /system/lib/modules/qca_cld3/qca_cld3_wlan.ko)
- set contexts on copied modules (following symlinks) to system_file to avoid SELinux issues where unlabeled module files might not be allowed to load
2017-08-14 02:46:18 -03:00
osm0sis 79c2ab4f60 AK2: fix AVB signing 2017-07-14 13:16:12 -03:00
osm0sis b91ec4deda AK2: better fix for unknown hash type
- https://github.com/osm0sis/AnyKernel2/commit/45bfc5d602582c53433bd2398bdc5876a7e260c9 broke the error catching on unpackbootimg
- more easily worked around during repack, see linked commit for rationale for the assumption
2017-07-04 15:47:31 -03:00
osm0sis adc21ed2c3 AK2: allow next blank line (" ") for replace_section and remove_section
- sometimes it's difficult to anchor to specific end lines due to variations across ROMs, so allow the end line to be blank " "
- note this will also remove the trailing blank line so for replacements a trailing \n should be added to maintain spacing; this should be pretty intuitive since you are including the blank line as the end line search
2017-07-04 14:24:12 -03:00
osm0sis 45bfc5d602 AK2: assume sha1 if "unknown" hash type encountered
- some Samsung device images can be unpacked and repacked with the standard tools but the id sha1 is offset differently than in the standard header resulting in broken hash type detection
2017-06-26 21:00:23 -03:00
osm0sis 05cb01112d AK2: accept .pem certificates for AVB signing
- turns out BootSignature.jar accepts .pem as well as .der
- AOSP uses "verity" keys by default for boot signatures: https://github.com/android/platform_build/tree/master/target/product/security
2017-06-16 17:00:46 -03:00
osm0sis ec285b291a README: add BootSignature_Android.jar to optional binary list 2017-06-06 13:28:03 -03:00
osm0sis 697e286654 AK2: add Android Verified Boot (AVB) signature support
- add built-in support for BootSignature_Android.jar for AVB signature enforcing devices (see https://forum.xda-developers.com/android/software-hacking/signing-boot-images-android-verified-t3600606)
2017-06-06 13:24:47 -03:00
osm0sis 89ba5089d2 tools: update to latest unpackbootimg build
Compiled from my own updated fork:
https://github.com/osm0sis/mkbootimg

ARM binary; see AIK-mobile v2.8 for other architectures and optional binaries:
https://forum.xda-developers.com/showthread.php?t=2073775
2017-06-05 16:27:16 -03:00