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: Ditch original extraversion

Browse source 
not preserving original extraversion any longer, new extraversion
simply is the rpm release, this is a workaround for problems with
wrong paths in rpmbuild.  (One could argue that this is better
anyway, since now no information about applied patches is shown in
`uname`)
This commit is contained in:
Markus Bentrup 2007-07-09 09:16:46 +00:00 • committed by Jan Lindemann
commit 710350be09
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/linux-rpm.mk
View file

@ -52,11 +52,11 @@ $(KERNEL_PKG):
install -m 664 $(notdir $(KERNEL_PKG)) $@
EXTRAVERSION: linux-$(KERNEL_VERSION)/Makefile
sed '/^[ ]*EXTRAVERSION[ ]*=/ !d; s/^[ ]*EXTRAVERSION[ ]*=[ ]*//; s/[ ]*$$//' $< >$@
sed '/^ *EXTRAVERSION *=/ !d; s/^ *EXTRAVERSION *= *-*//; s/ *$$//' $< >$@
COMPLETE_VERSION: EXTRAVERSION
ifeq ($(shell echo $(KERNEL_VERSION) | sed '/[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*/ !d'),)
echo -n $(KERNEL_VERSION)$(EXTRAVERSION) | sed 's/- *$$//' > $@
echo -n $(KERNEL_VERSION)-$(EXTRAVERSION) | sed 's/- *$$//' > $@
else
echo -n $(KERNEL_MAJOR).$(KERNEL_MINOR).$(KERNEL_RELEASE)$(EXTRAVERSION) > $@
endif
@ -68,16 +68,12 @@ config-$(KERNEL_VERSION):
toplevel-makefile: unpack.done patches.done
awk -F = -v release=$(RPM_RELEASE) '{ \
if ($$0 ~ /EXTRAVERSION[ ]*=[ ]*$$/) { \
if ($$0 ~ /EXTRAVERSION[ ]*=/) { \
if (release ~ "^ *$$") { \
printf "EXTRAVERSION =\n" \
} else { \
printf "EXTRAVERSION = -%s\n",release \
} \
} else if ($$0 ~ /EXTRAVERSION[ ]*=[ ]*[^ ]+/) { \
oldextra=$$2; \
gsub(/ */,"",oldextra); \
printf "EXTRAVERSION = %s-%s\n", oldextra, release \
} else { \
print $$0 \
} \