Skip to contentSkip to conversation

Fix tar-pkg target

PATCH In review Erik Mouw 5 participants 7 messages Nov 28, 2005 – Nov 30, 2005 Kbuild

lore
Share & tools
lore

Erik Mouw

author
#0 lore raw

PATCH 1/1 Fix tar-pkg target

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

scripts/package/buildtar +1 -1
index d8fffe6..4c1b706 100644
@@ -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"
 
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Erik Mouw

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.

MfG, JBG

Signature · 4 lines
Jan-Benedict Glaw       [email protected]    . +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));
#2 lore raw
In reply to Erik Mouw
Quoted 17 lines · Erik Mouw

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.

...

scripts/package/buildtar set -e · line 18

Quoted 5 lines
scripts/package/buildtar +1 -1
@@ -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.

---

 arch/frv/boot/Makefile   |    4 ++--
 scripts/package/buildtar |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/frv/boot/Makefile renamed from arch/frv/boot/Makefile~use-kernelrelease +2 -2
diff -puN arch/frv/boot/Makefile~use-kernelrelease arch/frv/boot/Makefile
@@ -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
scripts/package/buildtar renamed from scripts/package/buildtar~use-kernelrelease +1 -1
diff -puN scripts/package/buildtar~use-kernelrelease 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}${EXTRANAME}"
 tmpdir="${objtree}/tar-install"
 tarball="${objtree}/linux-${version}.tar"
 

_

#3 lore raw
Quoted 4 lines

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

#4 lore raw
Quoted 8 lines · Sam Ravnborg
Quoted 3 lines

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

#5 lore raw
Quoted 10 lines · Brian Gerst
Quoted 6 lines · Sam Ravnborg
Quoted 3 lines

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

Signature · 4 lines
Jan-Benedict Glaw       [email protected]    . +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));
author
#6 lore raw
In reply to Sam Ravnborg
Quoted 7 lines · Sam Ravnborg
Quoted 4 lines

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

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