I have made the following changes intended for : CE:Adaptation:N9xx-common / ti-omap3-sgx
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/3219 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3219: Messages from BOSS: WARNING check_package_is_complete_sources (ti-omap3-sgx) failed: Extra files in package: ti-omap3-sgx-bin-1.4.268-armv7hl.tar.bz2, ti-omap3-sgx-update.sh. Files listed in spec missing: ti-omap3-sgx-bin-1.4.268-x86_64.tar.bz2 Could not notify CE-maintainers (no address found) State: review 2011-11-23T12:25:04 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by None Changes: submit: home:sage:branches:CE:Adaptation:N9xx-common / ti-omap3-sgx -> CE:Adaptation:N9xx-common / ti-omap3-sgx changes files: -------------- --- ti-omap3-sgx.changes +++ ti-omap3-sgx.changes @@ -0,0 +1,3 @@ +* Wed Nov 23 2011 Marko Saukko <[email protected]> - 1.4.268 +- Merged .sh file content with .service file. + old: ---- ti-omap3-sgx.sh spec files: ----------- --- ti-omap3-sgx.spec +++ ti-omap3-sgx.spec @@ -14,13 +14,12 @@ License: TI Proprietary ExclusiveArch: %{arm} armv8el Source0: %{name}-bin-%{version}-%{_target_cpu}.tar.bz2 -Source1: %{name}.sh -Source2: license.txt -Source3: %{name}-powervr.ini -Source4: %{name}.udev -Source5: %{name}.service -Source6: Meego_IMG-08172010-license_txt.doc -Source7: boss.conf +Source1: license.txt +Source2: %{name}-powervr.ini +Source3: %{name}.udev +Source4: %{name}.service +Source5: Meego_IMG-08172010-license_txt.doc +Source6: boss.conf Source100: ti-omap3-sgx.yaml Requires: systemd Requires(preun): systemd @@ -123,8 +122,8 @@ %setup -q -n %{name}-bin-%{version}-%{_target_cpu} # >> setup -cp -v %{SOURCE2} . -cp -v %{SOURCE6} . +cp -v %{SOURCE1} . +cp -v %{SOURCE5} . # << setup @@ -149,13 +148,10 @@ rm $RPM_BUILD_ROOT/Meego_IMG-08172010-license_txt.doc install -d $RPM_BUILD_ROOT%{_sysconfdir}/ -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/powervr.ini - -install -d $RPM_BUILD_ROOT%{_sbindir}/ -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/%{name}.sh +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/powervr.ini install -d $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-pvrsrvkm.rules +install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-pvrsrvkm.rules # Integrate into Mesa naming. ln -s libGLESv2.so $RPM_BUILD_ROOT%{_libdir}/libGLESv2.so.2 @@ -166,7 +162,7 @@ chmod a+x $RPM_BUILD_ROOT%{_libdir}/*.so # systemd -install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/lib/systemd/system/%{name}.service +install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/%{name}.service install -d $RPM_BUILD_ROOT/lib/systemd/system/multi-user.target.wants/ ln -s ../%{name}.service $RPM_BUILD_ROOT/lib/systemd/system/multi-user.target.wants/%{name}.service # << install pre @@ -234,7 +230,6 @@ %{_libdir}/libsrv_um*.so %attr(755,root,root) %{_sbindir}/pvrsrvinit_r* %attr(755,root,root) %{_sbindir}/pvrsrvinit -%attr(755,root,root) %{_sbindir}/%{name}.sh /lib/systemd/system/%{name}.service /lib/systemd/system/multi-user.target.wants/%{name}.service other changes: -------------- ++++++ ti-omap3-sgx.service --- ti-omap3-sgx.service +++ ti-omap3-sgx.service @@ -5,8 +5,8 @@ [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/sbin/ti-omap3-sgx.sh start -ExecStop=/usr/sbin/ti-omap3-sgx.sh stop +ExecStartPre=/sbin/modprobe omaplfb +ExecStart=/usr/sbin/pvrsrvinit [Install] WantedBy=multi-user.target ++++++ ti-omap3-sgx.yaml --- ti-omap3-sgx.yaml +++ ti-omap3-sgx.yaml @@ -6,7 +6,6 @@ License: TI Proprietary Sources: - "%{name}-bin-%{version}-%{_target_cpu}.tar.bz2" - - "%{name}.sh" - "license.txt" - "%{name}-powervr.ini" - "%{name}.udev" ++++++ deleted files: --- ti-omap3-sgx.sh
