debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge /dists/exp/linux-2.6. 

r5730):  fs | 2006-02-07 14:38:28 +0000
Merge experimental sparc32 changes from Jurij: r5717 r5718 r5721 r5722 r5723 r5724

r5759:  jurij-guest | 2006-02-09 04:44:39 +0000
Unset LOCALVERSION from the environment used to invoke make-kpkg.

r5760:  jurij-guest | 2006-02-09 06:06:56 +0000
Update changelog.

r5769:  jurij-guest | 2006-02-09 07:19:34 +0000
Update sparc64 config.

r5771:  jurij-guest | 2006-02-09 07:23:28 +0000
Update sparc64-smp config.

r5816:  jurij-guest | 2006-02-11 05:28:45 +0000
Add sparc64-atyfb-xl-gr.patch, since it was not
completely merged upstream, so the bug is still there.

svn path=/dists/trunk/linux-2.6/; revision=5818
This commit is contained in:
Bastian Blank 2006-02-11 17:53:13 +00:00
parent ab2517fe99
commit d1c2c43239
14 changed files with 67 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/arch/amd64/config vendored
View File

@ -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

1
debian/arch/amd64/config.amd64-k8-smp vendored
View File

@ -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

3
debian/arch/config vendored
View File

@ -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

17
debian/arch/i386/config vendored
View File

@ -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

1
debian/arch/i386/config.486 vendored
View File

@ -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

1
debian/arch/i386/config.686 vendored
View File

@ -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

1
debian/arch/i386/config.k7 vendored
View File

@ -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

1
debian/arch/sparc/config.sparc64 vendored
View File

@ -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

1
debian/arch/sparc/config.sparc64-smp vendored
View File

@ -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

18
debian/changelog vendored
View File

@ -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 <waldi@debian.org> 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 <fs@debian.org> Fri, 3 Feb 2006 14:36:04 +0100
linux-2.6 (2.6.15-3) unstable; urgency=low

1
debian/patches/series/0experimental.1 vendored
View File

@ -16,3 +16,4 @@
#FIXME + powerpc-serial.patch
#FIXME + powerpc-apus.patch
+ sparc64-hme-lockup.patch
+ sparc64-atyfb-xl-gr.patch

12
debian/patches/sparc64-atyfb-xl-gr-final.patch vendored
View File

@ -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 },

11
debian/patches/sparc64-atyfb-xl-gr.patch vendored Normal file
View File

@ -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 },

5
debian/rules.real vendored
View File

@ -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" ..; \