Skip to content

Commit

Permalink
v3.4 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gokhanmoral committed Jul 18, 2012
1 parent a8038da commit 2fbcd9e
Show file tree
Hide file tree
Showing 5 changed files with 206 additions and 141 deletions.
139 changes: 24 additions & 115 deletions res/misc/b2g.patch
@@ -1,5 +1,5 @@
diff -ruN init.samsung/init.rc init.b2g/init.rc
--- init.samsung/init.rc 2012-05-21 15:21:24.821842888 +0300
--- init.samsung/init.rc 2012-07-08 15:44:20.781792634 +0300
+++ init.b2g/init.rc 2012-05-21 15:33:50.000000000 +0300
@@ -15,7 +15,9 @@

Expand Down Expand Up @@ -186,119 +186,28 @@ diff -ruN init.samsung/init.rc.2 init.b2g/init.rc.2

# 2011-12-08/systemsw/kyo/ bugreport is triggered by holding down volume down, volume up and power
service bugreport /system/bin/bugmailer.sh -v
diff -ruN init.samsung/lpm.rc init.b2g/lpm.rc
--- init.samsung/lpm.rc 2012-05-21 15:21:24.821842888 +0300
+++ init.b2g/lpm.rc 2012-06-12 22:54:09.000000000 +0300
@@ -6,82 +6,59 @@
export LD_LIBRARY_PATH /vendor/lib:/system/lib
export ANDROID_ROOT /system
export ANDROID_DATA /data
+ export ANDROID_CACHE /cache
+ export SECONDARY_STORAGE /mnt/emmc
export EXTERNAL_STORAGE /mnt/sdcard
- export PHONE_STORAGE /mnt/emmc

symlink /system/etc /etc
mkdir /mnt 0775 root system
- mkdir /mnt/sdcard 0000 system system
- mkdir /mnt/emmc 0000 system system
- symlink /mnt/sdcard /sdcard
- symlink /mnt/emmc /emmc

- mkdir /preload
mkdir /system
- mkdir /data
- mkdir /cache
- mkdir /efs
mkdir /tmp
- mkdir /dbdata
mkdir /mnt 0775 root root
- mkdir /mnt/.lfs 0775 root root
- #mount /tmp /tmp tmpfs

-on fs
- mount ext4 /dev/block/mmcblk0p9 /system wait ro
- mount ext4 /dev/block/mmcblk0p10 /data nosuid nodev noatime wait
-
- mkdir /data/log 0777
- mkdir /data/anr 0777
- mount ext4 /dev/block/mmcblk0p10 /data remount ro
-
- chmod 0666 /dev/log/radio
- chmod 0666 /dev/log/main
- chmod 0666 /dev/log/event
-
-on post-fs-data
-# insmod kernel modules
- insmod /lib/modules/j4fs.ko
- mount j4fs /dev/block/mmcblk0p4 /mnt/.lfs ro

on boot
# CPU Frequency Governor
- write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor powersave
+ write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor powersave

- ifup lo
- hostname localhost
- domainname localdomain
+ ifup lo
+ hostname localhost
+ domainname localdomain

- class_start default
-
-service debuggerd /system/bin/debuggerd
+ class_start default

service ueventd /sbin/ueventd
+ class core
critical

service console /system/bin/sh
+ class core
console

-service playlpm /system/bin/playlpm
- user root
-
-service immvibed /system/bin/immvibed
- oneshot
-
-service lpmkey /system/bin/lpmkey
- user root
-
-# adbd is controlled by the persist.service.adb.enable system property
service adbd /sbin/adbd
-# disabled
+ disabled

-# adbd on at boot in emulator
-on property:ro.kernel.qemu=1
- start adbd
+service charger /charger
+ class default
+ user root

