[PATCH 2.6.15-rc2-git6] Fix tar-pkg target

[PATCH 2.6.15-rc2-git6] Fix tar-pkg target

[Erik Mouw]

Hi,

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.


Erik

Signed-off-by: Erik Mouw <erik@harddisk-recovery.com>

diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index d8fffe6..4c1b706 100644
--- 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}"
 tmpdir="${objtree}/tar-install"
 tarball="${objtree}/linux-${version}.tar"
 

Re: [PATCH 2.6.15-rc2-git6] Fix tar-pkg target

[Jan-Benedict Glaw]

[-- Attachment #1: Type: text/plain, Size: 763 bytes --]

On Mon, 2005-11-28 18:04:15 +0100, Erik Mouw <erik@harddisk-recovery.com> wrote:
> 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.
> 
> Signed-off-by: Erik Mouw <erik@harddisk-recovery.com>

ACKed-By: Jan-Benedict Glaw <jbglaw@lug-owl.de>


MfG, JBG

-- 
Jan-Benedict Glaw       jbglaw@lug-owl.de    . +49-172-7608481             _ O _
"Eine Freie Meinung in  einem Freien Kopf    | Gegen Zensur | Gegen Krieg  _ _ O
 für einen Freien Staat voll Freier Bürger"  | im Internet! |   im Irak!   O O O
ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA));

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 2.6.15-rc2-git6] Fix tar-pkg target

[Andrew Morton]

Erik Mouw <erik@harddisk-recovery.com> 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 <bgerst@didntduck.org>

Clean up two more open-coded uses of KERNELRELEASE.

Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 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"
 
_

Re: [PATCH 2.6.15-rc2-git6] Fix tar-pkg target

[Sam Ravnborg]

> 
> 
> I already have the below queued up, which is a bit different.  Does it work
> OK?

Brian's version preserve EXTRANAME, but I have not seen it
used/documented anywhere?

	Sam

Re: [PATCH 2.6.15-rc2-git6] Fix tar-pkg target

[Brian Gerst]

Sam Ravnborg wrote:
>>
>> I already have the below queued up, which is a bit different.  Does it work
>> OK?
> 
> Brian's version preserve EXTRANAME, but I have not seen it
> used/documented anywhere?
> 
> 	Sam

Can probably get rid of EXTRANAME, unless it is meant to be set from the 
environment/cmdline.  I can't find any other reference to it.

--
				Brian Gerst

Re: [PATCH 2.6.15-rc2-git6] Fix tar-pkg target

[Jan-Benedict Glaw]

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

On Wed, 2005-11-30 00:32:50 -0500, Brian Gerst <bgerst@didntduck.org> wrote:
> Sam Ravnborg wrote:
> >>I already have the below queued up, which is a bit different.  Does it 
> >>work
> >>OK?
> >
> >Brian's version preserve EXTRANAME, but I have not seen it
> >used/documented anywhere?
> 
> Can probably get rid of EXTRANAME, unless it is meant to be set from the 
> environment/cmdline.  I can't find any other reference to it.

Exactly that was IIRC the intention when this came in. I'm fine with
removing it.

MfG, JBG

-- 
Jan-Benedict Glaw       jbglaw@lug-owl.de    . +49-172-7608481             _ O _
"Eine Freie Meinung in  einem Freien Kopf    | Gegen Zensur | Gegen Krieg  _ _ O
 für einen Freien Staat voll Freier Bürger"  | im Internet! |   im Irak!   O O O
ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA));

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 2.6.15-rc2-git6] Fix tar-pkg target

[Erik Mouw]

On Tue, Nov 29, 2005 at 09:36:22PM +0100, Sam Ravnborg wrote:
> > 
> > 
> > I already have the below queued up, which is a bit different.  Does it work
> > OK?
> 
> Brian's version preserve EXTRANAME, but I have not seen it
> used/documented anywhere?

It isn't used anywhere:

erik@zurix:~/git/linux-2.6 > find . -name Kconfig | xargs grep EXTRANAME
[nothing]

If there is a use for EXTRANAME, it should be included in the
KERNELRELEASE variable in the top level Makefile. As long as all
package scripts use the KERNELRELEASE variable, everything will be
fine.


Erik

-- 
+-- Erik Mouw -- www.harddisk-recovery.com -- +31 70 370 12 90 --
| Lab address: Delftechpark 26, 2628 XH, Delft, The Netherlands