Package: kernel-package
Version: 10.045
Severity: wishlist
Tags: patch
Hi Manoj,
Attached is a patch which removes ARCH_IN_NAME on sparc, as we discussed.
The official linux-2.6 packages have built fine with it. It also cleans up
all the stuff which becomes unnecessary with this removal.
Best regards,
Jurij Smakov [EMAIL PROTECTED]
Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CC
diff -aurN a/_make-kpkg b/_make-kpkg
--- a/_make-kpkg 2005-11-08 17:27:32.000000000 -0800
+++ b/_make-kpkg 2006-05-01 23:27:39.000000000 -0700
@@ -33,7 +33,6 @@
#exclude some options
[[ "$DEBIAN_REVISION_MANDATORY" ]] ||\
{ [[ -a "stamp-configure" ]] && paroptions=${paroptions/--revision}; }
- [[ "$ARCH_IN_NAME" ]] && paroptions=${paroptions//--arch[-_]in[-_]name}
[[ "$CROSS_COMPILE" ]] && paroptions=${paroptions//--cross[-_]compile}
[[ "$KPKG_ARCH" ]] && paroptions=${paroptions/--arch}
[[ "$KPKG_SUBARCH" ]] && paroptions=${paroptions/--subarch}
diff -aurN a/kernel/docs/README.modules b/kernel/docs/README.modules
--- a/kernel/docs/README.modules 2005-11-08 19:11:07.000000000 -0800
+++ b/kernel/docs/README.modules 2006-05-01 23:30:41.000000000 -0700
@@ -206,13 +206,6 @@
h) APPEND_TO_VERSION This contains a string to be appended to the
EXTRAVERSION variable. This is already factored
into the KVERS variable above.
- i) INT_SUBARCH Contains the SUB arch if any if and only if the
- ARCH_IN_NAME variable has been set. I suspect that the
- user wants the .deb names to be modified (but not the
- kernel version or the location of the dir in which to
- find modules if this is set. This is *NOT* factored
- into KVERS above, and is there to be used at your
- discretion.
j) UNSIGN_CHANGELOG A boolean
k) UNSIGN_SOURCE A boolean
l) ROOT_CMD a program, like sudo or fakeroot
diff -aurN a/kernel/rules b/kernel/rules
--- a/kernel/rules 2005-11-03 08:08:54.000000000 -0800
+++ b/kernel/rules 2006-05-01 23:37:31.000000000 -0700
@@ -63,7 +63,7 @@
include $(DEBDIR)/ruleset/local-vars.mk
# export variables
-export root_cmd FLAVOUR INT_SUBARCH APPEND_TO_VERSION UNSIGN_CHANGELOG \
+export root_cmd FLAVOUR APPEND_TO_VERSION UNSIGN_CHANGELOG \
UNSIGN_SOURCE ROOT_CMD MODULE_LOC EXTRAVERSION ALL_PATCH_DIR \
ALL_PATCH_APPLY ALL_PATCH_UNPATCH DIR_PATCH_UNPATCH \
DIR_PATCH_APPLY VERSIONED_PATCH_DIR VERSIONED_ALL_PATCH_UNPATCH \
diff -aurN a/kernel/ruleset/arches/sparc.mk b/kernel/ruleset/arches/sparc.mk
--- a/kernel/ruleset/arches/sparc.mk 2005-11-02 11:51:31.000000000 -0800
+++ b/kernel/ruleset/arches/sparc.mk 2006-05-01 23:29:45.000000000 -0700
@@ -37,9 +37,6 @@
NEED_DIRECT_GZIP_IMAGE = YES
kimagedest = $(INT_IMAGE_DESTDIR)/vmlinuz-$(version)
DEBCONFIG = $(CONFDIR)/config.sparc
-ifeq (,$(APPEND_TO_VERSION))
- ARCH_IN_NAME = YES
-endif
ifeq (,$(KPKG_SUBARCH))
ifeq (sparc64,$(strip $(shell uname -m)))
diff -aurN a/kernel/ruleset/minimal.mk b/kernel/ruleset/minimal.mk
--- a/kernel/ruleset/minimal.mk 2006-03-29 07:02:31.000000000 -0800
+++ b/kernel/ruleset/minimal.mk 2006-05-01 23:40:07.000000000 -0700
@@ -88,7 +88,7 @@
test ! -e stamp-building || rm -f stamp-building
test -f debian/control || sed -e 's/=V/$(version)/g' \
-e 's/=D/$(debian)/g' -e 's/=A/$(DEB_HOST_ARCH)/g' \
- -e 's/=SA/$(INT_SUBARCH)/g' -e 's/=L/$(int_loaderdep) /g' \
+ -e 's/=L/$(int_loaderdep) /g' \
-e 's/=I/$(initrddep)/g' \
-e 's/=CV/$(VERSION).$(PATCHLEVEL)/g' \
-e 's/=M/$(maintainer) <$(email)>/g' \
diff -aurN a/kernel/ruleset/misc/pkg_names.mk b/kernel/ruleset/misc/pkg_names.mk
--- a/kernel/ruleset/misc/pkg_names.mk 2006-04-11 23:59:20.000000000 -0700
+++ b/kernel/ruleset/misc/pkg_names.mk 2006-05-01 23:39:35.000000000 -0700
@@ -35,25 +35,13 @@
# KPKG_SUBARCH is used to distinguish Amiga, Atari, Macintosh, etc. kernels
-# for Debian/m68k. INT_SUBARCH is used in the names of the image file
-# produced. It only affects the naming of the kernel-image as the
-# source and doc packages are architecture independent and the
-# kernel-headers do not vary from one sub-architecture to the next.
-
-# This is the default
-INT_SUBARCH :=
-
-ifneq ($(strip $(ARCH_IN_NAME)),)
-ifneq ($(strip $(KPKG_SUBARCH)),)
-INT_SUBARCH := -$(KPKG_SUBARCH)
-endif
-endif
+# for Debian/m68k.
# The name of the package (for example, 'emacs').
s_package := $(INT_STEM)-source-$(version)
h_package := $(INT_STEM)-headers-$(version)
ifeq ($(strip $(KERNEL_ARCH)),um)
- i_package := $(INT_STEM)-uml-$(version)$(INT_SUBARCH)
+ i_package := $(INT_STEM)-uml-$(version)
else
ifneq ($(strip $(CONFIG_XEN)),)
ifeq ($(strip $(CONFIG_XEN_PRIVILEGED_GUEST)),)
@@ -62,7 +50,7 @@
i_package := $(INT_STEM)-xen0-$(version)
endif
else
- i_package := $(INT_STEM)-image-$(version)$(INT_SUBARCH)
+ i_package := $(INT_STEM)-image-$(version)
endif
endif
d_package := $(INT_STEM)-doc-$(version)
diff -aurN a/kernel/ruleset/targets/target.mk b/kernel/ruleset/targets/target.mk
--- a/kernel/ruleset/targets/target.mk 2006-03-29 07:12:06.000000000 -0800
+++ b/kernel/ruleset/targets/target.mk 2006-05-01 23:38:13.000000000 -0700
@@ -186,7 +186,7 @@
test -f stamp-debian || \
( test -f debian/official && test -f debian/control) || \
sed -e 's/=V/$(version)/g' -e 's/=D/$(debian)/g' \
- -e 's/=A/$(DEB_HOST_ARCH)/g' -e 's/=SA/$(INT_SUBARCH)/g' \
+ -e 's/=A/$(DEB_HOST_ARCH)/g' \
-e 's/=L/$(int_loaderdep) /g' -e 's/=I/$(initrddep)/g' \
-e 's/=CV/$(VERSION).$(PATCHLEVEL)/g' \
-e 's/=M/$(maintainer) <$(email)>/g' \
diff -aurN a/kernel-pkg.conf.5 b/kernel-pkg.conf.5
--- a/kernel-pkg.conf.5 2005-11-10 00:32:17.000000000 -0800
+++ b/kernel-pkg.conf.5 2006-05-01 23:31:29.000000000 -0700
@@ -341,17 +341,6 @@
.B make\-kpkg.
Should be a (small) integer, if used.
.TP
-.B ARCH_IN_NAME
-If defined, this variable causes
-.B make\-kpkg
-to use an extended name for the kernel image package by embedding the
-subarchitecture in the image name, so one could write a script to
-create multiple subarchitectures one after the other.
-.B Please note
-that only the package
-.I name
-is affected, not module locations etc.
-.TP
.B CONFDIR
This variable should be set to a directory which contains architecture
specific
diff -aurN a/kernel-pkg.conf.es.5 b/kernel-pkg.conf.es.5
--- a/kernel-pkg.conf.es.5 2005-06-07 22:55:16.000000000 -0700
+++ b/kernel-pkg.conf.es.5 2006-05-01 23:31:58.000000000 -0700
@@ -330,17 +330,6 @@
.B make\-kpkg.
Si se usa, deber�a ser un entero (peque�o).
.TP
-.B ARCH_IN_NAME
-Si se define, esta variable hace que
-.B make\-kpkg
-use un nombre extendido para la imagen del n�cleo empotrando la
sub\-arquitectura
-en el nombre de la imagen, de este modo uno puede escribir un script que cree
-m�ltiples sub\-arquitecturas, una detr�s de la otra.
-.B Note
-que solamente afecta al
-.I nombre
-del paquete, no afecta a la localizaci�n de los m�dulos y dem�s.
-.TP
.B CONFDIR
Esta variable debe apuntar a un directorio que contenga ficheros
.I .config
diff -aurN a/kernel-pkg.conf.fr.5 b/kernel-pkg.conf.fr.5
--- a/kernel-pkg.conf.fr.5 2005-06-07 22:55:16.000000000 -0700
+++ b/kernel-pkg.conf.fr.5 2006-05-01 23:32:21.000000000 -0700
@@ -327,17 +327,6 @@
.B make\-kpkg.
Doit �tre, si elle est d�finie, un (petit) entier.
.TP
-.B ARCH_IN_NAME
-Si elle est d�finie, cette variable force
-.B make\-kpkg
-� utiliser un nom rallong� pour le paquet de l'image du noyau, en int�grant la
-sous\-architecture dans le nom de l'image\ ;\ ainsi, on peut �crire des scripts
-pour cr�er de multiples sous\-architectures, l'une apr�s l'autre.
-.B Notez bien
-que seul le
-.I nom
-du paquet est chang�, pas l'emplacement des modules, etc.
-.TP
.B CONFDIR
Cette variable pourra pointer sur un r�pertoire contenant les fichiers
.I .config
diff -aurN a/make-kpkg b/make-kpkg
--- a/make-kpkg 2006-03-27 16:29:27.000000000 -0800
+++ b/make-kpkg 2006-05-01 23:34:25.000000000 -0700
@@ -215,20 +215,6 @@
support for subarchitectures may be required in the kernel sources to
actually make this do anything.
-
-=back
-
-=item B<--arch-in-name> foo
-
-=item B<--arch_in_name> foo
-
-=over 2
-
-This option uses an extended name for the kernel image package by
-embedding the subarchitecture in the image name, so one could write a
-script to create multiple subarchitectures one after the other. You
-may also do this by setting the environment variable ARCH_IN_NAME.
-
=back
=item B<--stem> foo
@@ -984,11 +970,6 @@
$alt_cmd .= " KPKG_SELECTED_PATCHES=\"$added_patches\" "
unless -f "debian/ruleset/kernel_version.mk";
}
- if ($arch_in_name){
- $command .= " ARCH_IN_NAME=YES ";
- $alt_cmd .= " ARCH_IN_NAME=YES "
- unless -f "debian/ruleset/kernel_version.mk";
- }
if ($stem) {
$command .= " KPKG_STEM=$stem ";
$alt_cmd .= " KPKG_STEM=$stem "
diff -aurN a/make-kpkg.8 b/make-kpkg.8
--- a/make-kpkg.8 2006-04-20 09:03:17.000000000 -0700
+++ b/make-kpkg.8 2006-05-01 23:36:38.000000000 -0700
@@ -304,18 +304,6 @@
be achieved by setting the environment variable
.B KPKG_SUBARCH
.TP
-.BR \-\-arch\-in\-name
-.TP
-.BR \-\-arch_in_name
-This option uses an extended name for the kernel image package by
-embedding the sub\-architecture in the image name, so one could write a
-script to create multiple sub\-architectures one after the other. You
-may also do this by setting the environment variable
-.B ARCH_IN_NAME.
-\fBPlease note\fR that only the package
-.I name
-is affected, not modules locations etc.
-.TP
.BR \-\-pgpsign " name"
Set the string used to sign the
.B changes
@@ -733,7 +721,6 @@
.I KPKG_ARCH
.I CROSS_COMPILE
.I KPKG_SUBARCH
-.I ARCH_IN_NAME
.I INITRD
.I SOURCE_CLEAN_HOOK
.I MODULE_LOC
diff -aurN a/make-kpkg.es.8 b/make-kpkg.es.8
--- a/make-kpkg.es.8 2006-01-28 20:32:07.000000000 -0800
+++ b/make-kpkg.es.8 2006-05-01 23:36:28.000000000 -0700
@@ -277,18 +277,6 @@
algo. El mismo efecto se puede conseguir estableciendo la variable de entorno
.B KPKG_SUBARCH
.TP
-.BR \-\-arch\-in\-name
-.TP
-.BR \-\-arch_in_name
-Esta opci�n usa un nombre extendido para la imagen del n�cleo empaquetada,
-introduciendo la sub\-arquitectura en el nombre de �sta, de este modo se pueden
-crear scripts que creen m�ltiples sub\-aquitecturas, una despu�s de otra. El
-mismo efecto se puede conseguir estableciendo la variable de entorno
-.B ARCH_IN_NAME.
-\fBDese cuenta\fR que s�lo afecta al
-.I nombre
-del paquete, no a la localizaci�n de los m�dulos y dem�s.
-.TP
.BR \-\-pgpsign " nombre"
Establece la cadena a usar para firmar el fichero de
.B cambios
@@ -671,7 +659,6 @@
.I KPKG_ARCH
.I CROSS_COMPILE
.I KPKG_SUBARCH
-.I ARCH_IN_NAME
.I INITRD
.I SOURCE_CLEAN_HOOK
.I MODULE_LOC
diff -aurN a/make-kpkg.fr.8 b/make-kpkg.fr.8
--- a/make-kpkg.fr.8 2005-11-08 17:20:44.000000000 -0800
+++ b/make-kpkg.fr.8 2006-05-01 23:36:20.000000000 -0700
@@ -279,19 +279,6 @@
obtenir le m�me r�sultat en r�glant la variable d'environnement
.B KPKG_SUBARCH
.TP
-.BR \-\-arch\-in\-name
-.TP
-.BR \-\-arch_in_name
-Cette option rallonge le nom du paquet de l'image du noyau
-en int�grant la sous\-architecture dans le nom de l'image\ ;\ ainsi on peut
-�crire des scripts pour cr�er de multiples sous\-architectures, l'une apr�s
-l'autre. On peut faire la m�me chose en r�glant la variable
-d'environnement
-.B ARCH_IN_NAME.
-\fBNotez bien\fR que seul le
-.I nom
-du paquet est chang�, pas l'emplacement des modules, etc.
-.TP
.BR \-\-pgpsign " nom"
D�finit la cha�ne utilis�e pour signer le fichier des modifications
.B (changes)
@@ -653,7 +640,6 @@
.I KPKG_ARCH
.I CROSS_COMPILE
.I KPKG_SUBARCH
-.I ARCH_IN_NAME
.I INITRD
.I SOURCE_CLEAN_HOOK
.I MODULE_LOC
