Erik Mouw <[email protected]> wrote:
>
> The various tar-pkg Makefile targets forget to apply the
> CONFIG_LOCALVERSION_AUTO to the vminux and System.map files because the
> script (scripts/package/buildtar) doesn't know about it. This can be
> fixed by computing the correct "version" variable, but it's better to
> use the one computed by Kbuild itself, just like the like the
> "builddeb" and "mkspec" scripts do.
>
> Without this patch, "make tar-pkg" would generate a file
> linux-2.6.15-rc2.tar containing vmlinuz-2.6.15-rc2. With this patch, it
> generates linux-2.6.15-rc2-g458af543.tar containing
> vmlinuz-2.6.15-rc2-g458af543.
>
> ...
> --- a/scripts/package/buildtar
> +++ b/scripts/package/buildtar
> @@ -15,7 +15,7 @@ set -e
> #
> # Some variables and settings used throughout the script
> #
> -version="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}${EXTRANAME}"
> +version="${KERNELRELEASE}"
I already have the below queued up, which is a bit different. Does it work
OK?
From: Brian Gerst <[email protected]>
Clean up two more open-coded uses of KERNELRELEASE.
Signed-off-by: Brian Gerst <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
arch/frv/boot/Makefile | 4 ++--
scripts/package/buildtar | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/frv/boot/Makefile~use-kernelrelease arch/frv/boot/Makefile
--- devel/arch/frv/boot/Makefile~use-kernelrelease 2005-11-27 21:56:54.000000000 -0800
+++ devel-akpm/arch/frv/boot/Makefile 2005-11-27 21:56:54.000000000 -0800
@@ -57,10 +57,10 @@ initrd:
# installation
#
install: $(CONFIGURE) Image
- sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) Image $(TOPDIR)/System.map "$(INSTALL_PATH)"
+ sh ./install.sh $(KERNELRELEASE) Image $(TOPDIR)/System.map "$(INSTALL_PATH)"
zinstall: $(CONFIGURE) zImage
- sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
+ sh ./install.sh $(KERNELRELEASE) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
#
# miscellany
diff -puN scripts/package/buildtar~use-kernelrelease scripts/package/buildtar
--- devel/scripts/package/buildtar~use-kernelrelease 2005-11-27 21:56:54.000000000 -0800
+++ devel-akpm/scripts/package/buildtar 2005-11-27 21:56:54.000000000 -0800
@@ -15,7 +15,7 @@ set -e
#
# Some variables and settings used throughout the script
#
-version="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}${EXTRANAME}"
+version="${KERNELRELEASE}${EXTRANAME}"
tmpdir="${objtree}/tar-install"
tarball="${objtree}/linux-${version}.tar"
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
