diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2018-04-06 15:13:41 -0400 |
|---|---|---|
| committer |   Chris Luke <chris_luke@comcast.com> | 2018-04-08 13:34:41 +0000 |
| commit | decc3c52d752ba12db2fdc51e35dc7f92fe81133 (patch) | |
| tree | f2114262e60ab564e7c82df2dfe43d4c948e64f7 | |
| parent | 88f0a3d93093f1301cdab8157f145ab5bdc91ec9 (diff) | |
Restore building of debuginfo RPMs
JIRA: VPP-1227
Remove rpm tmp dir build debuginfo rpms.
Reverses commits to fix a build problem with old versions of rpmbuild
that prevented builds in chrooted environments with short paths
and short project names.
Change-Id: I852696dccc984bf4882fd3ca9ec4c8da080bdb41
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
| -rw-r--r-- | extras/rpm/vpp.spec | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index eb47b1b892e..df9030ea08e 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -3,8 +3,7 @@ %define _vpp_build_dir build-tool-native %define _unitdir /lib/systemd/system %define _builddir %{_topdir} -%define _tmp_build_dir %{name}-%{_version}.0 -%define _mu_build_dir %{_topdir}/%{_tmp_build_dir}/build-root +%define _mu_build_dir %{_topdir}/%{name}-%{_version}/build-root %define _vpp_tag %{getenv:TAG} %if "%{_vpp_tag}" == "" %define _vpp_tag vpp @@ -151,20 +150,13 @@ Requires(post): selinux-policy-base >= %{selinux_policyver}, selinux-policy-targ This package contains a tailored VPP SELinux policy %prep -# Unpack into dir with longer name as work around of debugedit bug in in rpm-build 4.13 -rm -rf %{name}-%{_version} -rm -rf %{_tmp_build_dir} -/usr/bin/xz -dc '%{_sourcedir}/%{name}-%{_version}-%{_release}.tar.xz' | /usr/bin/tar -xf - -mv %{name}-%{_version} %{_tmp_build_dir} -cd '%{_tmp_build_dir}' -/usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . +%setup -q -n %{name}-%{_version} %pre # Add the vpp group groupadd -f -r vpp %build -cd '%{_tmp_build_dir}' %if %{with aesni} make bootstrap make -C build-root PLATFORM=vpp TAG=%{_vpp_tag} install-packages |