File _service:gitpkg:0008-Add-skip-prep-to-ask-a-sui... of Package build

Overview Repositories Revisions Requests Users Attributes Meta

File _service:gitpkg:0008-Add-skip-prep-to-ask-a-suitable-rpm-to-skip-the-prep.patch of Package build (Revision 5dd8f2e7853f93dca0a9a0abffbeb80f)

Currently displaying revision 5dd8f2e7853f93dca0a9a0abffbeb80f , Show latest

From f96be5b1a1ffe601012bfecada62d0b789c8e2c2 Mon Sep 17 00:00:00 2001
From: David Greaves <david@dgreaves.com>
Date: Fri, 27 Jul 2012 10:00:49 +0100
Subject: [PATCH] Add --skip-prep to ask a suitable rpm to skip the %prep phase

---
 build             | 7 +++++++
 build-recipe-spec | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 build

diff --git a/build b/build
old mode 100755
new mode 100644
index bfc1b3f..c7ec7e1
--- a/build
+++ b/build
@@ -198,6 +198,10 @@ Known Parameters:
               Exit once the chroot has been setup and before the build
               starts. Useful for making development root filesystems.
 
+  --skip-prep
+              When running build, skip the %prep phase. This can be
+              useful when using rsync.
+
   --no-checks Do not run checks (postbuild and %check)
 
   --logfile logfile
@@ -1056,6 +1060,9 @@ while test -n "$1"; do
       -chroot-only)
 	DO_BUILD=false
       ;;
+      -skip-prep)
+	SKIP_PREP=true
+      ;;
       -nochecks|-no-checks)
 	DO_CHECKS=false
       ;;
diff --git a/build-recipe-spec b/build-recipe-spec
index 0e08fc8..2336479 100644
--- a/build-recipe-spec
+++ b/build-recipe-spec
@@ -27,7 +27,7 @@ recipe_setup_spec() {
     if test -z "$TOPDIR"; then
 	cleanup_and_exit 1 "Error: TOPDIR empty"
     fi
-    test "$DO_INIT_TOPDIR" = false || spec_init_topdir
+    test -n "$SKIP_PREP" -o "$DO_INIT_TOPDIR" = false || spec_init_topdir
     for i in BUILD RPMS/`uname -m` RPMS/i386 RPMS/noarch SOURCES SPECS SRPMS BUILDROOT OTHER ; do
 	mkdir -p $BUILD_ROOT$TOPDIR/$i
     done
@@ -208,6 +208,10 @@ recipe_build_spec() {
 	rpmbopts[${#rpmbopts[@]}]='--define'
 	rpmbopts[${#rpmbopts[@]}]="RSYNCDONE 1"
     fi
+    if test -n "$SKIP_PREP" ; then
+	rpmbopts[${#rpmbopts[@]}]='--skip-prep'
+	rpmbopts[${#rpmbopts[@]}]='--skip-clean'
+    fi
 
     buildrootoverride=$(queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" buildflags rpm-buildroot-override)
     if test -n "$buildrootoverride" ; then
-- 
2.37.1

Places

File _service:gitpkg:0008-Add-skip-prep-to-ask-a-suitable-rpm-to-skip-the-prep.patch of Package build (Revision 5dd8f2e7853f93dca0a9a0abffbeb80f)

Places