Changes - SailfishOS Open Build Service

Changes of Revision 5

[-] [+]	Changed	_service:tar_git:droid-config-h8266.changes
@@ -1,3 +1,9 @@ +* Mon Jul 12 2021 Rinigus <rinigus.git@gmail.com> - 0.6.0 +- [audio] Delay wired accessory init until device can be opened. JB#53508 +- [configs] Make actdead-charging wait for hwcomposer. +- [configs] Restart hwcomposer on user switches. Fixes JB#53554 +- [pulseaudio] Add udev rule to ignore internal card. + * Tue Dec 01 2020 Rinigus <rinigus.git@gmail.com> - 0.4.1 - [mce] disable use of hwc2 via libhybris.
[-] [+]	Changed	_service:tar_git:droid-config-h8266.spec ^
@@ -106,7 +106,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 0.4.2+hybris.10.20210712070203.44.ge6139e9 +Version: 0.7.0 %if 0%{?_obs_build_project:1} Release: 1 %else
[-] [+]	Changed	_service ^
@@ -6,4 +6,4 @@ <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param> -</service><!-- Bump Config: 2021-07-12 10:02:28 --></services> \ No newline at end of file +</service><!-- Bump Config: 2021-09-18 20:58:13 --></services> \ No newline at end of file
[-] [+]	Deleted	_service:tar_git:droid-config-h8266-0.4.2+hybris.10.20210712070203.44.ge6139e9.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-h8266-0.4.2+hybris.10.20210712070203.44.ge6139e9.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-h8266-0.7.0.tar.bz2/jolla-configuration-tama.inc ^
@@ -95,6 +95,9 @@ ## 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 @@ -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
[-] [+]	Changed	_service:tar_git:droid-config-h8266-0.7.0.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-h8266-0.7.0.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-h8266-0.7.0.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-h8266-0.7.0.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-h8266-0.7.0.tar.bz2/sparse/etc/sailfish-device-encryption-community/devices.ini ^
@@ -0,0 +1,6 @@ +[home_device] +name=Home +device=/dev/sailfish/home_open +mapper=home_encrypted +mount=/home +type=device
[-] [+]	Added	_service:tar_git:droid-config-h8266-0.7.0.tar.bz2/sparse/etc/systemd/system/dev-mtp.mount ^
+(symlink to /dev/null)
[-] [+]	Added	_service:tar_git:droid-config-h8266-0.7.0.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
[-] [+]	Changed	_service:tar_git:droid-config-h8266-0.7.0.tar.bz2/sparse/etc/zgovernor.ini ^
@@ -1,36 +1,9 @@ [display on] set_files = " -/sys/devices/system/cpu/cpu4/online 1 -/sys/devices/system/cpu/cpufreq/policy4/scaling_governor interactive -/sys/devices/system/cpu/cpufreq/policy4/interactive/above_hispeed_delay 19000 -/sys/devices/system/cpu/cpufreq/policy4/interactive/go_hispeed_load 90 -/sys/devices/system/cpu/cpufreq/policy4/interactive/hispeed_freq 1612800 -/sys/devices/system/cpu/cpufreq/policy4/interactive/io_is_busy 1 -/sys/devices/system/cpu/cpufreq/policy4/interactive/min_sample_time 19000 -/sys/devices/system/cpu/cpufreq/policy0/interactive/timer_rate 20000 - -/sys/devices/system/cpu/cpu5/online 1 -/sys/devices/system/cpu/cpu6/online 1 -/sys/devices/system/cpu/cpu7/online 1 - -/sys/devices/system/cpu/cpufreq/policy0/scaling_governor interactive -/sys/devices/system/cpu/cpufreq/policy0/interactive/above_hispeed_delay 19000 -/sys/devices/system/cpu/cpufreq/policy0/interactive/go_hispeed_load 90 -/sys/devices/system/cpu/cpufreq/policy0/interactive/hispeed_freq 1324800 -/sys/devices/system/cpu/cpufreq/policy0/interactive/io_is_busy 1 -/sys/devices/system/cpu/cpufreq/policy0/interactive/min_sample_time 19000 -/sys/devices/system/cpu/cpufreq/policy0/interactive/timer_rate 20000 " [display off] set_files = " -/sys/devices/system/cpu/cpu4/online 0 -/sys/devices/system/cpu/cpu5/online 0 -/sys/devices/system/cpu/cpu6/online 0 -/sys/devices/system/cpu/cpu7/online 0 - -/sys/devices/system/cpu/cpufreq/policy0/scaling_governor conservative - /sys/class/devfreq/soc:qcom,gpubw/min_freq 381 "