-on property:persist.service.adb.enable=1
+# Always start adbd on userdebug and eng builds
+# In recovery, always run adbd as root.
+on property:ro.debuggable=1
+ write /sys/class/android_usb/android0/enable 0
+ write /sys/class/android_usb/android0/idVendor 04e8
diff -ruN init.samsung/recovery.rc init.b2g/recovery.rc
--- init.samsung/recovery.rc 2012-07-08 15:46:18.000000000 +0300
+++ init.b2g/recovery.rc 2012-05-21 15:21:24.821842888 +0300
@@ -42,8 +42,8 @@

service recovery /sbin/recovery-loader

-service adbd /sbin/adbd recovery
- disabled
+service adbd /sbin/adbd
+ enabled

# Always start adbd on userdebug and eng builds
on property:ro.debuggable=1
@@ -52,8 +52,8 @@
on property:adb.recovery=1
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
- write /sys/class/android_usb/android0/idProduct 685e
- write /sys/class/android_usb/android0/functions mass_storage,adb
+ write /sys/class/android_usb/android0/idProduct 6860
+ write /sys/class/android_usb/android0/functions adb
+ write /sys/class/android_usb/android0/enable 1
+ write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
+ write /sys/class/android_usb/android0/iProduct $ro.product.model
+ write /sys/class/android_usb/android0/iSerial $ro.serialno
start adbd
+ setprop service.adb.root 1

-on property:persist.service.adb.enable=0
-# stop adbd
-
+# Restart adbd so it can run as root
+on property:service.adb.root=1
+ write /sys/class/android_usb/android0/enable 0
+ restart adbd
+ write /sys/class/android_usb/android0/enable 1
write /sys/class/android_usb/android0/enable 1
write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
write /sys/class/android_usb/android0/iProduct $ro.product.model
62 changes: 38 additions & 24 deletions res/misc/cm9.patch
Expand Up @@ -9,8 +9,8 @@ diff -ruN init.samsung/default.prop init.cm9/default.prop
+persist.sys.vold.switchexternal=1
+persist.sys.usb.config=mass_storage,adb
diff -ruN init.samsung/init.rc init.cm9/init.rc
--- init.samsung/init.rc 2012-05-21 15:21:24.821842888 +0300
+++ init.cm9/init.rc 2012-05-21 15:22:46.301844389 +0300
--- init.samsung/init.rc 2012-07-08 15:44:20.781792634 +0300
+++ init.cm9/init.rc 2012-07-18 23:50:21.000000000 +0300
@@ -1,13 +1,13 @@
on early-init
+ # Set init and its forked children's oom_adj.
Expand Down Expand Up @@ -188,7 +188,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
# create basic filesystem structure
mkdir /data/misc 01771 system misc
mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth
@@ -211,74 +156,36 @@
@@ -211,74 +156,37 @@
mkdir /data/misc/keychain 0771 system system
mkdir /data/misc/vpn 0770 system vpn
mkdir /data/misc/systemkeys 0700 system system
Expand All @@ -205,6 +205,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
mkdir /data/app-private 0771 system system
mkdir /data/app 0771 system system
mkdir /data/property 0700 root root
+ mkdir /data/radio 0770 radio radio

- # create dalvik-cache and double-check the perms
+ # create dalvik-cache and double-check the perms, so as to enforce our permissions
Expand Down Expand Up @@ -278,7 +279,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc

# If there is no fs-post-data action in the init.<device>.rc file, you
# must uncomment this line, otherwise encrypted filesystems
@@ -286,46 +193,13 @@
@@ -286,46 +194,13 @@
# Set indication (checked by vold) that we have finished this action
#setprop vold.post_fs_data_done 1

Expand Down Expand Up @@ -327,7 +328,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc

on boot
# basic network init
@@ -336,95 +210,20 @@
@@ -336,95 +211,20 @@
# set RLIMIT_NICE to allow priorities from 19 to -20
setrlimit 13 40 40

