From 0cd19b09d7ff61131504c644b9f2d0ae7d65792b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= Date: Thu, 24 Jul 2014 13:30:19 +0200 Subject: Allow re-execution of the %prep section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- packaging/rpm.spec | 20 ++++++++++---------- 1 file 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 -- cgit v1.2.3