Whamcloud - gitweb
LU-363 don't cache BUILD for reuse
authorBrian J. Murrell <brian@whamcloud.com>
Wed, 11 May 2011 13:19:56 +0000 (09:19 -0400)
committerJohann Lombardi <johann@whamcloud.com>
Tue, 7 Jun 2011 14:32:22 +0000 (07:32 -0700)
Since future builds don't actually need the %_topdir/BUILD subdir,
and it's huge, don't bother caching it.

Increment the toplevel BUILD_GEN to force a rebuild of all of the
kernels.

Signed-off-by: Brian J. Murrell <brian@whamcloud.com>
Change-Id: I6a7a523fdaed2073d719f44a24b556bc4595d4ec
Reviewed-on: http://review.whamcloud.com/863
Tested-by: Hudson
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Chris Gearing <chris@whamcloud.com>
Reviewed-by: Michael MacDonald <mjmac@whamcloud.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
build/lbuild
build/lbuild-rhel
build/lbuild-rhel6
build/lbuild-sles

index f6be0ae..844afcf 100755 (executable)
@@ -22,6 +22,10 @@ shopt -s extdebug
 # our children should die when we do
 push_exit_trap "kill -INT -$$ || true" kill_children
 
+# increment this if you have made a change that should force a new kernel
+# to build built
+BUILD_GEN=1
+
 TOPDIR=$PWD
 
 # CVSROOT is inherited from the environment
@@ -1253,7 +1257,7 @@ build_kernel_with_srpm() {
         else
             # store the resulting kernel RPM build tree for future use
             echo "Storing the built kernel for future reuse" >&${outfd}
-            if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
+            if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,SRPMS,RPMS}" \
                                  "kernel" "$REUSEBUILD" "$REUSE_SIGNATURE" \
                                  "$CAN_LINK_FOR_REUSE"; then
                 error "Failed to store kernel RPMS for reuse"
index 7aa092f..97a2774 100644 (file)
@@ -5,7 +5,8 @@
 # to force a kernel build on all distributions, update the BUILD_GEN variable
 # in build/lbuild)
 #BUILD_GEN+=".0"
-BUILD_GEN+=".1"        # refactor both rhel5 and rhel6
+#BUILD_GEN+=".1"       # refactor both rhel5 and rhel6
+BUILD_GEN+=".0"        # TT-107: don't cache the BUILD dir (reset major to 5)
 
 DEVEL_KERNEL_TYPE="devel"
 RPM_HELPERS_DIR="/usr/lib/rpm/redhat"
index 53bcee7..07cc7ea 100644 (file)
@@ -6,7 +6,8 @@
 # variable in build/lbuild-rhel and if you want to force kernel bulid for all
 # distributions, update the BUILD_GEN variable in build/lbuild)
 #BUILD_GEN+=".0"
-BUILD_GEN+=".1"                # added --with firmware to rpmbuild for rhel6
+#BUILD_GEN+=".1"               # added --with firmware to rpmbuild for rhel6
+BUILD_GEN+=".0"        # TT-107: don't cache the BUILD dir (reset major to 5)
 
 source ${0%/*}/lbuild-rhel
 
index 8037bca..e61b27f 100644 (file)
@@ -1,5 +1,9 @@
 # vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
 
+# increment this if you have made a change that should force a new kernel
+# to build built
+BUILD_GEN+=".0"        # TT-107: don't cache the BUILD dir (reset major to 5)
+
 DEVEL_KERNEL_TYPE="source"
 RPM_HELPERS_DIR="/usr/lib/rpm"