Expand Down Expand Up @@ -430,7 +431,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
# Permissions for System Server and daemons.
chown radio system /sys/android_power/state
chown radio system /sys/android_power/request_state
@@ -437,11 +236,9 @@
@@ -437,11 +237,9 @@
chmod 0660 /sys/power/state
chmod 0660 /sys/power/wake_lock
chmod 0660 /sys/power/wake_unlock
Expand All @@ -442,7 +443,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
chown system system /sys/class/leds/button-backlight/brightness
chown system system /sys/class/leds/jogball-backlight/brightness
chown system system /sys/class/leds/red/brightness
@@ -464,96 +261,15 @@
@@ -464,96 +262,15 @@
chown system system /sys/kernel/ipv4/tcp_rmem_min
chown system system /sys/kernel/ipv4/tcp_rmem_def
chown system system /sys/kernel/ipv4/tcp_rmem_max
Expand Down Expand Up @@ -546,7 +547,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc

# Define TCP buffer sizes for various networks
# ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax,
@@ -565,39 +281,31 @@
@@ -565,39 +282,31 @@
setprop net.tcp.buffersize.edge 4093,26280,35040,4096,16384,35040
setprop net.tcp.buffersize.gprs 4092,8760,11680,4096,8760,11680

Expand Down Expand Up @@ -601,7 +602,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
on property:vold.decrypt=trigger_reset_main
class_reset main

@@ -618,14 +326,6 @@
@@ -618,14 +327,6 @@
class_reset late_start
class_reset main

Expand All @@ -616,7 +617,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
# Used to disable USB when switching states
on property:sys.usb.config=none
stop adbd
@@ -664,6 +364,8 @@
@@ -664,6 +365,8 @@
start adbd
setprop sys.usb.state $sys.usb.config

Expand All @@ -625,15 +626,15 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
on property:persist.sys.usb.config=*
setprop sys.usb.config $persist.sys.usb.config

@@ -677,6 +379,7 @@
@@ -677,6 +380,7 @@
class core
console
disabled
+ user shell
group log

on property:ro.debuggable=1
@@ -710,12 +413,13 @@
@@ -710,12 +414,13 @@
critical
onrestart restart zygote
onrestart restart media
Expand All @@ -648,7 +649,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc

service netd /system/bin/netd
class main
@@ -730,17 +434,7 @@
@@ -730,17 +435,7 @@
socket rild stream 660 root radio
socket rild-debug stream 660 radio system
user root
Expand All @@ -667,7 +668,16 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc

service surfaceflinger /system/bin/surfaceflinger
class main
@@ -759,37 +453,28 @@
@@ -750,7 +445,7 @@

service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server
class main
- socket zygote stream 666
+ socket zygote stream 660 root system
onrestart write /sys/android_power/request_state wake
onrestart write /sys/power/state on
onrestart restart media
@@ -759,37 +454,28 @@
service drm /system/bin/drmserver
class main
user drm
Expand Down Expand Up @@ -709,7 +719,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
class main
socket bluetooth stream 660 bluetooth bluetooth
socket dbus_bluetooth stream 660 bluetooth bluetooth
@@ -798,41 +483,15 @@
@@ -798,41 +484,15 @@
group bluetooth net_bt_admin misc
disabled

Expand Down Expand Up @@ -753,7 +763,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
disabled
oneshot

@@ -840,7 +499,7 @@
@@ -840,7 +500,7 @@
class main
socket mtpd stream 600 system system
user vpn
Expand All @@ -762,7 +772,7 @@ diff -ruN init.samsung/init.rc init.cm9/init.rc
disabled
oneshot

@@ -856,58 +515,13 @@
@@ -856,58 +516,13 @@
disabled
oneshot

Expand Down Expand Up @@ -1751,7 +1761,7 @@ diff -ruN init.samsung/init.rc.2 init.cm9/init.rc.2
- oneshot
diff -ruN init.samsung/init.smdk4210.rc init.cm9/init.smdk4210.rc
--- init.samsung/init.smdk4210.rc 2012-05-21 15:21:24.821842888 +0300
+++ init.cm9/init.smdk4210.rc 2012-05-21 15:22:46.301844389 +0300
+++ init.cm9/init.smdk4210.rc 2012-07-18 23:51:35.000000000 +0300
@@ -1,12 +1,78 @@
import init.smdk4210.usb.rc

