diff --git a/os-autoinst-4.6.1595530333.7963b3d4.obscpio b/os-autoinst-4.6.1595530333.7963b3d4.obscpio deleted file mode 100644 index 0d16c18..0000000 --- a/os-autoinst-4.6.1595530333.7963b3d4.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0a1fd8696ddfb8dd691a59522167e2a3bd2335a4d2c3a30a828e01ad57edd84 -size 25021453 diff --git a/os-autoinst-4.6.1595671685.bac387ad.obscpio b/os-autoinst-4.6.1595671685.bac387ad.obscpio new file mode 100644 index 0000000..af83884 --- /dev/null +++ b/os-autoinst-4.6.1595671685.bac387ad.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1edb63a5a6a721b7e278ee9f104c47453f07a3c4dd31eeb277447fc7e30c76de +size 25021965 diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec index 1777710..f2a614f 100644 --- a/os-autoinst-test.spec +++ b/os-autoinst-test.spec @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst Name: %{short_name}%{?name_ext} -Version: 4.6.1595530333.7963b3d4 +Version: 4.6.1595671685.bac387ad Release: 0 Summary: test package for os-autoinst #BuildRequires: %{short_name} == %{version} diff --git a/os-autoinst.changes b/os-autoinst.changes index 263c00b..22e8de7 100644 --- a/os-autoinst.changes +++ b/os-autoinst.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Jul 26 03:25:50 UTC 2020 - okurz@suse.com + +- Update to version 4.6.1595671685.bac387ad: + * Fix invalid "installprefix" replacement in CMakeLists.txt + * CMake: Install isotovideo as executable + * Use CMake build script within CI and RPM package builds + * CMake: Install openvswitch config directly under /etc + * CMake: Use -output option of xsubpp to fix file paths + * CMake: Make symlinks target work in source-tree builds as well + * CMake: Add autotools-style check target to build and test everything in one go + * CMake: Avoid overriding isotovideo and cv.pm when building within source tree + ------------------------------------------------------------------- Thu Jul 23 19:25:46 UTC 2020 - okurz@suse.com diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo index 7711538..7cdb5f6 100644 --- a/os-autoinst.obsinfo +++ b/os-autoinst.obsinfo @@ -1,5 +1,5 @@ name: os-autoinst -version: 4.6.1595530333.7963b3d4 -mtime: 1595530333 -commit: 7963b3d49f52310a1791f7047f0d787edd6d2194 +version: 4.6.1595671685.bac387ad +mtime: 1595671685 +commit: bac387add85ae15c2ce467cda5d70462daa4305f diff --git a/os-autoinst.spec b/os-autoinst.spec index b38e2cb..480b3b5 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1595530333.7963b3d4 +Version: 4.6.1595671685.bac387ad Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later @@ -32,7 +32,7 @@ Source0: %{name}-%{version}.tar.xz %define opencv_require pkgconfig(opencv) %endif # The following line is generated from dependencies.yaml -%define build_requires %opencv_require autoconf automake gcc-c++ libtool make perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) >= 7.12 perl(Module::CPANfile) perl(Pod::Html) pkg-config pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) +%define build_requires %opencv_require cmake gcc-c++ ninja perl(Pod::Html) pkg-config pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) # The following line is generated from dependencies.yaml %define main_requires git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Class::Accessor::Fast) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Spec) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(version) perl(warnings) perl-base # all requirements needed by the tests, do not require on this in the package @@ -46,10 +46,8 @@ Source0: %{name}-%{version}.tar.xz %if %{with spellcheck} # The following line is generated from dependencies.yaml %define spellcheck_requires aspell-en aspell-spell perl(Pod::Spell) -%define make_check_args %{nil} %else %define spellcheck_requires %{nil} -%define make_check_args CHECK_DOC=0 %endif # The following line is generated from dependencies.yaml %define test_requires %build_requires %main_requires %spellcheck_requires perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Exception) perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 perl(YAML::PP) procps python3-setuptools python3-yamllint qemu qemu-tools qemu-x86 @@ -107,15 +105,12 @@ for i in 07-commands 13-osutils 14-isotovideo 18-qemu-options 18-backend-qemu 99 done %build -mkdir -p m4 -autoreconf -f -i -%configure --docdir=%{_docdir}/%{name} -make INSTALLDIRS=vendor %{?_smp_mflags} +%define __builder ninja +%cmake -DOS_AUTOINST_DOC_DIR:STRING=%{_docdir}/%{name} +%cmake_build %install -%make_install INSTALLDIRS=vendor -# only internal stuff -rm -r %{buildroot}/usr/lib/os-autoinst/tools/ +%cmake_install install-openvswitch ls -lR %buildroot find %{buildroot} -type f -name .packlist -print0 | xargs -0 --no-run-if-empty rm -f @@ -130,14 +125,8 @@ ln -s ../sbin/service %{buildroot}%{_sbindir}/rcos-autoinst-openvswitch export NO_BRP_STALE_LINK_ERROR=yes %check -# disable code quality checks - not worth the time for package builds -sed '/perlcritic/d' -i Makefile -sed '/Perl::Critic/d' -i cpanfile -sed '/tidy/d' -i Makefile - -# should work offline -for p in $(cpanfile-dump); do rpm -q --whatprovides "perl($p)"; done -make check test VERBOSE=1 %{make_check_args} +cd %{__builddir} +%cmake_build check-pkg-build %pre openvswitch %service_add_pre os-autoinst-openvswitch.service