Bug#379090: Updated patch
Package: linux-2.6
Followup-For: Bug #379090
Attached the patch for 64bit kernel for i386 updated to 2.6.18.
MfG
Goswin
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-xen-frosties
Locale: LANG=C, LC_CTYPE=de_DE (charmap=ISO-8859-1)
diff -u linux-2.6-2.6.18/debian/changelog linux-2.6-2.6.18/debian/changelog
--- linux-2.6-2.6.18/debian/changelog
+++ linux-2.6-2.6.18/debian/changelog
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.18-5a0.mrvn.1) unstable; urgency=low
+
+ * Add amd64 flavour to i386
+
+ -- Goswin von Brederlow <brederlo@informatik.uni-tuebingen.de> Wed, 22 Nov 2006 10:04:07 +0200
+
linux-2.6 (2.6.18-5) unstable; urgency=low
[ maximilian attems ]
diff -u linux-2.6-2.6.18/debian/arch/i386/vserver/defines linux-2.6-2.6.18/debian/arch/i386/vserver/defines
--- linux-2.6-2.6.18/debian/arch/i386/vserver/defines
+++ linux-2.6-2.6.18/debian/arch/i386/vserver/defines
@@ -1,5 +1,6 @@
[base]
flavours:
+ amd64
686
k7
@@ -15,0 +17,3 @@
+[amd64_image]
+configs: i386/config.amd64
+
diff -u linux-2.6-2.6.18/debian/arch/i386/defines linux-2.6-2.6.18/debian/arch/i386/defines
--- linux-2.6-2.6.18/debian/arch/i386/defines
+++ linux-2.6-2.6.18/debian/arch/i386/defines
@@ -1,11 +1,11 @@
[base]
flavours:
+ amd64
486
686
k7
686-bigmem
-kernel-arch: i386
-kernel-header-dirs: i386
+kernel-header-dirs: i386 x86_64
subarches:
vserver
xen
@@ -18,10 +18,12 @@
[486]
class: x86
longclass: x86 and compatible
+kernel-arch: i386
[686]
class: PPro/Celeron/PII/PIII/P4
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
+kernel-arch: i386
[686_image]
recommends: libc6-i686
@@ -29,6 +31,7 @@
[686-bigmem]
class: PPro/Celeron/PII/PIII/P4
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with 4-64G RAM
+kernel-arch: i386
[686-bigmem_image]
recommends: libc6-i686
@@ -39,4 +42,13 @@
+kernel-arch: i386
[k7_image]
recommends: libc6-i686
+[amd64]
+class: AMD64 / EM64T SMP
+longclass: 64bit multi-processor AMD Athlon64/Opteron / Intel EM64T models
+kpkg-arch: amd64
+kernel-arch: x86_64
+
+[amd64_image]
+recommends: libc6-i686
diff -u linux-2.6-2.6.18/debian/rules.real linux-2.6-2.6.18/debian/rules.real
--- linux-2.6-2.6.18/debian/rules.real
+++ linux-2.6-2.6.18/debian/rules.real
@@ -35,7 +35,11 @@
# replaced by the flavour for which the command is run.
#
kpkg_image := make-kpkg
-kpkg_image += --arch '$(ARCH)'
+ifdef KPKG_ARCH
+ kpkg_image += --arch '$(KPKG_ARCH)' --cross-compile='-'
+else
+ kpkg_image += --arch '$(ARCH)'
+endif
kpkg_image += --stem linux
kpkg_image += --config silentoldconfig
ifneq ($(INITRAMFS),False)
only in patch2:
unchanged:
--- linux-2.6-2.6.18.orig/debian/arch/i386/config.amd64
+++ linux-2.6-2.6.18/debian/arch/i386/config.amd64
@@ -0,0 +1,113 @@
+CONFIG_X86_64=y
+CONFIG_64BIT=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_X86_TSC=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_SWIOTLB=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+# CONFIG_X86_SPEEDSTEP_LIB is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=y
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_PNP_DEBUG=y
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_SCSI_INIA100=m
+CONFIG_IEEE1394_OUI_DB=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_ISDN_DIVERSION=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_ISI=m
+CONFIG_SPECIALIX=m
+# CONFIG_SPECIALIX_RTSCTS is not set
+CONFIG_RTC=y
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+CONFIG_I2C_STUB=m
+# CONFIG_FB_NVIDIA_I2C is not set
+# CONFIG_FB_ATY_GENERIC_LCD is not set
+# CONFIG_FB_SAVAGE_I2C is not set
+# CONFIG_FB_GEODE is not set
+CONFIG_SOUND_AD1816=m
+CONFIG_USB=y
+CONFIG_USB_W9968CF=m
+CONFIG_DEBUG_KERNEL=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
+CONFIG_CRYPTO_AES_X86_64=m
+# CONFIG_FRAME_POINTER is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_X86_VSMP is not set
+CONFIG_COMPUTONE=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_REORDER=y
+CONFIG_PHYSICAL_START=0x200000
+CONFIG_X86_INTERNODE_CACHE_BYTES=128
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_RIO=m
+CONFIG_RIO_OLDPCI=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_X86_HT=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_RESOURCES_64BIT=y
+CONFIG_IOMMU=y
+CONFIG_AUDIT_ARCH=y
+# CONFIG_ASFS_FS is not set
+CONFIG_SCSI_ARCMSR=m
+CONFIG_LOCK_KERNEL=y
+CONFIG_STOP_MACHINE=y
+CONFIG_SMP=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NUMA=y
+CONFIG_NR_CPUS=32
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_DIGIEPCA=m
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_DISCONTIGMEM=y
+CONFIG_DISCONTIGMEM_MANUAL=y
+CONFIG_ACPI_NUMA=y
+CONFIG_MIGRATION=y
+CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
+CONFIG_SUSPEND_SMP=y
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_NODES_SHIFT=6
+CONFIG_X86_L1_CACHE_BYTES=128
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_K8_NUMA=y
+CONFIG_X86_L1_CACHE_SHIFT=7
+# CONFIG_MPSC is not set
+CONFIG_GENERIC_CPU=y
Reply to: