[meego-commits] 8309: Changes to Trunk:Testing/eat
timoph
no_reply at build.meego.com
Tue Oct 12 05:29:50 UTC 2010
Hi,
I have made the following changes to eat in project Trunk:Testing. Please review and accept ASAP.
Thank You,
timoph
[This message was auto-generated]
---
Request #8309:
submit: devel:quality/eat(r27) -> Trunk:Testing/eat
Message:
added version number to src package as requested
State: new 2010-10-11T22:29:49 timoph
Comment: None
changes files:
--------------
--- eat.changes
+++ eat.changes
@@ -0,0 +1,8 @@
+* Thu 7 Oct 2010 Timo Härkönen <timo.harkonen at digia.com> 0.0.8
+- Starting eat-selftest from inittab and moved it away from init.d - fixes BMC#7897
+- Adding StrictHostKeyChecking=no to host ssh config
+* Wed 6 Oct 2010 Timo Härkönen <timo.harkonen at digia.com> 0.0.7
+- Installing ssh-key also for host machine's root user - Fixes BMC#7914
+- Added dependency to nokia-usb-networking for arm targets
+- Back up host machine's existing ssh config if exists
+- Added script to crear host side eat syslog file
old:
----
eat.tar.gz
new:
----
eat-0.0.8.tar.gz
spec files:
-----------
--- eat.spec
+++ eat.spec
@@ -1,12 +1,12 @@
Name: eat
-Version: 0.0.6
+Version: 0.0.8
# build.meego.com proposed patch > Release:7.1
Release:7.1
Summary: Test automation enabler meta packages
Group: Development/Tools
License: LGPL 2.1
URL: http://meego.com
-Source0: %{name}.tar.gz
+Source0: %{name}-%{version}.tar.gz
BuildRoot: mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-root
%description
@@ -26,17 +26,22 @@
Settings for host side of test automation. Includes ssh-key to enable passwordless root logins to device
%package selftest
-Summary: Runs test packages found in device automatically
+Summary: Run test packages found in device
Requires: testrunner-lite
%description selftest
-Automatically runs all test packages found in the device
+Automatically runs all test packages found in the device.
+Test execution is start by eat-selftest.sh script and
+results are written to user's home under testresults directory
%package device
Summary: Device side enablers for test automation
Requires: openssh-server
Requires(pre): coreutils
Conflicts: eat-host
+%ifarch arm armv5el armv7l
+Requires: nokia-usb-networking
+%endif
%description device
Settings for device side of test automation. Includes ssh-key for passwordless root logins
@@ -56,35 +61,38 @@
Configures host machines syslog to receive syslog from the device under test
%prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p %{buildroot}/root/.ssh
-cp sshkeys/authorized_keys2 %{buildroot}/root/.ssh/authorized_keys2
+cp src/sshkeys/authorized_keys2 %{buildroot}/root/.ssh/authorized_keys2
mkdir -p %{buildroot}/var/opt/eat/sshkey-host
-cp sshkeys/id_eat_dsa %{buildroot}/var/opt/eat/sshkey-host/id_eat_dsa
-cp sshkeys/config %{buildroot}/var/opt/eat/sshkey-host/config
+cp src/sshkeys/id_eat_dsa %{buildroot}/var/opt/eat/sshkey-host/id_eat_dsa
+cp src/sshkeys/config %{buildroot}/var/opt/eat/sshkey-host/config
mkdir -p %{buildroot}/etc/init.d
-cp init/eat-selftest %{buildroot}/etc/init.d/eat-selftest
-cp init/eat-syslog-host %{buildroot}/etc/init.d/eat-syslog-host
-cp init/eat-syslog-device %{buildroot}/etc/init.d/eat-syslog-device
+cp src/init/eat-syslog-host %{buildroot}/etc/init.d/eat-syslog-host
+cp src/init/eat-syslog-device %{buildroot}/etc/init.d/eat-syslog-device
+mkdir -p %{buildroot}/usr/bin
+cp src/scripts/eat-clear-syslog.sh %{buildroot}/usr/bin/eat-clear-syslog.sh
+cp src/scripts/eat-selftest.sh %{buildroot}/usr/bin/eat-selftest.sh
%ifarch arm armv5el armv7l
-cp init/eat-dns %{buildroot}/etc/init.d/eat-dns
+cp src/init/eat-dns %{buildroot}/etc/init.d/eat-dns
%endif
%ifarch %{ix86}
-cp init/usbnetworking %{buildroot}/etc/init.d/usbnetworking
+cp src/init/usbnetworking %{buildroot}/etc/init.d/usbnetworking
%endif
%files selftest
%defattr(755,root,root,-)
-/etc/init.d/eat-selftest
+%{_bindir}/eat-selftest.sh
%post selftest
-ln -s /etc/init.d/eat-selftest /etc/rc5.d/S99eat-selftest
+cp /etc/inittab /etc/inittab.back
+echo "ea:5:once:su - meego -c \"eat-selftest.sh 120\"" >> /etc/inittab
%postun selftest
-rm /etc/rc5.d/S99eat-selftest
+mv /etc/inittab.back /etc/inittab
%clean
rm -rf %{buildroot}
@@ -110,22 +118,47 @@
%defattr(660,root,root,-)
%config /var/opt/eat/sshkey-host/id_eat_dsa
%config /var/opt/eat/sshkey-host/config
+%defattr(755,root,root,-)
+%{_bindir}/eat-clear-syslog.sh
%post host
-# Yes we're messing with the user's home directory
-mkdir -p ~/.ssh
-cat /var/opt/eat/sshkey-host/id_eat_dsa > ~/.ssh/id_eat_dsa
-chmod 600 ~/.ssh/id_eat_dsa
-cp /var/opt/eat/sshkey-host/config ~/.ssh
-# Assumes the home path is /home/user
-OWNER=`echo ~ | sed 's/\/home\///'`
-chown $OWNER:$OWNER ~/.ssh/id_eat_dsa
-chown $OWNER:$OWNER ~/.ssh/config
+# If home path is something else than /root
+if [ "$HOME" != "/root" ]; then
+ # Yes we're messing with the user's home directory
+ mkdir -p ~/.ssh
+ cat /var/opt/eat/sshkey-host/id_eat_dsa > ~/.ssh/id_eat_dsa
+ chmod 600 ~/.ssh/id_eat_dsa
+ if [ -e ~/.ssh/config ]; then
+ cp ~/.ssh/config ~/.ssh/config.backup
+ fi
+ cp /var/opt/eat/sshkey-host/config ~/.ssh
+ OWNER=`echo ~ | sed 's/\/home\///'`
+ chown $OWNER:$OWNER ~/.ssh/id_eat_dsa
+ chown $OWNER:$OWNER ~/.ssh/config
+fi
+# And we're messing also with root's home
+mkdir -p /root/.ssh
+cat /var/opt/eat/sshkey-host/id_eat_dsa > /root/.ssh/id_eat_dsa
+chmod 600 /root/.ssh/id_eat_dsa
+cp /var/opt/eat/sshkey-host/config /root/.ssh/
%postun host
# Again messing with the users home on purpose
-rm ~/.ssh/config
-rm ~/.ssh/id_eat_dsa
+if [ -e ~/.ssh/config ]; then
+ rm ~/.ssh/config
+ if [ -e ~/.ssh/config.backup ]; then
+ mv ~/.ssh/config.backup ~/.ssh/config
+ fi
+fi
+if [ -e ~/.ssh/id_eat_dsa ]; then
+ rm ~/.ssh/id_eat_dsa
+fi
+if [ -e /root/.ssh/config ]; then
+ rm /root/.ssh/config
+fi
+if [ -e /root/.ssh/id_eat_dsa ]; then
+ rm /root/.ssh/id_eat_dsa
+fi
%files device
%defattr(660,root,root,-)
other changes:
--------------
++++++ eat-0.0.8.tar.gz (new)
++++++ deleted files:
--- eat.tar.gz
More information about the MeeGo-commits
mailing list