|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-apollo-img-boot.spec
|
|
|
|
|
Changed |
_service
^
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-hal-apollo-img-boot-4.9.230.tar.bz2/README.md
^
|
| @@ -0,0 +1,6 @@
+# Boot image
+
+Main purpose of this README is to follow current kernel version. Release tag in this repository
+is used for RPM versioning of kernel packages.
+
+Current kernel: 4.9.230
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-apollo-img-boot-4.9.230.tar.bz2/initrd/droid-hal-device-img-boot.inc
^
|
| @@ -73,12 +73,22 @@
BuildRequires: yamui
BuildRequires: openssh-clients
BuildRequires: openssh-server
+BuildRequires: fsarchiver
# mkbootimg needs python
BuildRequires: python
# tools
+Buildrequires: coreutils
BuildRequires: cryptsetup
+BuildRequires: sed
+
+%if 0%{?_obs_build_project:1}
+%ifarch %{ix86}
+# /boot
+BuildRequires: sudo-for-abuild
+%endif
+%endif
# Run time requires for flashing the bootimg
Requires: droid-config-flashing
@@ -174,13 +184,18 @@
sed --in-place 's|@BATTERY_CAPACITY_THRESHOLD@|%{battery_capacity_threshold}|' %{_local_initrd_dir}/etc/sysconfig/recovery
# Create a hybris-boot.img image from the zImage
+%if 0%{?_obs_build_project:1}
+%ifarch %{ix86}
+sudo chmod 755 /boot
+%endif
+%endif
pushd %{_local_initrd_dir}
-./mksfosinitrd.sh
+./mksfosinitrd.sh %{_lib}
popd
%{mkbootimg_cmd} hybris-boot.img
pushd %{_local_initrd_dir}
-./mksfosinitrd.sh recovery
+./mksfosinitrd.sh %{_lib} recovery
popd
%{mkbootimg_cmd} hybris-recovery.img
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-apollo-img-boot-4.9.230.tar.bz2/initrd/mksfosinitrd.sh
^
|
| @@ -34,12 +34,14 @@
etc/udhcpd.conf \
usr/bin/* \
/etc/nsswitch.conf \
- /lib/libnss_compat.so.2 \
- /lib/libnss_files.so.2 \
+ /$1/libnss_compat.so.2 \
+ /$1/libnss_files.so.2 \
+ /sbin/tune2fs \
/usr/bin/scp \
/usr/libexec/openssh/sftp-server \
/usr/sbin/sshd \
- /usr/sbin/cryptsetup"
+ /usr/sbin/cryptsetup \
+ /usr/sbin/fsarchiver"
# The sshd config file and keys must be accessible by files owner only.
# Git doesn't preserve full file permissions.
@@ -52,6 +54,8 @@
TOOL_LIST="$TOOL_LIST $(cat tools.files 2> /dev/null)"
+shift
+
if test x"$1" = x"recovery"; then
TOOL_LIST="$TOOL_LIST $RECOVERY_FILES $(cat recovery.files 2> /dev/null)"
DEF_INIT="recovery-init"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-apollo-img-boot-4.9.230.tar.bz2/initrd/recovery-init
^
|
| @@ -65,6 +65,7 @@
# This sets up the USB with whatever USB_FUNCTIONS are set to via android_usb
usb_setup_android_usb() {
+ G_USB_ISERIAL=$ANDROID_USB/iSerial
write $ANDROID_USB/enable 0
write $ANDROID_USB/functions ""
write $ANDROID_USB/enable 1
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-apollo-img-boot-4.9.230.tar.bz2/initrd/sbin/root-mount
^
|
| @@ -116,6 +116,13 @@
if test -f $1/usr/share/lipstick/devicelock/.clear-device-external-media; then
CLEAR_EXTERNAL_MEDIA=1
fi
+
+ # check if there is a custom factory reset animation
+ ANIMATION_DIR='/res/images'
+ if test -d $1/usr/share/custom-reset-animation/; then
+ ANIMATION_DIR=$(mktemp -d)
+ cp -rf $1/usr/share/custom-reset-animation/* $ANIMATION_DIR
+ fi
umount $1
log "Mounting sysfs."
@@ -130,9 +137,10 @@
write $DISPLAY_BRIGHTNESS_PATH $DISPLAY_BRIGHTNESS
yamui -a 1100 -t "Resetting to factory state, please do not power off!" \
- animation-recover-001 animation-recover-002 animation-recover-003 \
- animation-recover-004 animation-recover-005 animation-recover-006 \
- animation-recover-007 animation-recover-008 &
+ -i $ANIMATION_DIR \
+ animation-recover-001 animation-recover-002 animation-recover-003 \
+ animation-recover-004 animation-recover-005 animation-recover-006 \
+ animation-recover-007 animation-recover-008 &
YAMUIPID=$!
|
