janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

linux-rpm.mk: Revert to CVS revision 1.37

Browse source 
Go back to revision 1.37 of linux-rpm.mk, undoing Benno's changes in
the last two revisions, since they made kernels with Torvalds-defined
EXTRAVERSIONs stop working
This commit is contained in:
Jan Lindemann 2007-09-09 16:28:58 +00:00 • committed by Jan Lindemann
commit 3573120b9e
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
make/linux-rpm.mk
View file

@ -67,16 +67,24 @@ config-$(KERNEL_VERSION):
cvs commit $@
toplevel-makefile: unpack.done patches.done
awk -F = -v release=$(RPM_RELEASE) '{ \
if ($$0 ~ /EXTRAVERSION[ ]*=/) { \
if (release ~ "^ *$$") { \
printf "EXTRAVERSION =\n" \
} else { \
printf "EXTRAVERSION = -%s\n",release \
} \
} else { \
print $$0 \
} \
awk -v release=$(RPM_RELEASE) '{ \
if ($$0 ~ /EXTRAVERSION *= *-/) { \
oldextra=$$3; \
gsub(/-/,_,oldextra); \
printf "EXTRAVERSION = -%s_%s\n", release, oldextra \
} else if ($$0 ~ /EXTRAVERSION *= *\./) { \
oldextra=$$3; \
gsub(/-/,_,oldextra); \
printf "EXTRAVERSION = %s-%s\n",oldextra, release \
} else if ($$0 ~ /EXTRAVERSION *= *$$/) { \
if (release ~ "^ *$$") { \
printf "EXTRAVERSION =\n" \
} else { \
printf "EXTRAVERSION = -%s\n",release \
} \
} else { \
print $$0 \
} \
}' linux-$(KERNEL_VERSION)/Makefile >$@
linux-$(KERNEL_VERSION)/Makefile: toplevel-makefile
@ -156,5 +164,5 @@ thisclean:
export \
TOPDIR MODDIR KERNEL_VERSION RPM_RELEASE HOST KERNEL_PKG_SUFFIX CUSTOMER \
KERNEL_BASE_DIR KERNEL_PKG KERNEL_BASE UPLOAD_HOST UPLOAD_PATH \
UPLOAD_OWNER BOOT_LABEL PATCHES KERNEL_MAJOR KERNEL_MINOR \
UPLOAD_OWNER BOOT_LABEL BOOT_LABEL PATCHES KERNEL_MAJOR KERNEL_MINOR \
KERNEL_RELEASE WD