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: Fix COMPLETE_VERSION for realtime-kernels

Browse source 
- Fix COMPLETE_VERSION for patched EXTRAVERSIONs (2.6.24_rt15-1 instead of 2.6.24-1_rt15)
  (removed distinction between 3- and 4-digit versions)
- Patches now don't depend on unpack.done any longer
This commit is contained in:
Jan Lindemann 2008-02-01 13:10:13 +00:00 • committed by Jan Lindemann
commit a11e1f03f3
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
make/linux-rpm.mk
View file

@ -58,11 +58,11 @@ EXTRAVERSION: linux-$(KERNEL_VERSION)/Makefile
sed '/^ *EXTRAVERSION *=/ !d; s/^ *EXTRAVERSION *= *-*//; s/ *$$//' $< >$@ sed '/^ *EXTRAVERSION *=/ !d; s/^ *EXTRAVERSION *= *-*//; s/ *$$//' $< >$@
COMPLETE_VERSION: EXTRAVERSION COMPLETE_VERSION: EXTRAVERSION
ifeq ($(shell echo $(KERNEL_VERSION) | sed '/[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*/ !d'),) #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 #else
echo -n $(KERNEL_MAJOR).$(KERNEL_MINOR).$(KERNEL_RELEASE)$(EXTRAVERSION) > $@ echo -n $(KERNEL_MAJOR).$(KERNEL_MINOR).$(KERNEL_RELEASE)$(EXTRAVERSION) > $@
endif #endif
config-$(KERNEL_VERSION): config-$(KERNEL_VERSION):
cp $(shell ls config-$(KERNEL_MAJOR).$(KERNEL_MINOR).* | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]\)[.$$]./\1.\2.0\3/; s/\.\([0-9]\)$$/.0\1/' | sort -g | sed 's/\.0/./g; $$ !d') $@ cp $(shell ls config-$(KERNEL_MAJOR).$(KERNEL_MINOR).* | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]\)[.$$]./\1.\2.0\3/; s/\.\([0-9]\)$$/.0\1/' | sort -g | sed 's/\.0/./g; $$ !d') $@
@ -74,7 +74,7 @@ toplevel-makefile: unpack.done patches.done
if ($$0 ~ /EXTRAVERSION *= *-/) { \ if ($$0 ~ /EXTRAVERSION *= *-/) { \
oldextra=$$3; \ oldextra=$$3; \
gsub(/-/,_,oldextra); \ gsub(/-/,_,oldextra); \
printf "EXTRAVERSION = -%s_%s\n", release, oldextra \ printf "EXTRAVERSION = _%s-%s\n", oldextra, release \
} else if ($$0 ~ /EXTRAVERSION *= *\./) { \ } else if ($$0 ~ /EXTRAVERSION *= *\./) { \
oldextra=$$3; \ oldextra=$$3; \
gsub(/-/,_,oldextra); \ gsub(/-/,_,oldextra); \
@ -122,7 +122,8 @@ clean-patch-%:
rm -f patches/$*-$(KERNEL_VERSION).patch rm -f patches/$*-$(KERNEL_VERSION).patch
make patches/$*-$(KERNEL_VERSION).patch make patches/$*-$(KERNEL_VERSION).patch
patches/%-$(KERNEL_VERSION).patch: unpack.done patches/%-$(KERNEL_VERSION).patch:
make unpack.done
export LANG=en_US ;\ export LANG=en_US ;\
diff --exclude=CVS --unidirectional-new-file -aur \ diff --exclude=CVS --unidirectional-new-file -aur \
linux-$(KERNEL_VERSION) linux-$(KERNEL_VERSION)-$* | \ linux-$(KERNEL_VERSION) linux-$(KERNEL_VERSION)-$* | \