diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2020-09-16 21:04:24 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2020-09-21 07:00:26 +0000 |
| commit | 27b50fea143f2d45613ef982870cd2052e21fb0f (patch) | |
| tree | 447437c4f69d2d706da681f87424989211fd5cda | |
| parent | bc35f469c89daf0126937580b6972516b5007d3a (diff) | |
build: touch files when extracting rpm tarballs
Type: fix
- Long story short, intermittently centos jobs have been
failing with clock skew issues. When someone commits a
patch on a machine with the date ahead of UTC, then clock
skew will be encountered when extracting the RPM source
tarball. See [0] and [1] for details.
- Replace 'make bootstrap' with 'make install-dep' in
RPM package build specfile.
[0] https://unix.stackexchange.com/questions/164807/does-git-archive-use-the-wrong-file-timestamp
[1] https://git.fd.io/vpp/tree/Makefile#n380
Change-Id: Iebfb9eb2e26c1f2e4488e871da86d0c60b9f4048
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
| -rw-r--r-- | extras/rpm/vpp.spec | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index 038c10bc9ff..1bb78af8cf7 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -168,7 +168,10 @@ Requires(post): python3-policycoreutils This package contains a tailored VPP SELinux policy %prep -%setup -q -n %{name}-%{_version} +%setup -q -c -T -n %{name}-%{_version} +cd .. +unxz --stdout ./SOURCES/%{name}-%{_version}-%{_release}.tar.xz | tar --extract --touch +cd - %pre # Add the vpp group @@ -179,7 +182,7 @@ groupadd -f -r vpp . /opt/rh/devtoolset-9/enable %endif %if %{with aesni} - make bootstrap + make install-dep make -C build-root PLATFORM=vpp TAG=%{_vpp_tag} install-packages %else make bootstrap AESNI=n |