Pārlūkot izejas kodu

Replace '-' in kernel version with '_'

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.

Signed-off-by: Arun Sharma <asharma@fb.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Arun Sharma 14 gadi atpakaļ
vecāks
revīzija
e1287eb891
2 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 1 1
      scripts/package/Makefile
  2. 1 1
      scripts/package/mkspec

+ 1 - 1
scripts/package/Makefile

@@ -26,7 +26,7 @@ RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
 	           else echo rpm; fi)
 	           else echo rpm; fi)
 
 
 # Remove hyphens since they have special meaning in RPM filenames
 # Remove hyphens since they have special meaning in RPM filenames
-KERNELPATH := kernel-$(subst -,,$(KERNELRELEASE))
+KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
 MKSPEC     := $(srctree)/scripts/package/mkspec
 MKSPEC     := $(srctree)/scripts/package/mkspec
 PREV       := set -e; cd ..;
 PREV       := set -e; cd ..;
 
 

+ 1 - 1
scripts/package/mkspec

@@ -22,7 +22,7 @@ if [ "`grep CONFIG_DRM=y .config | cut -f2 -d\=`" = "y" ]; then
 fi
 fi
 
 
 PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
 PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-//g"`
+__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-/_/g"`
 
 
 echo "Name: kernel"
 echo "Name: kernel"
 echo "Summary: The Linux Kernel"
 echo "Summary: The Linux Kernel"