Changes - SailfishOS Open Build Service

Changes of Revision 4

[-] [+]	Changed	_service:tar_git:droid-hal-apollo-img-boot.spec
@@ -1,6 +1,6 @@ %define device apollo -%define mkbootimg_cmd mkbootimg --cmdline 'lpm_levels.sleep_disabled=1 androidboot.bootdevice=1d84000.ufshc swiotlb=2048 service_locator.enable=1 androidboot.selinux=permissive msm_rtb.filter=0x3F ehci-hcd.park=3 coherent_pool=8M sched_enable_power_aware=1 user_debug=31 cgroup.memory=nokmem printk.devkmsg=on androidboot.hardware=apollo' --kernel %{kernel} --ramdisk %{initrd} --base 0x00000000 --pagesize 4096 --kernel_offset 0x00008000 --os_version 9 --os_patch_level 2019-08-01 --ramdisk_offset 0x02000000 --second_offset 0x00f00000 --tags_offset 0x01e00000 --board '' --output +%define mkbootimg_cmd mkbootimg --cmdline 'lpm_levels.sleep_disabled=1 androidboot.bootdevice=1d84000.ufshc swiotlb=2048 service_locator.enable=1 androidboot.selinux=permissive msm_rtb.filter=0x3F ehci-hcd.park=3 coherent_pool=8M sched_enable_power_aware=1 user_debug=31 cgroup.memory=nokmem printk.devkmsg=on androidboot.hardware=apollo audit=0' --kernel %{kernel} --ramdisk %{initrd} --base 0x00000000 --pagesize 4096 --kernel_offset 0x00008000 --os_version 9 --os_patch_level 2019-08-01 --ramdisk_offset 0x02000000 --second_offset 0x00f00000 --tags_offset 0x01e00000 --board '' --output %define root_part_label userdata %define factory_part_label system_b @@ -64,7 +64,7 @@ Name: droid-hal-%{device}-img-boot Summary: Kernel boot image for %{device} -Version: 4.9.194+master.20191207142800.6.g3d58a86 +Version: 4.9.194+master.20200718173820.8.g7fd9c31 Release: 2 Group: Kernel/Linux Kernel License: GPLv2 @@ -83,12 +83,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 @@ -184,13 +194,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
	Deleted	_service:tar_git:droid-hal-apollo-img-boot-4.9.194+master.20191207142800.6.g3d58a86.tar.bz2 ^
	Added	_service:tar_git:droid-hal-apollo-img-boot-4.9.194+master.20200718173820.8.g7fd9c31.tar.bz2 ^