1. photon
  2. Commit f8eb1f199861dce62480cb8ddf1738e7f20a4bca
Browse code

Makecheck changes for rpm-ostree

Change-Id: Ibace471cb6ba345697fa4e9b3e0740b591b9121d
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3790
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

DheerajSShetty authored on 2017/09/16 10:47:04
Showing 4 changed files
SPECS/libarchive/libarchive.spec
History View file @ f8eb1f1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:    Multi-format archive and compression library
2 2 
 Name:       libarchive
3 3 
 Version:    3.3.1
4 
-Release:    1%{?dist}
4 
+Release:    2%{?dist}
5 5 
 License:    BSD 2-Clause License
6 6 
 URL:        http://www.libarchive.org/
7 7 
 Group:      System Environment/Development
... ... 
@@ -9,7 +9,9 @@ Vendor:     VMware, Inc.
9 9 
 Distribution:   Photon
10 10 
 Source0:    http://www.libarchive.org/downloads/%{name}-%{version}.tar.gz
11 11 
 %define sha1 libarchive=d5616f81804aba92547629c08a3ccff86c2844ae
12 
-
12 
+BuildRequires:  xz-libs
13 
+BuildRequires:  xz-devel
14 
+Requires:       xz-libs
13 15 
 %description
14 16 
 Multi-format archive and compression library