Expand Down Expand Up @@ -1832,7 +1842,7 @@ diff -ruN init.samsung/init.smdk4210.rc init.cm9/init.smdk4210.rc
# give system access to wpa_supplicant.conf for backup and restore
mkdir /data/misc/wifi 0770 wifi wifi
chmod 0770 /data/misc/wifi
@@ -15,17 +81,216 @@
@@ -15,17 +81,218 @@
mkdir /data/misc/dhcp 0770 dhcp dhcp
chown dhcp dhcp /data/misc/dhcp

Expand Down Expand Up @@ -1995,6 +2005,8 @@ diff -ruN init.samsung/init.smdk4210.rc init.cm9/init.smdk4210.rc
+# Vibetonz
+ chmod 0660 /dev/tspdrv
+ chown root shell /dev/tspdrv
+ chmod 0660 /sys/vibrator/pwm_val
+ chown system system /sys/vibrator/pwm_val
+
+# Permissions for LCD
+ chown system radio /sys/class/lcd/panel/lcd_power
Expand Down Expand Up @@ -2054,7 +2066,7 @@ diff -ruN init.samsung/init.smdk4210.rc init.cm9/init.smdk4210.rc
# Permissions for dvfs lock
chown system system /sys/power/cpufreq_max_limit
chown system system /sys/power/cpufreq_min_limit
@@ -35,12 +300,6 @@
@@ -35,12 +302,6 @@
chown system system /sys/power/gpu_lock
chmod 0660 /sys/power/gpu_lock

Expand All @@ -2067,7 +2079,7 @@ diff -ruN init.samsung/init.smdk4210.rc init.cm9/init.smdk4210.rc
# Permisions for sensors
chown radio system /sys/devices/virtual/K3G_GYRO-dev/k3g/gyro_selftest
chown radio system /sys/devices/virtual/K3G_GYRO-dev/k3g/gyro_get_temp
@@ -48,6 +307,16 @@
@@ -48,6 +309,16 @@
chown radio system /sys/devices/virtual/accelerometer/accelerometer/acc_file
chown radio system /sys/devices/virtual/sec/gsensorcal/calibration

Expand All @@ -2084,7 +2096,7 @@ diff -ruN init.samsung/init.smdk4210.rc init.cm9/init.smdk4210.rc
# permissions for NFC
setprop ro.nfc.port "I2C"
chmod 0600 /dev/pn544
@@ -55,68 +324,66 @@
@@ -55,68 +326,66 @@

# Device Encryption by B2B Security Lab.
setprop ro.crypto.keyfile.userdata /efs/metadata
Expand Down Expand Up @@ -2182,8 +2194,8 @@ diff -ruN init.samsung/init.smdk4210.rc init.cm9/init.smdk4210.rc
+ keycodes 114 115 116
diff -ruN init.samsung/init.smdk4210.rc.2 init.cm9/init.smdk4210.rc.2
--- init.samsung/init.smdk4210.rc.2 1970-01-01 02:00:00.000000000 +0200
+++ init.cm9/init.smdk4210.rc.2 2012-05-21 15:22:46.301844389 +0300
@@ -0,0 +1,394 @@
+++ init.cm9/init.smdk4210.rc.2 2012-07-18 23:51:45.000000000 +0300
@@ -0,0 +1,396 @@
+import init.smdk4210.usb.rc
+
+on early-init
Expand Down Expand Up @@ -2426,6 +2438,8 @@ diff -ruN init.samsung/init.smdk4210.rc.2 init.cm9/init.smdk4210.rc.2
+# Vibetonz
+ chmod 0660 /dev/tspdrv
+ chown root shell /dev/tspdrv
+ chmod 0660 /sys/vibrator/pwm_val
+ chown system system /sys/vibrator/pwm_val
+
+# Permissions for LCD
+ chown system radio /sys/class/lcd/panel/lcd_power
Expand Down

0 comments on commit 2fbcd9e

Please sign in to comment.