diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index a635ad047..9e0a32d89 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -1571,3 +1571,13 @@ CONFIG_COMPUTONE=m CONFIG_MOXA_INTELLIO=m CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_PCI_MSI=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_POLL=y +CONFIG_EDAC_I82860=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_R82600=m diff --git a/debian/arch/amd64/config.amd64-k8-smp b/debian/arch/amd64/config.amd64-k8-smp index 982847aff..7b59f32c1 100644 --- a/debian/arch/amd64/config.amd64-k8-smp +++ b/debian/arch/amd64/config.amd64-k8-smp @@ -33,3 +33,4 @@ CONFIG_DISCONTIGMEM_MANUAL=y CONFIG_X86_MCE_AMD=y CONFIG_X86_64_ACPI_NUMA=y CONFIG_ACPI_NUMA=y +CONFIG_MIGRATION=y diff --git a/debian/arch/config b/debian/arch/config index 05f5c7759..6d2288601 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -817,3 +817,6 @@ CONFIG_SLAB=y CONFIG_MTD_DATAFLASH=m # CONFIG_FORCED_INLINING is not set CONFIG_CLEAN_COMPILE=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_USB_ET61X251=m +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 595314cd5..d341972ed 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -2,7 +2,6 @@ CONFIG_X86=y CONFIG_UID16=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y -# CONFIG_CLEAN_COMPILE is not set CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_EMBEDDED=y @@ -1833,3 +1832,19 @@ CONFIG_CS5535_GPIO=m CONFIG_SND_CS5535AUDIO=m CONFIG_VM86=y CONFIG_SPARSEMEM_STATIC=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_PAGE_OFFSET=0xB0000000 +CONFIG_EDAC=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_POLL=y +# CONFIG_VMSPLIT_3G is not set +CONFIG_VMSPLIT_3G_OPT=y +CONFIG_EDAC_I82860=m +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_EDAC_E752X=m +CONFIG_EDAC_R82600=m +CONFIG_CLEAN_COMPILE=y diff --git a/debian/arch/i386/config.486 b/debian/arch/i386/config.486 index 9b157efcb..d7973496a 100644 --- a/debian/arch/i386/config.486 +++ b/debian/arch/i386/config.486 @@ -110,3 +110,4 @@ CONFIG_X86_CMPXCHG=y CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INVLPG=y CONFIG_X86_WP_WORKS_OK=y +CONFIG_BROKEN_ON_SMP=y diff --git a/debian/arch/i386/config.686 b/debian/arch/i386/config.686 index 15ee0ee54..f64d7beb4 100644 --- a/debian/arch/i386/config.686 +++ b/debian/arch/i386/config.686 @@ -84,3 +84,4 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_DEBUG_HIGHMEM is not set CONFIG_X86_CMPXCHG64=y # CONFIG_M486 is not set +CONFIG_BROKEN_ON_SMP=y diff --git a/debian/arch/i386/config.k7 b/debian/arch/i386/config.k7 index 4c706ee3b..e21344097 100644 --- a/debian/arch/i386/config.k7 +++ b/debian/arch/i386/config.k7 @@ -85,3 +85,4 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_DEBUG_HIGHMEM is not set CONFIG_X86_CMPXCHG64=y # CONFIG_M486 is not set +CONFIG_BROKEN_ON_SMP=y diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index e32e2f9a0..85411c811 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -395,3 +395,4 @@ CONFIG_USB_SISUSBVGA=m # CONFIG_USB_TEST is not set # CONFIG_PROFILING is not set CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_MAGIC_SYSRQ is not set diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp index 5c22da728..0cd800851 100644 --- a/debian/arch/sparc/config.sparc64-smp +++ b/debian/arch/sparc/config.sparc64-smp @@ -400,3 +400,4 @@ CONFIG_USB_SISUSBVGA=m # CONFIG_PROFILING is not set CONFIG_LOG_BUF_SHIFT=15 CONFIG_HAVE_DEC_LOCK=y +# CONFIG_MAGIC_SYSRQ is not set diff --git a/debian/changelog b/debian/changelog index be658c665..a6d3b553e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,24 @@ -linux-2.6 (2.6.15-99experimental.1) UNRELEASED; urgency=low +linux-2.6 (2.6.15+2.6.16-rc2-0experimental.1) UNRELEASED; urgency=low + + [ Frederik Schüler ] + * New upstream release. [ maximilian attems ] * Drop fdutils from i386 and amd64 Suggests. * Swap lilo and grub Suggests for i386 and amd64. - -- Bastian Blank Sun, 05 Feb 2006 13:51:52 +0000 + [ Jurij Smakov ] + * Make sure that LOCALVERSION environment variable is not + passed to a shell while invoking make-kpkg, since it + appends it to the version string, breaking the build. + Closes: #349472 + * [sparc32] Re-enable the building of sparc32 images. + * [sparc64] Re-add (partial) sparc64-atyf-xl-gr.patch, since it + was only partially applied upstream, so the problem (garbled + screen output on SunBlade 100) is still present. Thanks to + Luis Ortiz for pointing it out. + + -- Frederik Schüler Fri, 3 Feb 2006 14:36:04 +0100 linux-2.6 (2.6.15-3) unstable; urgency=low diff --git a/debian/patches/series/0experimental.1 b/debian/patches/series/0experimental.1 index 9bb6d32e4..b0fac532e 100644 --- a/debian/patches/series/0experimental.1 +++ b/debian/patches/series/0experimental.1 @@ -16,3 +16,4 @@ #FIXME + powerpc-serial.patch #FIXME + powerpc-apus.patch + sparc64-hme-lockup.patch ++ sparc64-atyfb-xl-gr.patch diff --git a/debian/patches/sparc64-atyfb-xl-gr-final.patch b/debian/patches/sparc64-atyfb-xl-gr-final.patch deleted file mode 100644 index 03b47c1f7..000000000 --- a/debian/patches/sparc64-atyfb-xl-gr-final.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c ---- a/drivers/video/aty/atyfb_base.c 2005-10-27 17:02:08.000000000 -0700 -+++ b/drivers/video/aty/atyfb_base.c 2005-11-09 19:56:18.000000000 -0800 -@@ -404,7 +404,7 @@ - { PCI_CHIP_MACH64GM, "3D RAGE XL (Mach64 GM, AGP)", 230, 83, 63, ATI_CHIP_264XL }, - { PCI_CHIP_MACH64GN, "3D RAGE XL (Mach64 GN, AGP)", 230, 83, 63, ATI_CHIP_264XL }, - { PCI_CHIP_MACH64GO, "3D RAGE XL (Mach64 GO, PCI-66/BGA)", 230, 83, 63, ATI_CHIP_264XL }, -- { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33MHz)", 230, 83, 63, ATI_CHIP_264XL }, -+ { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33MHz)", 235, 83, 63, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL }, - { PCI_CHIP_MACH64GL, "3D RAGE XL (Mach64 GL, PCI)", 230, 83, 63, ATI_CHIP_264XL }, - { PCI_CHIP_MACH64GS, "3D RAGE XL (Mach64 GS, PCI)", 230, 83, 63, ATI_CHIP_264XL }, - diff --git a/debian/patches/sparc64-atyfb-xl-gr.patch b/debian/patches/sparc64-atyfb-xl-gr.patch new file mode 100644 index 000000000..c539008cb --- /dev/null +++ b/debian/patches/sparc64-atyfb-xl-gr.patch @@ -0,0 +1,11 @@ +--- a/drivers/video/aty/atyfb_base.c 2006-02-03 05:23:59.000000000 -0800 ++++ b/drivers/video/aty/atyfb_base.c 2006-02-09 21:25:53.163445232 -0800 +@@ -415,7 +415,7 @@ + { PCI_CHIP_MACH64GN, "3D RAGE XC (Mach64 GN, AGP 2x)", 230, 83, 63, 135, ATI_CHIP_264XL }, + { PCI_CHIP_MACH64GO, "3D RAGE XL (Mach64 GO, PCI-66)", 230, 83, 63, 135, ATI_CHIP_264XL }, + { PCI_CHIP_MACH64GL, "3D RAGE XC (Mach64 GL, PCI-66)", 230, 83, 63, 135, ATI_CHIP_264XL }, +- { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33)", 230, 83, 63, 135, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL }, ++ { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33)", 235, 83, 63, 135, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL }, + { PCI_CHIP_MACH64GS, "3D RAGE XC (Mach64 GS, PCI-33)", 230, 83, 63, 135, ATI_CHIP_264XL }, + + { PCI_CHIP_MACH64LM, "3D RAGE Mobility P/M (Mach64 LM, AGP 2x)", 230, 83, 125, 135, ATI_CHIP_MOBILITY }, diff --git a/debian/rules.real b/debian/rules.real index 8d0604511..e6d91938b 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -42,7 +42,7 @@ endif ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) kpkg_image += --cross-compile='$(DEB_HOST_GNU_TYPE)' endif -setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION +setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION -u LOCALVERSION setup_env += DEBIAN_LOCALVERSION='-$(ABINAME)$(LOCALVERSION)' setup_env += DEBIAN_LOCALVERSION_HEADERS='-$(ABINAME)$(LOCALVERSION_HEADERS)' setup_env += DEBIAN_VERSION='$(VERSION)' @@ -162,6 +162,9 @@ install-doc: $(STAMPS_DIR)/source cd '$(DIR)' && $(setup_env) make-kpkg --stem linux \ --config defconfig kernel-manual cat '$(DIR)/debian/files' >> debian/files +ifdef IMAGE_POSTPROC + cd '$(DIR)'; $(IMAGE_POSTPROC) +endif @for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do \ echo "mv \"$(BUILD_DIR)/$$i\" .."; \ mv "$(BUILD_DIR)/$$i" ..; \