15 17
... ... 
@@ -52,6 +54,8 @@ make %{?_smp_mflags} check
52 52 
 %{_libdir}/pkgconfig/*.pc
53 53
54 54 
 %changelog
55 
+*   Fri Sep 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.3.1-2
56 
+-   Add xz-libs and xz-devel to BuildRequires and Requires
55 57 
 *   Mon Apr 03 2017 Divya Thaluru <dthaluru@vmware.com> 3.3.1-1
56 58 
 -   Upgrade version to 3.3.1
57 59 
 *   Tue Sep 27 2016 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-1
SPECS/rpm-ostree/Makefile-test.patch
History View file @ f8eb1f1
58 60 
new file mode 100644
... ... 
@@ -0,0 +1,28 @@
0 
+diff -dupr a/Makefile-tests.am b/Makefile-tests.am
1 
+--- a/Makefile-tests.am	2017-04-13 15:42:06.000000000 +0000
2 
+@@ -55,7 +55,7 @@ $(foreach pkg,$(testpackages),$(eval $(c
3 
+
4 
+ tests/common/compose/yum/repo/repodata/repomd.xml: $(testpackages)
5 
+ 	(cd tests/common/compose/yum/repo && \
6 
+-	 createrepo_c --no-database $$PWD)
7 
++	 createrepo --no-database $$PWD)
8 
+
9 
+ tests/common/compose/test-repo.repo: tests/common/compose/test-repo.repo.in \
10 
+                                      tests/common/compose/yum/repo/repodata/repomd.xml
11 
+@@ -79,7 +79,6 @@ tests_check_postprocess_LDADD = $(PKGDEP
12 
+
13 
+ tests/check/test-compose.sh: tests/common/compose/test-repo.repo
14 
+
15 
+-tests/check/test-ucontainer.sh: tests/common/compose/test-repo.repo
16 
+
17 
+ uninstalled_test_programs = \
18 
+ 	tests/check/jsonutil			\
19 
+@@ -90,7 +89,6 @@ uninstalled_test_programs = \
20 
+ uninstalled_test_scripts = \
21 
+ 	tests/check/test-basic.sh \
22 
+ 	tests/check/test-compose.sh \
23 
+-	tests/check/test-ucontainer.sh \
24 
+ 	$(NULL)
25 
+
26 
+ uninstalled_test_extra_programs = dbus-run-session
SPECS/rpm-ostree/Set-arch.patch
History View file @ f8eb1f1
0 27 
new file mode 100644
... ... 
@@ -0,0 +1,12 @@
0 
+diff -dupr a/tests/check/test-compose.sh b/tests/check/test-compose.sh
1 
+--- a/tests/check/test-compose.sh	2017-04-13 15:42:06.000000000 +0000
2 
+@@ -31,7 +31,7 @@ export RPMOSTREE_UNINSTALLED_PKGLIBDIR=$
3 
+
4 
+ composedir=${commondir}/compose
5 
+
6 
+-arch=$(arch)
7 
++arch=x86_64
8 
+ if ! test "${arch}" = x86_64; then
9 
+     echo 1>&2 "$0 can be run only on x86_64"; echo "1..0" ; exit 77
10 
+ fi
SPECS/rpm-ostree/rpm-ostree.spec
History View file @ f8eb1f1
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Commit RPMs to an OSTree repository
2 2 
 Name:           rpm-ostree
3 3 
 Version:        2017.4
4 
-Release:        3%{?dist}
4 
+Release:        4%{?dist}
5 5 
 Source0:        rpm-ostree-%{version}.tar.gz
6 6 
 %define sha1    rpm-ostree=d34882a455afbf0b57617c0962725276967e838a
7 7 
 Source1:        libglnx-0c52d85.tar.gz
... ... 
@@ -9,6 +9,8 @@ Source1:        libglnx-0c52d85.tar.gz
9 9 
 Source2:        libdnf-2086268.tar.gz
10 10 
 %define sha1    libdnf=4e913da416c61a5525f94ef09f38c658179e3e25
11 11 
 Patch0:         rpm-ostree-libdnf-build.patch
12 
+Patch1:         Set-arch.patch
13 
+Patch2:         Makefile-test.patch
12 14 
 License:        LGPLv2+
13 15 
 URL:            https://github.com/projectatomic/rpm-ostree
14 16 
 Vendor:         VMware, Inc.
... ... 
@@ -42,6 +44,12 @@ BuildRequires:  libarchive-devel
42 42 
 BuildRequires:  gperf
43 43 
 BuildRequires:  which
44 44 
 BuildRequires:  popt-devel
45 
+BuildRequires:  createrepo
46 
+BuildRequires:  jq
47 
+BuildRequires:  photon-release
48 
+BuildRequires:  photon-repos
49 
+BuildRequires:  bubblewrap
50 
+BuildRequires:  dbus
45 51
46 52 
 Requires:       libcap
47 53 
 Requires:       librepo
... ... 
@@ -69,6 +77,8 @@ Includes the header files for the rpm-ostree library.
69 69 
 tar xf /usr/src/photon/SOURCES/libglnx-0c52d85.tar.gz --no-same-owner
70 70 
 tar xf /usr/src/photon/SOURCES/libdnf-2086268.tar.gz --no-same-owner
71 71 
 %patch0 -p0
72 
+%patch1 -p1
73 
+%patch2 -p1
72 74
73 75 
 %build
74 76 
 sed -i '/-DBUILD_SHARED_LIBS/a -DWITH_MAN=OFF \\' configure.ac
... ... 
@@ -81,7 +91,7 @@ make install DESTDIR=%{buildroot} INSTALL="install -p -c"
81 81 
 find %{buildroot} -name '*.la' -delete
82 82
83 83 
 %check
84 
-make %{?_smp_mflags}  check
84 
+make check
85 85
86 86 
 %files
87 87 
 %{_bindir}/*
... ... 
@@ -102,6 +112,8 @@ make %{?_smp_mflags}  check
102 102 
 %{_datadir}/gir-1.0/*-1.0.gir
103 103
104 104 
 %changelog
105 
+*   Fri Sep 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 2017.4-4
106 
+-   Changes for Makecheck
105 107 
 *   Thu Aug 03 2017 Xiaolin Li <xiaolinl@vmware.com> 2017.4-3
106 108 
 -   Added bubblewrap to requires.
107 109 
 *   Mon May 08 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2017.4-2