janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 22:50:39 +01:00
Code Activity

linux-rpm.mk: Fix extraversion handling

Browse source 
- Backup commit
  - Make exraversion processing cope with missing blank in linux-<version>/Makefile
  - Change processing of extraversion so that the rpm release
    is always appended to the end, regardles of whether the former extraversion
    starts with '-' or '.' . I *think* the is good, but I still ran into problems
    in rpmbuild
This commit is contained in:
Markus Bentrup 2007-07-09 09:08:59 +00:00 • committed by Jan Lindemann
commit bedb1836a1
1 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
make/linux-rpm.mk
View file

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