diff --git a/build/lbuild b/build/lbuild
index 42626cc53bd94fe15a4fa594da3ea2ec29b84669..8b3b5c56370b2d0800bdd1a14beb415c13fbc9d4 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -561,7 +561,7 @@ unpack_linux()
patch_linux()
{
[ "$SERIES" ] || return 0
- FULL_PATCH="$PWD/lustre-kernel-${TARGET}-${EXTRA_VERSION}.patch"
+ FULL_PATCH="$PWD/lustre-kernel-${TARGET}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}.patch"
[ -f "$FULL_PATCH" ] && rm -f "$FULL_PATCH"
pushd linux >/dev/null
for series in $SERIES ; do
@@ -628,6 +628,7 @@ prep_kernel_build()
-e "s^@ENABLE_INIT_SCRIPTS@^$ENABLE_INIT_SCRIPTS^g" \
-e "s^@JENSEN_ARCHS@^$BOOT_ARCHS^g" \
-e "s^@KERNEL_EXTRA_VERSION@^$EXTRA_VERSION^g" \
+ -e "s^@KERNEL_EXTRA_VERSION_DELIMITER@^$EXTRA_VERSION_DELIMITER^g" \
-e "s^@KERNEL_RELEASE@^${EXTRA_VERSION//-/_}^g" \
-e "s^@KERNEL_SOURCE@^$KERNEL^g" \
-e "s^@KERNEL_VERSION@^$VERSION^g" \
@@ -1523,6 +1524,7 @@ check_options
unpack_lustre
load_target
+EXTRA_VERSION_DELIMITER=${EXTRA_VERSION_DELIMITER:-"-"}
build_success=false
if $PATCHLESS; then
diff --git a/build/lmake b/build/lmake
index 9020cc1dba6b4285791adbe792a573b6e844df1a..8a0b47ba4bb7244524b1d6d4380611324909bf56 100755
--- a/build/lmake
+++ b/build/lmake
@@ -393,7 +393,7 @@ depend_kernel()
set_make
pushd "$TOPDIR/linux" >/dev/null
echo "Overriding EXTRAVERSION in kernel..."
- perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${EXTRA_VERSION}${TARGET_CONFIG}/" Makefile
+ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_CONFIG}/" Makefile
echo "Making depend in $PWD..."
$MAKE "$MAKE_CC" mrproper || fatal 1 "Error running make mrproper"
rm -f rpm-release
@@ -505,7 +505,7 @@ build_lustre()
{
(( $BUILD_LUSTRE )) || return 0
set_make
- FULL_VERSION="${VERSION}-${EXTRA_VERSION}${TARGET_CONFIG}"
+ FULL_VERSION="${VERSION}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_CONFIG}"
pushd "$TOPDIR" >/dev/null
sed \
-e s^@VERSION@^${LUSTRE_VERSION}^g \
@@ -526,7 +526,7 @@ install_kernel()
{
(( $INSTALL_KERNEL )) || return 0
set_make
- FULL_VERSION="${VERSION}-${EXTRA_VERSION}${TARGET_CONFIG}"
+ FULL_VERSION="${VERSION}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_CONFIG}"
pushd "$TOPDIR/linux" >/dev/null
mkdir -p "$DESTDIR/boot"
@@ -583,8 +583,8 @@ cleanup_libmodules()
{
(( $INSTALL_LUSTRE )) || return 0
- FULL_VERSION="${VERSION}-${EXTRA_VERSION}${TARGET_CONFIG}"
- KVERREL="${VERSION}-${EXTRA_VERSION}"
+ FULL_VERSION="${VERSION}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_CONFIG}"
+ KVERREL="${VERSION}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}"
i="$DESTDIR/lib/modules/${FULL_VERSION}"
rm -f $i/build
@@ -603,7 +603,7 @@ install_lustre()
(( $INSTALL_LUSTRE )) || return 0
return 0
set_make
- FULL_VERSION="${VERSION}-${EXTRA_VERSION}${TARGET_CONFIG}"
+ FULL_VERSION="${VERSION}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_CONFIG}"
pushd "$TOPDIR" >/dev/null
$MAKE "$MAKE_CC" -s install "DESTDIR=$DESTDIR" KERNELRELEASE="$FULL_VERSION" || fatal 1 "Error installing Lustre."
popd >/dev/null
@@ -614,7 +614,7 @@ build_kms()
(( $BUILD_KERNEL )) || return 0
(( $SUSEBUILD )) || return 0
set_make
- FULL_VERSION="${VERSION}-${EXTRA_VERSION}${TARGET_CONFIG}"
+ FULL_VERSION="${VERSION}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_CONFIG}"
mkdir -p "${TOPDIR}/modules-${FULL_VERSION}"
for dir in /usr/src/kernel-modules/* ; do
# we are replacing lustre-lite, so don't include it
@@ -639,7 +639,7 @@ install_kms()
(( $INSTALL_KERNEL )) || return 0
(( $LINUX26 )) || return 0
set_make
- FULL_VERSION="${VERSION}-${EXTRA_VERSION}${TARGET_CONFIG}"
+ FULL_VERSION="${VERSION}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_CONFIG}"
for build_dir in "${TOPDIR}/modules-${FULL_VERSION}/*" ; do
[ -d $build_dir ] || continue
# these modules are terrible, and don't all build
@@ -657,7 +657,7 @@ install_kms()
symver $module
done
) | sort -u -k2 \
- | gzip -c9 > "${DESTDIR}/boot/symvers-${VERSION}-${EXTRA_VERSION}-${TARGET_ARCH}${TARGET_CONFIG}.gz"
+ | gzip -c9 > "${DESTDIR}/boot/symvers-${VERSION}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}-${TARGET_ARCH}${TARGET_CONFIG}.gz"
}
save_headers()
@@ -667,7 +667,7 @@ save_headers()
echo "Saving headers for ${TARGET_CONFIG:-up} ${TARGET_ARCH}..."
pushd linux >/dev/null
- KVERREL="${VERSION}-${EXTRA_VERSION}"
+ KVERREL="${VERSION}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}"
# deal with the kernel headers that are version specific
saveddir="$RPM_BUILD_ROOT/usr/src/linux-${KVERREL}/savedheaders/${TARGET_ARCH}/${TARGET_CONFIG:-up}"
@@ -809,6 +809,7 @@ done
check_options
load_target
+EXTRA_VERSION_DELIMITER=${EXTRA_VERSION_DELIMITER:-"-"}
setup_ccache_distcc
extract_kernel
diff --git a/build/lustre-kernel-2.4.spec.in b/build/lustre-kernel-2.4.spec.in
index d77a0b8310f4188f5d9d0f31697b34805e7b251a..93450aeefc295dbaa01b6d5b9a8a4fb7189b1107 100644
--- a/build/lustre-kernel-2.4.spec.in
+++ b/build/lustre-kernel-2.4.spec.in
@@ -10,6 +10,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
#
%define kversion @KERNEL_VERSION@
%define kextraver @KERNEL_EXTRA_VERSION@
+%define kextraverdelim @KERNEL_EXTRA_VERSION_DELIMITER@
%define release @KERNEL_RELEASE@
# /usr/src/%{kslnk} -> /usr/src/linux-%{KVERREL}
%define kslnk linux-2.4
@@ -149,7 +150,7 @@ Second, per-architecture exclusions (ifarch)
Name: kernel-lustre
Version: %{kversion}
Release: %{release}%{?targetboard:%{targetboard}}%{?debuglevel_1:.dbg}
-%define KVERREL %{PACKAGE_VERSION}-%{kextraver}%{?targetboard:%{targetboard}}%{?debuglevel_1:.dbg}
+%define KVERREL %{PACKAGE_VERSION}%{kextraverdelim}%{kextraver}%{?targetboard:%{targetboard}}%{?debuglevel_1:.dbg}
License: GPL
Group: System Environment/Kernel
ExclusiveArch: %{all_x86} x86_64 ia64 ppc
@@ -631,7 +632,7 @@ BuildObj ()
flavext="-$flavor"
flavtgt="$flavor"
fi
- perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{kextraver}${flavtgt}/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
+ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{kextraverdelim}%{kextraver}${flavtgt}/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
c="$RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}"
o="${c}-obj/%{_target_cpu}/$flavor"
mkdir -p $o
@@ -717,7 +718,7 @@ if [ "%{buildbase}" -ne 0 ] ; then
if [ "%{buildup}" -ne 0 ] ; then
BuildObj up
fi
- perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{kextraver}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
+ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{kextraverdelim}%{kextraver}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
# Remove $RPM_BUILD_ROOT prefix from symlinks.
for link in $(find $objdir -type l); do
target=$(readlink $link)
@@ -725,7 +726,7 @@ if [ "%{buildbase}" -ne 0 ] ; then
ln -s ${target/$RPM_BUILD_ROOT/} $link
done
else # 2.4 rh-style
- perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{kextraver}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
+ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{kextraverdelim}%{kextraver}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
# get the one from the build we just completed as it might have picked
# up new options
#cp ../lustre/kernel_patches/kernel_configs/kernel-%{kversion}-@LUSTRE_TARGET@-%{_target_cpu}%{dashtargetboard}.config $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/.config