I have made the following changes intended for : CE:Adaptation:N950-N9 / nokia-n950-configs
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/7093 Thank You, zalevski [This message was auto-generated] --- Request # 7093: Messages from BOSS: State: review at 2012-10-20T08:04:15 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:zalevski:branches:CE:Adaptation:N950-N9 / nokia-n950-configs -> CE:Adaptation:N950-N9 / nokia-n950-configs changes files: -------------- --- nokia-n950-configs.changes +++ nokia-n950-configs.changes @@ -0,0 +1,3 @@ +* Tue Oct 16 2012 Denis Zalevskiy <[email protected]> - 0.3.3 +- Drivers compiled as modules before now is the part of the kernel + old: ---- nokia-n950-configs.yaml spec files: ----------- --- nokia-n950-configs.spec +++ nokia-n950-configs.spec @@ -1,15 +1,6 @@ -# -# Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.25 -# - Name: nokia-n950-configs - -# >> macros -# << macros - Summary: Nokia N950-specific configuration files -Version: 0.3.2 +Version: 0.3.3 Release: 0 Group: System/Startup Services License: GPLv2 @@ -26,7 +17,6 @@ Source9: %{name}.service Source10: n950-plymouth-start-update.service Source11: boss.conf -Source100: nokia-n950-configs.yaml Requires: alsa-utils Requires: xorg-x11-xkb-utils Requires: systemd @@ -39,23 +29,11 @@ %prep -# No setup - -# >> setup -# << setup %build -# >> build pre -# << build pre - - - -# >> build post -# << build post %install rm -rf %{buildroot} -# >> install pre install -D -m 644 %{SOURCE0} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xorg.conf.d/90-input-n950.conf install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/n950-xkb-hack.desktop install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/asound_n950.state @@ -72,10 +50,6 @@ install -d $RPM_BUILD_ROOT/lib/systemd/system/sysinit.target.wants/ install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT/lib/systemd/system/n950-plymouth-start-update.service ln -s ../n950-plymouth-start-update.service $RPM_BUILD_ROOT/lib/systemd/system/sysinit.target.wants/n950-plymouth-start-update.service -# << install pre - -# >> install post -# << install post %preun @@ -94,7 +68,6 @@ %files %defattr(-,root,root,-) -# >> files %config %{_sysconfdir}/X11/xorg.conf.d/90-input-n950.conf %config %{_sysconfdir}/xdg/autostart/n950-xkb-hack.desktop %config %{_sysconfdir}/asound_n950.state @@ -107,4 +80,3 @@ /lib/systemd/system/multi-user.target.wants/%{name}.service /lib/systemd/system/n950-plymouth-start-update.service /lib/systemd/system/sysinit.target.wants/n950-plymouth-start-update.service -# << files other changes: -------------- ++++++ nokia-n950-configs.sh --- nokia-n950-configs.sh +++ nokia-n950-configs.sh @@ -11,8 +11,8 @@ echo -n "Loading N950 camera modules" RETVAL=0 - /sbin/modprobe iommu2 || RETVAL=1 - /sbin/modprobe omap3_iommu || RETVAL=1 + #/sbin/modprobe iommu2 || RETVAL=1 + #/sbin/modprobe omap3_iommu || RETVAL=1 /sbin/modprobe omap3-isp || RETVAL=1 /sbin/modprobe smiapp || RETVAL=1 if [ $RETVAL -ne 0 ]; then @@ -32,9 +32,9 @@ swappart=`sed -n -e '/swap/s/mtd\([0-9]\).*/\1/p' /proc/mtd` || true if [ -n "$swappart" ]; then modprobe mtdswap partitions=$swappart spare_eblocks=10 header=0 || RETVAL=1 - modprobe dm_mod - modprobe dm_crypt - /sbin/cryptsetup create -h sha256 -c aes-xts-plain -s 256 -d /dev/urandom encswap /dev/mtdswap$swappart || RETVAL=1 + #modprobe dm_mod + #modprobe dm_crypt + #/sbin/cryptsetup create -h sha256 -c aes-xts-plain -s 256 -d /dev/urandom encswap /dev/mtdswap$swappart || RETVAL=1 /sbin/mkswap $encswap || RETVAL=1 else echo "ERROR: Could not find swap partion from mtd" @@ -57,8 +57,8 @@ RETVAL=0 /sbin/rmmod smiapp || RETVAL=1 /sbin/rmmod omap3-isp || RETVAL=1 - /sbin/rmmod omap3_iommu || RETVAL=1 - /sbin/rmmod iommu2 || RETVAL=1 + #/sbin/rmmod omap3_iommu || RETVAL=1 + #/sbin/rmmod iommu2 || RETVAL=1 if [ $RETVAL -ne 0 ]; then echo "WARNING: Unable unload camera module." fi ++++++ deleted files: --- nokia-n950-configs.yaml
