why are you using the same unversioned tar? Can you please use a version tar where the version actually corresponds to the package version? On 2010-10-08, at 12:43 AM, timoph wrote:
> 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 #8186: > > submit: devel:quality/eat(r26) -> Trunk:Testing/eat > > > Message: > eat version 0.0.8 - Fixes BMC#7897 and BMC#7914 > > State: new 2010-10-08T00:43:43 timoph > Comment: None > > > > changes files: > -------------- > --- eat.changes > +++ eat.changes > @@ -0,0 +1,8 @@ > +* Thu 7 Oct 2010 Timo Härkönen <[email protected]> 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 <[email protected]> 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 > > spec files: > ----------- > --- eat.spec > +++ eat.spec > @@ -1,5 +1,5 @@ > 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 > @@ -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 > @@ -61,30 +66,33 @@ > %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.tar.gz > --- init > +++ init > -(directory) > --- init/eat-dns > +++ init/eat-dns > (renamed to src/init/eat-dns) > --- init/eat-selftest > +++ init/eat-selftest > (renamed to src/init/eat-selftest) > --- init/eat-syslog-device > +++ init/eat-syslog-device > (renamed to src/init/eat-syslog-device) > --- init/eat-syslog-host > +++ init/eat-syslog-host > (renamed to src/init/eat-syslog-host) > --- init/usbnetworking > +++ init/usbnetworking > (renamed to src/init/usbnetworking) > --- src > +++ src > +(directory) > --- src/conf > +++ src/conf > +(directory) > --- src/conf/10-eat-syslog-host-ubuntu.conf > +++ src/conf/10-eat-syslog-host-ubuntu.conf > +$ModLoad imudp > +$UDPServerRun 514 > +$UDPServerAddress 192.168.2.15 > + > +*.192.168.2.15 /var/log/eat.log > + > +& ~ > + > --- src/init > +++ src/init > +(directory) > --- src/init/eat-dns > +++ src/init/eat-dns > (renamed from init/eat-dns) > --- src/init/eat-selftest > +++ src/init/eat-selftest > (renamed from init/eat-selftest) > --- src/init/eat-syslog-device > +++ src/init/eat-syslog-device > (renamed from init/eat-syslog-device) > --- src/init/eat-syslog-host > +++ src/init/eat-syslog-host > (renamed from init/eat-syslog-host) > --- src/init/usbnetworking > +++ src/init/usbnetworking > (renamed from init/usbnetworking) > --- src/scripts > +++ src/scripts > +(directory) > --- src/scripts/eat-clear-syslog.sh > +++ src/scripts/eat-clear-syslog.sh > +#!/bin/sh > +> /var/log/eat.log > --- src/scripts/eat-selftest.sh > +++ src/scripts/eat-selftest.sh > +#!/bin/sh > +# > +# eat-selftest - Executes all found tests > + > +# wait before running the tests if desired > +if [ "$1" != "" ]; then > + sleep $1 > +fi > + > +export DISPLAY=:0 > + > +RESULTPATH=$HOME/testresults > +if [ ! -d $RESULTPATH ];then > + mkdir -p $RESULTPATH > +fi > + > +for i in `ls /usr/share/*-tests/tests.xml` > +do > + NAME=`echo $i | sed 's/\/usr\/share\///'` > + NAME=`echo $NAME | sed 's/\/tests.xml//'` > + testrunner-lite -f $i -o $RESULTPATH/$NAME-results.xml -v 2>&1 | tee \ > + $RESULTPATH/$NAME-testlog > +done > + > +exit $? > --- src/sshkeys > +++ src/sshkeys > +(directory) > --- src/sshkeys/authorized_keys2 > +++ src/sshkeys/authorized_keys2 > (renamed from sshkeys/authorized_keys2) > --- src/sshkeys/config > +++ src/sshkeys/config > +IdentityFile=%d/.ssh/id_eat_dsa > +StrictHostKeyChecking=no > --- src/sshkeys/id_eat_dsa > +++ src/sshkeys/id_eat_dsa > (renamed from sshkeys/id_eat_dsa) > --- sshkeys > +++ sshkeys > -(directory) > --- sshkeys/authorized_keys2 > +++ sshkeys/authorized_keys2 > (renamed to src/sshkeys/authorized_keys2) > --- sshkeys/config > +++ sshkeys/config > -IdentityFile=%d/.ssh/id_eat_dsa--- sshkeys/id_eat_dsa > +++ sshkeys/id_eat_dsa > (renamed to src/sshkeys/id_eat_dsa) > > _______________________________________________ > Meego-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
