Annotation of /trunk/kernel26-openvz/patches-2.6.24_004.1-r1/0002-2.6.24-openvz-version-fix-004.1.patch
Parent Directory
| 
Revision Log
Revision 603 -
(hide annotations)
(download)
Wed May 21 09:35:08 2008 UTC (16 years ago) by niro
File size: 1360 byte(s)
Wed May 21 09:35:08 2008 UTC (16 years ago) by niro
File size: 1360 byte(s)
- 2.6.24-openvz_004.1-r1
| 1 | niro | 603 | diff -uprN linux-2.6.24/Makefile linux-2.6.24.ovz/Makefile |
| 2 | --- linux-2.6.24/Makefile 2008-01-24 17:58:37.000000000 -0500 | ||
| 3 | +++ linux-2.6.24.ovz/Makefile 2008-03-25 18:53:59.000000000 -0500 | ||
| 4 | @@ -2,6 +2,7 @@ VERSION = 2 | ||
| 5 | PATCHLEVEL = 6 | ||
| 6 | SUBLEVEL = 24 | ||
| 7 | EXTRAVERSION = @MAGELLAN_EXTRAVERSION@ | ||
| 8 | +VZVERSION = ovz004 | ||
| 9 | NAME = Arr Matey! A Hairy Bilge Rat! | ||
| 10 | |||
| 11 | # *DOCUMENTATION* | ||
| 12 | @@ -339,7 +340,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ | ||
| 13 | KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) | ||
| 14 | KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) | ||
| 15 | |||
| 16 | -export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION | ||
| 17 | +export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION VZVERSION | ||
| 18 | export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC | ||
| 19 | export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE | ||
| 20 | export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS | ||
| 21 | @@ -957,7 +958,8 @@ define filechk_utsrelease.h | ||
| 22 | echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2; \ | ||
| 23 | exit 1; \ | ||
| 24 | fi; \ | ||
| 25 | - (echo \#define UTS_RELEASE \"$(KERNELRELEASE)\";) | ||
| 26 | + (echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"; \ | ||
| 27 | + echo \#define VZVERSION \"$(VZVERSION)\";) | ||
| 28 | endef | ||
| 29 | |||
| 30 | define filechk_version.h |