|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h9436.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,4 +6,4 @@
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
-</service><!-- Bump Config: 2021-07-24 19:05:08 --></services>
\ No newline at end of file
+</service><!-- Bump Config: 2021-09-21 22:41:39 --></services>
\ No newline at end of file
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-h9436-0.6.1.tar.bz2/sparse/usr/lib/systemd/system/multi-user.target.wants/shutdown-logs.service
^
|
| -(symlink to ../shutdown-logs.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-h9436-0.6.1.tar.bz2/sparse/usr/lib/systemd/system/shutdown-logs.service
^
|
| @@ -1,11 +0,0 @@
-[Unit]
-Description=Grab logs after boot and before shutdown
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/root/logs.sh boot
-ExecStop=/root/logs.sh shutdown
-
-[Install]
-WantedBy=multi-user.target
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h9436-0.7.1.tar.bz2/jolla-configuration-tama.inc
^
|
| @@ -38,7 +38,7 @@
Requires: nfcd-dbuslog-plugin
# Sensors
-Requires: hybris-libsensorfw-qt5
+Requires: hybris-libsensorfw-qt5-binder
# Vibra
Requires: ngfd-plugin-native-vibrator
@@ -95,9 +95,12 @@
## Enable home encryption
#Requires: sailfish-device-encryption
+Requires: sailfish-device-encryption-community
+Requires: sailfish-device-encryption-community-droid
+Requires: droid-hwcrypt
# For GPS
-Requires: geoclue-provider-hybris
+Requires: geoclue-provider-hybris-binder
# For suspend to work with enabled Wi-Fi on newer Qualcomm devices
Requires: sailfish-connman-plugin-suspend
@@ -119,6 +122,9 @@
# CPU and GPU tuning: Sony Tama specific
Requires: zgovernor
+# No device reset - dropping fimage
+Provides: jolla-settings-system-reset
+
# Early stages of porting benefit from these:
# On the basis of sailfish-porter-tools
Requires: jolla-developer-mode
@@ -146,4 +152,16 @@
%description
Meta package to install packages for %{rpm_device} configurations
+%post
+if [ ! -f /etc/sailfish-device-encryption-community/config.ini ]; then
+ if /usr/sbin/lvdisplay sailfish/home > /dev/null 2>&1 ; then
+ echo "Converting storage configuration"
+ mkdir -p /etc/sailfish-device-encryption-community
+ (/usr/sbin/lvrename sailfish/home sailfish/home_open && \
+ echo '[home_device]' > /etc/sailfish-device-encryption-community/config.ini && \
+ echo 'state=plain' >> /etc/sailfish-device-encryption-community/config.ini && \
+ sed -i '/\/home/d' /etc/fstab) || echo 'Failed to update to new storage configuration, please reflash'
+ fi
+fi
+
%files
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h9436-0.7.1.tar.bz2/kickstart/pack/h8216/hybris
^
|
| @@ -21,9 +21,11 @@
RELEASENAME=${NAME// /_}-${SAILFISH_CUSTOMER// /_}${SAILFISH_CUSTOMER:+-}${EXTRA_NAME// /_}$RND_FLAVOUR${RND_FLAVOUR:+-}$VERSION_ID$DEVICE_ID
# Remove /opt mounting from fstab, systemd will handle it
+# Remove /home mounting from fstab, it is handled through encryption scripts
mkdir root
mount -o loop root.img root
sed -i '/\/opt/d' root/etc/fstab
+sed -i '/\/home/d' root/etc/fstab
umount root
rm -rf root
@@ -89,47 +91,51 @@
/usr/sbin/lvcreate -L ${ROOTSIZE}B --name root sailfish
echo "Create logical volume HOME size: $HOMESIZE"
-/usr/sbin/lvcreate -L ${HOMESIZE}B --name home sailfish
+/usr/sbin/lvcreate -L ${HOMESIZE}B --name home_open sailfish
/bin/sync
/usr/sbin/vgchange -a y sailfish
dd if=root.img bs=$BLOCKSIZE count=$ROOTBLOCKS of=/dev/sailfish/root
-dd if=home.img bs=$BLOCKSIZE count=$HOMEBLOCKS of=/dev/sailfish/home
+dd if=home.img bs=$BLOCKSIZE count=$HOMEBLOCKS of=/dev/sailfish/home_open
/usr/sbin/vgchange -a n sailfish
-pigz -7 root.img && md5sum -b root.img.gz > root.img.gz.md5&
-pigz -7 home.img && md5sum -b home.img.gz > home.img.gz.md5&
-wait
+# Commenting out fimage section and removing unused images
+rm root.img
+rm home.img
+
+#pigz -7 root.img && md5sum -b root.img.gz > root.img.gz.md5&
+#pigz -7 home.img && md5sum -b home.img.gz > home.img.gz.md5&
+#wait
-ROOTSIZE=$(/bin/ls -l root.img.gz | cut -d ' ' -f5)
-HOMESIZE=$(/bin/ls -l home.img.gz | cut -d ' ' -f5)
+#ROOTSIZE=$(/bin/ls -l root.img.gz | cut -d ' ' -f5)
+#HOMESIZE=$(/bin/ls -l home.img.gz | cut -d ' ' -f5)
# Temporary dir for making factory image backups.
-FIMAGE_TEMP=$(mktemp -d -p $(pwd))
+#FIMAGE_TEMP=$(mktemp -d -p $(pwd))
# For some reason loop files created by imager don't shrink properly when
# running resize2fs -M on them. Hence manually growing the loop file here
# to make the shrinking work once we have the image populated.
-dd if=/dev/zero bs=512 seek=$(/usr/bin/expr \( $ROOTSIZE + $HOMESIZE + 100000000 \) / 512) count=1 of=fimage.img
-/sbin/e2fsck -f -y fimage.img
-/sbin/resize2fs -f fimage.img
-
-mount -o loop fimage.img $FIMAGE_TEMP
-mkdir -p $FIMAGE_TEMP/${RELEASENAME}
-mv root.img.gz* $FIMAGE_TEMP/${RELEASENAME}
-mv home.img.gz* $FIMAGE_TEMP/${RELEASENAME}
-umount $FIMAGE_TEMP
-rmdir $FIMAGE_TEMP
-
-/sbin/e2fsck -f -y fimage.img
-/sbin/resize2fs -f -M fimage.img
-
-# To make the file magic right lets convert to single file sparse image.
-/usr/bin/img2simg fimage.img fimage.img001
-rm fimage.img
+#dd if=/dev/zero bs=512 seek=$(/usr/bin/expr \( $ROOTSIZE + $HOMESIZE + 100000000 \) / 512) count=1 of=fimage.img
+#/sbin/e2fsck -f -y fimage.img
+#/sbin/resize2fs -f fimage.img
+
+#mount -o loop fimage.img $FIMAGE_TEMP
+#mkdir -p $FIMAGE_TEMP/${RELEASENAME}
+#mv root.img.gz* $FIMAGE_TEMP/${RELEASENAME}
+#mv home.img.gz* $FIMAGE_TEMP/${RELEASENAME}
+#umount $FIMAGE_TEMP
+#rmdir $FIMAGE_TEMP
+
+#/sbin/e2fsck -f -y fimage.img
+#/sbin/resize2fs -f -M fimage.img
+
+## To make the file magic right lets convert to single file sparse image.
+#/usr/bin/img2simg fimage.img fimage.img001
+#rm fimage.img
/sbin/losetup -d $LVM_LOOP
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h9436-0.7.1.tar.bz2/kickstart/part/h8216
^
|
| @@ -1,4 +1,3 @@
part / --fstype="ext4" --size=3000 --label=root
part /home --fstype="ext4" --size=800 --label=home
-part /fimage --fstype="ext4" --size=10 --label=fimage
part /opt --fstype="ext4" --size=850 --label=vendor
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h9436-0.7.1.tar.bz2/sparse/boot/flash-on-windows.bat
^
|
| @@ -164,7 +164,7 @@
@call :fastboot flash boot hybris-boot.img
@call :fastboot flash dtbo dtbo.img
-@call :fastboot flash system_b fimage.img001
+:: @call :fastboot flash system_b fimage.img001
@call :fastboot flash userdata sailfish.img001
@call :fastboot flash oem_a %blobfilename%
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h9436-0.7.1.tar.bz2/sparse/boot/flash.sh
^
|
| @@ -143,7 +143,6 @@
"boot ${SAILFISH_IMAGE_PATH}hybris-boot.img"
"dtbo ${SAILFISH_IMAGE_PATH}dtbo.img"
"userdata ${SAILFISH_IMAGE_PATH}sailfish.img001"
-"system_b ${SAILFISH_IMAGE_PATH}fimage.img001"
)
if [ "$UNAME" = "Darwin" ] || [ "$UNAME" = "FreeBSD" ]; then
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-h9436-0.7.1.tar.bz2/sparse/etc/systemd/system/dev-mtp.mount
^
|
| +(symlink to /dev/null)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-h9436-0.7.1.tar.bz2/sparse/etc/systemd/system/systemd-ask-password-gui-stop.service.d/50-vendor-hwcomposer-2-3.conf
^
|
| @@ -0,0 +1,6 @@
+[Service]
+ExecStartPre=-/usr/bin/killall systemd-ask-password-gui
+# stop first in case something else managed to start it
+ExecStartPre=-/system/bin/stop vendor.hwcomposer-2-3
+ExecStartPre=-/system/bin/start vendor.hwcomposer-2-3
+ExecStart=/bin/echo After vendor.hwcomposer-2-3 restart
|
