Whamcloud - gitweb
LU-384 land bz22281 on b1_8
authorBrian J. Murrell <brian@whamcloud.com>
Wed, 1 Jun 2011 16:53:06 +0000 (12:53 -0400)
committerJohann Lombardi <johann@whamcloud.com>
Wed, 8 Jun 2011 18:56:11 +0000 (11:56 -0700)
commitc81b47a724dd4414b8bd79eb99b9737a70fd5855
tree16a7876a2ff460023aba7b6c81c7ae4814dceeee
parent7bad15c69c8baef6965db2d296e5b5175670af6a
LU-384 land bz22281 on b1_8

To facilitate distinctive naming, we need the work in bugzilla
22281 landed on b1_8.
Add an lbuild option to set the downstream-release.  Normally
this should not be exposed to/through lbuild as this was orig-
inally intended for downstream packages to add their own stamp
to the release string.

Include e4189c54470deff4a98f0b2bb03ac6be7ed85ce9:
    b=24095 don't really need configure --with-linux

    Don't really need to have run configure --with-linux for
    version-tag.pl to work.

    i=wangyb
    i=cliff

Expand the list of debian/* files that should be included in the
dist tarball.
Don't try to [un]patch the local-env.sh.  It should never really
be included in a landed patch.

Include most of 086ff8c46009479bfdac9f570331a6c93b7d52ac:

    b=24094 add kver; update kdir, kobjdir

    Add a new macro to allow the caller to simply define which kernel
    he wants to build for.
    Refactor the kdir and kobjdir to function more properly.
    Remove krequires.  Nothing is using it anymore.

    i=wangyb
    i=cliff

Include c1a61e3e9129d0e2062eed617d922e6dfa9ede5a:

    LU-284 strip .$arch off of kern vers for requires

    RHEL6 appends .arch to the end of the version in the utsrelease.h file.
    The kernel RPM however provides that value with the .arch stripped off,
    so do the same stripping in the lustre-modules RPM for it's Requires:.

Signed-off-by: Brian J. Murrell <brian@whamcloud.com>
    Change-Id: Ib6ff32c006f184edceb5d667b649bb106d503faf
    Reviewed-on: http://review.whamcloud.com/502
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: Hudson
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: Brian J. Murrell <brian@whamcloud.com>
Change-Id: I82f4f9a556fd1d1fc51ef8930e2017798ff88706
Reviewed-on: http://review.whamcloud.com/884
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
Tested-by: Hudson
18 files changed:
autoMakefile.am
build/autoMakefile.am.toplevel
build/autoconf/lustre-build-linux.m4
build/autoconf/lustre-build.m4
build/extract_patches
build/lbuild
build/lbuild-oel5
build/lbuild-sles10
build/lbuild-sles11
ldiskfs/autoMakefile.am
ldiskfs/configure.ac
ldiskfs/lustre-ldiskfs.spec.in
lustre.spec.in
lustre/scripts/Makefile.am
lustre/scripts/version_tag-cvs.pl [new file with mode: 0644]
lustre/scripts/version_tag-git.pl [new file with mode: 0644]
lustre/scripts/version_tag-none.pl [new file with mode: 0644]
lustre/scripts/version_tag.pl