From patchwork Tue May  3 21:45:43 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Arun Sharma <asharma@fb.com>
X-Patchwork-Id: 751792
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p43Ljl0K025652
	for <patchwork-kbuild@patchwork.kernel.org>;
	Tue, 3 May 2011 21:45:47 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754934Ab1ECVpq (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Tue, 3 May 2011 17:45:46 -0400
Received: from outmail011.snc4.facebook.com ([66.220.144.143]:36137 "EHLO
	mx-out.facebook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1754124Ab1ECVpq (ORCPT
	<rfc822;linux-kbuild@vger.kernel.org>);
	Tue, 3 May 2011 17:45:46 -0400
Received: from [10.47.65.39] ([10.47.65.39:40698] helo=facebook.com)
	by mta027.snc4.facebook.com (envelope-from <asharma@fb.com>)
	(ecelerity 2.2.2.45 r(34222M)) with ESMTP
	id 0F/5A-12201-98770CD4; Tue, 03 May 2011 14:45:45 -0700
Received: from dev1756.snc6.facebook.com (localhost.localdomain [127.0.0.1])
	by dev1756.snc6.facebook.com (Postfix) with ESMTP id A5275918350;
	Tue,  3 May 2011 14:45:45 -0700 (PDT)
Received: (from asharma@localhost)
	by dev1756.snc6.facebook.com (8.13.8/8.13.8/Submit) id p43Ljhq0026439;
	Tue, 3 May 2011 14:45:43 -0700
X-Authentication-Warning: dev1756.snc6.facebook.com: asharma set sender to
	asharma@fb.com using -f
Date: Tue, 3 May 2011 14:45:43 -0700
From: Arun Sharma <asharma@fb.com>
To: linux-kbuild@vger.kernel.org
Subject: [PATCH] Replace '-' in kernel version with '_'
Message-ID: <20110503214543.GA25962@dev1756.snc6.facebook.com>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]);
	Tue, 03 May 2011 21:45:47 +0000 (UTC)

Removing the '-' results in hard to read filenames such as:
kernel-2.6.35.2000042g76e4caf-28.x86_64.rpm

kernel-2.6.35.2_000042_g76e4caf-28.x86_64.rpm is easier to
read.

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index d0b931b..30b437f 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -26,7 +26,7 @@ RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
 	           else echo rpm; fi)
 
 # Remove hyphens since they have special meaning in RPM filenames
-KERNELPATH := kernel-$(subst -,,$(KERNELRELEASE))
+KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
 MKSPEC     := $(srctree)/scripts/package/mkspec
 PREV       := set -e; cd ..;
 
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 65845b4..309a275 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -22,7 +22,7 @@ if [ "`grep CONFIG_DRM=y .config | cut -f2 -d\=`" = "y" ]; then
 fi
 
 PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-//g"`
+__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-/_/g"`
 
 echo "Name: kernel"
 echo "Summary: The Linux Kernel"