diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-07-24 13:30:19 +0200 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-08-04 08:54:41 +0200 |
| commit | 0cd19b09d7ff61131504c644b9f2d0ae7d65792b (patch) | |
| tree | d88b43d4422fddf9b80c6baad349808847a49e86 | |
| parent | c528674145287d49ce3a655c6397914cbf61b551 (diff) | |
| download | rpm-0cd19b09d7ff61131504c644b9f2d0ae7d65792b.tar.gz rpm-0cd19b09d7ff61131504c644b9f2d0ae7d65792b.tar.bz2 rpm-0cd19b09d7ff61131504c644b9f2d0ae7d65792b.zip | |
Allow re-execution of the %prep section
With Yocto, when building rpm a second time, the do_prep() function
fails because it assumes it hasn't already ran but will be re-using the
previous build directory which hasn't been cleaned. This patch prevent
such a situation to fail.
This issue is not present when building with GBS since every new build
is made in a clean directory but since the yocto recipes are generated
from spec file, it is better to directly correct the spec file.
This patch has no impact on the GBS build.
Bug-Tizen: BTY-15
Change-Id: I1e992b63b41ae76a4d6706046e741dc2d25b15eb
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
| -rw-r--r-- | packaging/rpm.spec | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/packaging/rpm.spec b/packaging/rpm.spec index 07fdb8c51..1868d124b 100644 --- a/packaging/rpm.spec +++ b/packaging/rpm.spec @@ -38,16 +38,16 @@ BuildRequires: fdupes Provides: rpminst Provides: rpm-libs -Source1: db-4.8.30.tar.bz2 -Source2: db-4.8.30-integration.dif -Source4: rpm-tizen_macros -Source8: rpmconfigcheck -Source13: find-docs.sh -Source22: device-sec-policy -Source23: find-provides.ksyms -Source1001: rpm.manifest +Source1: db-4.8.30.tar.bz2 +Source2: db-4.8.30-integration.dif +Source4: rpm-tizen_macros +Source8: rpmconfigcheck +Source13: find-docs.sh +Source22: device-sec-policy +Source23: find-provides.ksyms +Source1001: rpm.manifest Source0: rpm-%{version}.tar.bz2 -# + # avoid bootstrapping problem %define _binary_payload w9.bzdio @@ -118,7 +118,7 @@ that will manipulate RPM packages and databases. cp %{SOURCE1001} . rm -rf sqlite tar xjf %{S:1} -ln -s db-4.8.30 db +ln -sfn db-4.8.30 db chmod -R u+w db/* # will get linked from db3 rm -f rpmdb/db.h |