From c66d8316766c3b35032d6bee7113a74cd690105c Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 11 May 2011 09:19:56 -0400 Subject: [PATCH 1/1] LU-363 don't cache BUILD for reuse 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 Change-Id: Ibd3e10c4052ca8012c8fd507be99a3b24e68d71e Reviewed-on: http://review.whamcloud.com/533 Reviewed-by: Chris Gearing Reviewed-by: Yang Sheng Tested-by: Hudson Reviewed-by: Oleg Drokin --- build/lbuild | 5 +++-- build/lbuild-fc | 3 ++- build/lbuild-fc11 | 3 ++- build/lbuild-fc12 | 5 ++--- build/lbuild-rhel | 3 ++- build/lbuild-rhel6 | 3 ++- build/lbuild-sles | 4 ++++ 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/build/lbuild b/build/lbuild index 987aa79..0c05cfd 100755 --- a/build/lbuild +++ b/build/lbuild @@ -27,7 +27,8 @@ push_exit_trap "kill -INT -$$ || true" kill_children #BUILD_GEN=1 #BUILD_GEN=2 # bz19952: remove -lustre tag from kernel RPM names #BUILD_GEN=3 # bz19975: enable the building of src.rpms by default -BUILD_GEN=4 # bz22281: use the git hash in the kernel extra version +#BUILD_GEN=4 # bz22281: use the git hash in the kernel extra version +BUILD_GEN=5 # TT-107: don't cache the BUILD dir TOPDIR=$PWD @@ -1259,7 +1260,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" diff --git a/build/lbuild-fc b/build/lbuild-fc index 6e4607b..f3f8615 100644 --- a/build/lbuild-fc +++ b/build/lbuild-fc @@ -8,5 +8,6 @@ source ${0%/*}/lbuild-rhel5 # to build built #BUILD_GEN=1 #BUILD_GEN=2 # bz19952: remove -lustre tag from kernel RPM names -BUILD_GEN=3 # bz19975 enable the building of src.rpms by default +#BUILD_GEN=3 # bz19975 enable the building of src.rpms by default +BUILD_GEN+=".0" # TT-107: don't cache the BUILD dir (reset major to 5) diff --git a/build/lbuild-fc11 b/build/lbuild-fc11 index 5ec08c2..7f2c6bf 100644 --- a/build/lbuild-fc11 +++ b/build/lbuild-fc11 @@ -11,6 +11,7 @@ source ${0%/*}/lbuild-fc # to build built #BUILD_GEN=1 #BUILD_GEN=2 # bz19952: remove -lustre tag from kernel RPM names -BUILD_GEN=3 # bz19975 enable the building of src.rpms by default +#BUILD_GEN=3 # bz19975 enable the building of src.rpms by default +BUILD_GEN+=".0" # TT-107: don't cache the BUILD dir (reset major to 5) diff --git a/build/lbuild-fc12 b/build/lbuild-fc12 index db0c9ef..a4f7b2b 100644 --- a/build/lbuild-fc12 +++ b/build/lbuild-fc12 @@ -6,6 +6,5 @@ source ${0%/*}/lbuild-fc # to build built #BUILD_GEN=1 #BUILD_GEN=2 # bz19952: remove -lustre tag from kernel RPM names -BUILD_GEN=3 # bz19975 enable the building of src.rpms by default - - +#BUILD_GEN=3 # bz19975 enable the building of src.rpms by default +BUILD_GEN+=".0" # TT-107: don't cache the BUILD dir (reset major to 5) diff --git a/build/lbuild-rhel b/build/lbuild-rhel index 082476b..235debd 100644 --- a/build/lbuild-rhel +++ b/build/lbuild-rhel @@ -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" diff --git a/build/lbuild-rhel6 b/build/lbuild-rhel6 index 53bcee7..07cc7ea 100644 --- a/build/lbuild-rhel6 +++ b/build/lbuild-rhel6 @@ -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 diff --git a/build/lbuild-sles b/build/lbuild-sles index 8037bca..e61b27f 100644 --- a/build/lbuild-sles +++ b/build/lbuild-sles @@ -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" -- 1.8.3.1