Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
c079c598
Commit
c079c598
authored
Apr 15, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update scripts, MagiskSU now works fine
parent
8a2f0063
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
63 deletions
+76
-63
build.cmd
build.cmd
+8
-4
build.sh
build.sh
+8
-4
flash_script.sh
scripts/flash_script.sh
+57
-52
init.magisk.rc
scripts/init.magisk.rc
+3
-3
No files found.
build.cmd
View file @
c079c598
...
@@ -53,10 +53,14 @@ EXIT /B %ERRORLEVEL%
...
@@ -53,10 +53,14 @@ EXIT /B %ERRORLEVEL%
ECHO ************************
ECHO ************************
ECHO * Copying binaries
ECHO * Copying binaries
ECHO ************************
ECHO ************************
CALL :mkcp libs\armeabi-v7a\* zip_static\arm
CALL :mkcp libs\armeabi-v7a\magisk zip_static\arm
CALL :mkcp libs\arm64-v8a\* zip_static\arm64
CALL :mkcp libs\armeabi-v7a\magiskboot zip_static\arm
CALL :mkcp libs\x86\* zip_static\x86
CALL :mkcp libs\arm64-v8a\magisk zip_static\arm64
CALL :mkcp libs\x86_64\* zip_static\x64
CALL :mkcp libs\arm64-v8a\magiskboot zip_static\arm64
CALL :mkcp libs\x86\magisk zip_static\x86
CALL :mkcp libs\x86\magiskboot zip_static\x86
CALL :mkcp libs\x86_64\magisk zip_static\x64
CALL :mkcp libs\x86_64\magiskboot zip_static\x64
CALL :mkcp libs\armeabi-v7a\magiskboot uninstaller\arm
CALL :mkcp libs\armeabi-v7a\magiskboot uninstaller\arm
CALL :mkcp libs\arm64-v8a\magiskboot uninstaller\arm64
CALL :mkcp libs\arm64-v8a\magiskboot uninstaller\arm64
CALL :mkcp libs\x86\magiskboot uninstaller\x86
CALL :mkcp libs\x86\magiskboot uninstaller\x86
...
...
build.sh
View file @
c079c598
...
@@ -55,13 +55,17 @@ build_bin() {
...
@@ -55,13 +55,17 @@ build_bin() {
echo
"************************"
echo
"************************"
echo
"* Copying binaries"
echo
"* Copying binaries"
echo
"************************"
echo
"************************"
mkcp
"libs/armeabi-v7a/*"
zip_static/arm
mkcp libs/armeabi-v7a/magisk zip_static/arm
mkcp libs/armeabi-v7a/magiskboot zip_static/arm
mkcp libs/arm64-v8a/magisk zip_static/arm64
mkcp libs/arm64-v8a/magiskboot zip_static/arm64
mkcp libs/x86/magisk zip_static/x86
mkcp libs/x86/magiskboot zip_static/x86
mkcp libs/x86_64/magisk zip_static/x64
mkcp libs/x86_64/magiskboot zip_static/x64
mkcp libs/armeabi-v7a/magiskboot uninstaller/arm
mkcp libs/armeabi-v7a/magiskboot uninstaller/arm
mkcp
"libs/arm64-v8a/*"
zip_static/arm64
mkcp libs/arm64-v8a/magiskboot uninstaller/arm64
mkcp libs/arm64-v8a/magiskboot uninstaller/arm64
mkcp
"libs/x86/*"
zip_static/x86
mkcp libs/x86/magiskboot uninstaller/x86
mkcp libs/x86/magiskboot uninstaller/x86
mkcp
"libs/x86_64/*"
zip_static/x64
mkcp libs/x86_64/magiskboot uninstaller/x64
mkcp libs/x86_64/magiskboot uninstaller/x64
}
}
...
...
scripts/flash_script.sh
View file @
c079c598
...
@@ -256,65 +256,69 @@ fi
...
@@ -256,65 +256,69 @@ fi
# Environment
# Environment
##########################################################################################
##########################################################################################
ui_print
"- Constructing environment"
# TODO: Environment
is_mounted /data
&&
MAGISKBIN
=
/data/magisk
||
MAGISKBIN
=
/cache/data_bin
# ui_print "- Constructing environment"
# Copy required files
# is_mounted /data && MAGISKBIN=/data/magisk || MAGISKBIN=/cache/data_bin
rm
-rf
$MAGISKBIN
2>/dev/null
mkdir
-p
$MAGISKBIN
cp
-af
$BINDIR
/busybox
$BINDIR
/magiskboot
$BINDIR
/magiskpolicy
$COMMONDIR
/magisk.apk
\
$COMMONDIR
/init.magisk.rc
$COMMONDIR
/custom_ramdisk_patch.sh
$COMMONDIR
/magic_mask.sh
$MAGISKBIN
# Legacy support
ln
-sf
/data/magisk/magiskpolicy
$MAGISKBIN
/sepolicy-inject
chmod
-R
755
$MAGISKBIN
# # Copy required files
chcon
-h
u:object_r:system_file:s0
$MAGISKBIN
$MAGISKBIN
/
*
# rm -rf $MAGISKBIN 2>/dev/null
# mkdir -p $MAGISKBIN
# cp -af $BINDIR/busybox $BINDIR/magiskboot $BINDIR/magiskpolicy $COMMONDIR/magisk.apk \
# $COMMONDIR/init.magisk.rc $COMMONDIR/custom_ramdisk_patch.sh $COMMONDIR/magic_mask.sh $MAGISKBIN
# # Legacy support
# ln -sf /data/magisk/magiskpolicy $MAGISKBIN/sepolicy-inject
# Temporary busybox for installation
# chmod -R 755 $MAGISKBIN
rm
-rf
$TMPDIR
/busybox 2>/dev/null
# chcon -h u:object_r:system_file:s0 $MAGISKBIN $MAGISKBIN/*
mkdir
-p
$TMPDIR
/busybox
$BINDIR
/busybox
--install
-s
$TMPDIR
/busybox
# # Temporary busybox for installation
rm
-f
$TMPDIR
/busybox/su
$TMPDIR
/busybox/sh
$TMPDIR
/busybox/reboot
# rm -rf $TMPDIR/busybox 2>/dev/null
PATH
=
$TMPDIR
/busybox:
$PATH
# mkdir -p $TMPDIR/busybox
# $BINDIR/busybox --install -s $TMPDIR/busybox
# rm -f $TMPDIR/busybox/su $TMPDIR/busybox/sh $TMPDIR/busybox/reboot
# PATH=$TMPDIR/busybox:$PATH
##########################################################################################
##########################################################################################
# Magisk Image
# Magisk Image
##########################################################################################
##########################################################################################
# Fix SuperSU.....
# TODO: Magisk Image
$BOOTMODE
&&
$BINDIR
/magiskpolicy
--live
"allow fsck * * *"
# # Fix SuperSU.....
if
(
is_mounted /data
)
;
then
# $BOOTMODE && $BINDIR/magiskpolicy --live "allow fsck * * *"
IMG
=
/data/magisk.img
else
# if (is_mounted /data); then
IMG
=
/cache/magisk.img
# IMG=/data/magisk.img
ui_print
"- Data unavailable, use cache workaround"
# else
fi
# IMG=/cache/magisk.img
# ui_print "- Data unavailable, use cache workaround"
if
[
-f
$IMG
]
;
then
# fi
ui_print
"-
$IMG
detected!"
else
# if [ -f $IMG ]; then
ui_print
"- Creating
$IMG
"
# ui_print "- $IMG detected!"
make_ext4fs
-l
64M
-a
/magisk
-S
$COMMONDIR
/file_contexts_image
$IMG
# else
fi
# ui_print "- Creating $IMG"
# make_ext4fs -l 64M -a /magisk -S $COMMONDIR/file_contexts_image $IMG
mount_image
$IMG
/magisk
# fi
if
(!
is_mounted /magisk
)
;
then
ui_print
"! Magisk image mount failed..."
# mount_image $IMG /magisk
exit
1
# if (! is_mounted /magisk); then
fi
# ui_print "! Magisk image mount failed..."
MAGISKLOOP
=
$LOOPDEVICE
# exit 1
# fi
# Core folders and scripts
# MAGISKLOOP=$LOOPDEVICE
mkdir
-p
$COREDIR
/bin
$COREDIR
/props
$COREDIR
/magiskhide
$COREDIR
/post-fs-data.d
$COREDIR
/service.d 2>/dev/null
cp
-af
$COMMONDIR
/magiskhide/.
$COREDIR
/magiskhide
# # Core folders and scripts
cp
-af
$BINDIR
/resetprop
$BINDIR
/magiskhide
$BINDIR
/su
$BINDIR
/magiskpolicy
$COREDIR
/bin
# mkdir -p $COREDIR/bin $COREDIR/props $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d 2>/dev/null
# Legacy support
# cp -af $COMMONDIR/magiskhide/. $COREDIR/magiskhide
ln
-sf
$COREDIR
/bin/resetprop
$MAGISKBIN
/resetprop
# cp -af $BINDIR/resetprop $BINDIR/magiskhide $BINDIR/su $BINDIR/magiskpolicy $COREDIR/bin
# # Legacy support
chmod
-R
755
$COREDIR
/bin
$COREDIR
/magiskhide
$COREDIR
/post-fs-data.d
$COREDIR
/service.d
# ln -sf $COREDIR/bin/resetprop $MAGISKBIN/resetprop
chown
-R
0.0
$COREDIR
/bin
$COREDIR
/magiskhide
$COREDIR
/post-fs-data.d
$COREDIR
/service.d
# chmod -R 755 $COREDIR/bin $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d
# chown -R 0.0 $COREDIR/bin $COREDIR/magiskhide $COREDIR/post-fs-data.d $COREDIR/service.d
##########################################################################################
##########################################################################################
# Unpack boot
# Unpack boot
...
@@ -445,7 +449,7 @@ else
...
@@ -445,7 +449,7 @@ else
# sepolicy patches
# sepolicy patches
cpio_extract sepolicy sepolicy
cpio_extract sepolicy sepolicy
LD_LIBRARY_PATH
=
$SYSTEMLIB
$BINDIR
/magiskpolicy
--load
sepolicy
--save
sepolicy
--minimal
LD_LIBRARY_PATH
=
$SYSTEMLIB
$BINDIR
/magisk
magisk
policy
--load
sepolicy
--save
sepolicy
--minimal
cpio_add 644 sepolicy sepolicy
cpio_add 644 sepolicy sepolicy
# Add new items
# Add new items
...
@@ -454,7 +458,8 @@ else
...
@@ -454,7 +458,8 @@ else
[
!
-z
$SHA1
]
&&
echo
"# STOCKSHA1=
$SHA1
"
>>
$COMMONDIR
/init.magisk.rc
[
!
-z
$SHA1
]
&&
echo
"# STOCKSHA1=
$SHA1
"
>>
$COMMONDIR
/init.magisk.rc
cpio_add 750 init.magisk.rc
$COMMONDIR
/init.magisk.rc
cpio_add 750 init.magisk.rc
$COMMONDIR
/init.magisk.rc
cpio_add 750 sbin/magic_mask.sh
$COMMONDIR
/magic_mask.sh
# cpio_add 750 sbin/magic_mask.sh $COMMONDIR/magic_mask.sh
cpio_add 755 sbin/magisk
$BINDIR
/magisk
# Create ramdisk backups
# Create ramdisk backups
LD_LIBRARY_PATH
=
$SYSTEMLIB
$BINDIR
/magiskboot
--cpio-backup
ramdisk.cpio ramdisk.cpio.orig
LD_LIBRARY_PATH
=
$SYSTEMLIB
$BINDIR
/magiskboot
--cpio-backup
ramdisk.cpio ramdisk.cpio.orig
...
...
scripts/init.magisk.rc
View file @
c079c598
...
@@ -16,19 +16,19 @@ on property:magisk.restart_pfsd=1
...
@@ -16,19 +16,19 @@ on property:magisk.restart_pfsd=1
# Services
# Services
# launch post-fs script
# launch post-fs script
service magisk_pfs /sbin/magi
c_mask.sh
post-fs
service magisk_pfs /sbin/magi
sk --
post-fs
user root
user root
seclabel u:r:su:s0
seclabel u:r:su:s0
oneshot
oneshot
# launch post-fs-data script
# launch post-fs-data script
service magisk_pfsd /sbin/magi
c_mask.sh
post-fs-data
service magisk_pfsd /sbin/magi
sk --
post-fs-data
user root
user root
seclabel u:r:su:s0
seclabel u:r:su:s0
oneshot
oneshot
# launch late_start script
# launch late_start script
service magisk_service /sbin/magi
c_mask.sh
service
service magisk_service /sbin/magi
sk --
service
class late_start
class late_start
user root
user root
seclabel u:r:su:s0
seclabel u:r:su:s0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment