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

From 30b2c876dff0308f62885074cb867e2ae88d2029 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 59e0c0e..911c02e
--- a/build
+++ b/build
@@ -155,6 +155,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)
 
   --lint      Run rpmlint after build.
@@ -720,6 +724,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 37f04e1..de850eb 100644
--- a/build-recipe-spec
+++ b/build-recipe-spec
@@ -27,7 +27,7 @@ recipe_setup_spec() {
 	echo "Error: TOPDIR empty"
 	cleanup_and_exit 1
     fi
-    test "$DO_INIT_TOPDIR" = false || rm -rf "$BUILD_ROOT$TOPDIR"
+    test -n "$SKIP_PREP" -o "$DO_INIT_TOPDIR" = false || rm -rf "$BUILD_ROOT$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
@@ -136,6 +136,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
 
     # su involves a shell which would require even more
     # complicated quoting to bypass than this
-- 
2.1.0

Places

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

Places