[kernel] r8201 - in dists/sid/linux-2.6/debian: . arch/powerpc
Author: luther Date: Tue Jan 23 13:19:31 2007 New Revision: 8201 Modified: dists/sid/linux-2.6/debian/arch/powerpc/config dists/sid/linux-2.6/debian/changelog Log: Enabled CONFIG_PMAC_BACKLIGHT_LEGACY, Closes: #407671. Modified: dists/sid/linux-2.6/debian/arch/powerpc/config == --- dists/sid/linux-2.6/debian/arch/powerpc/config (original) +++ dists/sid/linux-2.6/debian/arch/powerpc/config Tue Jan 23 13:19:31 2007 @@ -248,6 +248,7 @@ CONFIG_PMAC_PBOOK=y CONFIG_PMAC_APM_EMU=m CONFIG_PMAC_BACKLIGHT=y +CONFIG_PMAC_BACKLIGHT_LEGACY=y CONFIG_ADB_MACIO=y CONFIG_INPUT_ADBHID=y CONFIG_MAC_EMUMOUSEBTN=y Modified: dists/sid/linux-2.6/debian/changelog == --- dists/sid/linux-2.6/debian/changelog(original) +++ dists/sid/linux-2.6/debian/changelogTue Jan 23 13:19:31 2007 @@ -162,7 +162,10 @@ memory accesses in ehci-hub-control() by adding an alignment attribute to the tbuf array declaration. Thanks to David Miller for the patch. - -- dann frazier [EMAIL PROTECTED] Mon, 15 Jan 2007 20:27:06 -0700 + [ Sven Luther ] + * [powerpc] Enable CONFIG_PMAC_BACKLIGHT_LEGACY (Closes: #407671). + + -- Sven Luther [EMAIL PROTECTED] Tue, 23 Jan 2007 13:18:03 +0100 linux-2.6 (2.6.18-8) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r8017 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: . debian debian/po
Author: luther
Date: Sat Dec 16 02:30:19 2006
New Revision: 8017
Modified:
dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/config
dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/po/pt_BR.po
dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
Log:
Added Efika support.
Added support for 2.6.19 kernels.
Added Portuguese translation.
Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
==
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Sat Dec 16
02:30:19 2006
@@ -1,6 +1,19 @@
+mkvmlinuz (29) unstable; urgency=high
+
+ * Added Efika support.
+
+ -- Sven Luther [EMAIL PROTECTED] Sat, 16 Dec 2006 02:18:19 +0100
+
+mkvmlinuz (28) unstable; urgency=low
+
+ * Added support for 2.6.19 kernels.
+ * Added portuguese translation. (Closes: #401384)
+
+ -- Sven Luther [EMAIL PROTECTED] Tue, 5 Dec 2006 17:20:48 +0100
+
mkvmlinuz (27) unstable; urgency=low
- * Corrected typo. (Closes: 399768)
+ * Corrected typo. (Closes: #399768)
-- Sven Luther [EMAIL PROTECTED] Tue, 21 Nov 2006 22:43:28 +0100
Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/config
==
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/config (original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/config Sat Dec 16 02:30:19 2006
@@ -7,7 +7,7 @@
case $(grep ^machine /proc/cpuinfo) in
*PReP*Blackhawk*) arch=ppcbug ;;
*PReP*) arch=prep ;;
-*CHRP*Pegasos*) arch=chrp_pegasos ;;
+*CHRP*Pegasos*|*EFIKA*CHRP*) arch=chrp_pegasos ;;
*CHRP*) arch=chrp ;;
*Amiga*) arch=apus ;;
*iSeries*) arch=iseries ;;
Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/po/pt_BR.po
==
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/po/pt_BR.po(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/po/pt_BR.poSat Dec 16
02:30:19 2006
@@ -15,7 +15,7 @@
# Licensed under the same terms of the mkvmlinuz package.
#
msgid
-msgstr pt_BR utf-8\n
+msgstr
Project-Id-Version: mkvmlinuz (20061109)\n
Report-Msgid-Bugs-To: \n
POT-Creation-Date: 2006-10-31 08:09+0100\n
@@ -25,6 +25,7 @@
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
+pt_BR utf-8\n
#. Type: select
#. Description
Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
==
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Sat Dec 16 02:30:19 2006
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
# usage information
usage() {
@@ -152,6 +152,12 @@
post_2_6_18=
fi
+if dpkg --compare-versions $release ge 2.6.19 test $arch != prep ; then
+ post_2_6_19=Yes
+else
+ post_2_6_19=
+fi
+
test -z $verbose || echo === Release version seems to be $release.
# if no object file directory was specified, try to find one
@@ -281,149 +287,160 @@
esac
fi
-# create the compressed kernel image file
-test -z $verbose || echo === Creating compressed kernel image vmlinux.gz...
-if test -n $elf || test -n $post_2_6_16; then
-do_cmd $STRIP $kernel -o $work/vmlinux
-else
-do_cmd $OBJCOPY -O binary $kernel $work/vmlinux
-fi
-do_cmd $GZIP $work/vmlinux
+# If we are on ARCH=powerpc and 2.6.19 or higher, we just call the provided
wrapper script.
-# create the raw ELF image file; this is not needed for the miBoot image
-if test -z $elf; then
-test -z $verbose || echo === Putting everything into ELF image file
image.o...
-if test -n $post_2_6_16; then
- do_cmd $OBJCOPY $dummy_kernel $work/dummy_kernel.o \
- --add-section=.kernel:vmlinux.strip=$work/vmlinux.gz \
-
--set-section-flags=.kernel:vmlinux.strip=contents,alloc,load,readonly,data
- if test -n $initrd; then
- do_cmd $OBJCOPY $dummy_initrd $work/dummy_initrd.o \
- --add-section=.kernel:initrd=$work/initrd.gz \
- --set-section-flags=.kernel:initrd=contents,alloc,load,readonly,data
- fi
-else
- do_cmd $OBJCOPY -R .comment $dummy $work/image.o
- do_cmd $OBJCOPY $work/image.o $work/image.o \
- --add-section=.image=$work/vmlinux.gz \
- --set-section-flags=.image=contents,alloc,load,readonly,data
- if test -n $sysmap; then
- do_cmd $OBJCOPY $work/image.o $work/image.o \
- --add-section=.sysmap=$sysmap \
- --set-section-flags=.sysmap=contents,alloc,load,readonly,data
- fi
- if test -n $initrd; then
- do_cmd $OBJCOPY $work/image.o $work/image.o \
- --add-section=.ramdisk=$work/initrd.gz \
- --set-section-flags=.ramdisk=contents,alloc,load,readonly,data
+if test -n
[kernel] r8018 - in dists/trunk/linux-2.6/debian: arch/powerpc patches/features/powerpc/efika patches/series
Author: luther
Date: Sat Dec 16 08:50:05 2006
New Revision: 8018
Added:
dists/trunk/linux-2.6/debian/patches/features/powerpc/efika/0001-powerpc-Add-support-for-uevent-to-of_platform.txt
Modified:
dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
Add of_plateform uevent patch handling from Sylvain Munaut.
Add mpc52xx serial console config options.
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
==
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpcSat Dec 16
08:50:05 2006
@@ -15,6 +15,8 @@
CONFIG_CLASSIC32=y
CONFIG_FEC_MPC52xx=y
CONFIG_SERIAL_MPC52xx=y
+CONFIG_SERIAL_MPC52xx_CONSOLE=y
+CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
CONFIG_MII=y
CONFIG_PATA_MPC52xx=m
Added:
dists/trunk/linux-2.6/debian/patches/features/powerpc/efika/0001-powerpc-Add-support-for-uevent-to-of_platform.txt
==
--- (empty file)
+++
dists/trunk/linux-2.6/debian/patches/features/powerpc/efika/0001-powerpc-Add-support-for-uevent-to-of_platform.txt
Sat Dec 16 08:50:05 2006
@@ -0,0 +1,105 @@
+From 6f004b2fa4f9b6e5692084f7301271503788c05c Mon Sep 17 00:00:00 2001
+From: Sylvain Munaut [EMAIL PROTECTED]
+Date: Sat, 9 Dec 2006 02:06:55 +0100
+Subject: [PATCH] powerpc: Add support for uevent to of_platform
+
+This adds a proper uevent handler to the of_platform bus. This
+allows autoloading of modules (or at least should ;).
+It's _heavily_ based on the macio counterpart.
+
+Signed-off-by: Sylvain Munaut [EMAIL PROTECTED]
+---
+ arch/powerpc/kernel/of_platform.c | 70 +
+ 1 files changed, 70 insertions(+), 0 deletions(-)
+
+diff --git a/arch/powerpc/kernel/of_platform.c
b/arch/powerpc/kernel/of_platform.c
+index b3189d0..f23 100644
+--- a/arch/powerpc/kernel/of_platform.c
b/arch/powerpc/kernel/of_platform.c
+@@ -73,6 +73,75 @@ static int of_platform_bus_match(struct
+ return of_match_device(matches, of_dev) != NULL;
+ }
+
++static int of_platform_uevent(struct device *dev, char **envp, int num_envp,
++ char *buffer, int buffer_size)
++{
++ struct of_device *of;
++ const char *compat;
++ char *compat2;
++ char compat_buf[128]; /* need to be size of 'compatible' */
++
++ int i = 0;
++ int length = 0, cplen, sl, seen = 0;
++
++ if (!dev)
++ return -ENODEV;
++
++ of = to_of_device(dev);
++ if (!of)
++ return -ENODEV;
++
++ /* stuff we want to pass to /sbin/hotplug */
++ if (add_uevent_var(envp, num_envp, i,
++ buffer, buffer_size, length,
++ OF_NAME=%s, of-node-name))
++ return -ENOMEM;
++
++ if (add_uevent_var(envp, num_envp, i,
++ buffer, buffer_size, length,
++ OF_TYPE=%s, of-node-type))
++ return -ENOMEM;
++
++/* Since the compatible field can contain pretty much anything
++ * it's not really legal to split it out with commas. We split it
++ * up using a number of environment variables instead. */
++
++ compat = get_property(of-node, compatible, cplen);
++ compat2 = compat_buf;
++ if (compat)
++ memcpy(compat2, compat, cplen);
++ while (compat *compat cplen 0) {
++ if (add_uevent_var(envp, num_envp, i,
++ buffer, buffer_size, length,
++ OF_COMPATIBLE_%d=%s, seen, compat))
++ return -ENOMEM;
++
++ sl = strlen (compat) + 1;
++ compat += sl;
++ compat2 += sl;
++ cplen -= sl;
++ seen++;
++ compat2[-1] = 'C';
++ }
++ compat2[seen?-1:0] = 0;
++
++ if (add_uevent_var(envp, num_envp, i,
++ buffer, buffer_size, length,
++ OF_COMPATIBLE_N=%d, seen))
++ return -ENOMEM;
++
++ if (add_uevent_var(envp, num_envp, i,
++ buffer, buffer_size, length,
++ MODALIAS=of:N%sT%sC%s,
++ of-node-name, of-node-type,
++ compat_buf))
++ return -ENOMEM;
++
++ envp[i] = NULL;
++
++ return 0;
++}
++
+ static int of_platform_device_probe(struct device *dev)
+ {
+ int error = -ENODEV;
+@@ -132,6 +201,7 @@ static int of_platform_device_resume(str
+ struct bus_type of_platform_bus_type = {
+.name = of_platform,
+.match = of_platform_bus_match,
++ .uevent= of_platform_uevent,
+.probe = of_platform_device_probe,
+.remove= of_platform_device_remove,
+
[kernel] r7813 - dists/exp/linux-2.6
Author: luther Date: Sun Nov 19 11:18:23 2006 New Revision: 7813 Added: dists/exp/linux-2.6/ - copied from r7812, dists/trunk/linux-2.6/ Log: Created exp dist for hosting 2.6.19-rc work. Let's keep trunk for etch targeted 2.6.18 for now. ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7811 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: . debian
Author: luther Date: Sat Nov 18 21:45:06 2006 New Revision: 7811 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Log: Fixed -prep support. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Sat Nov 18 21:45:06 2006 @@ -1,3 +1,9 @@ +mkvmlinuz (26) unstable; urgency=low + + * Fixed -prep support. + + -- Sven Luther [EMAIL PROTECTED] Sat, 18 Nov 2006 21:41:01 +0100 + mkvmlinuz (25) unstable; urgency=low [ Christian Perrier ] Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Sat Nov 18 21:45:06 2006 @@ -140,13 +140,13 @@ fi fi -if dpkg --compare-versions $release ge 2.6.16; then +if dpkg --compare-versions $release ge 2.6.16 test $arch != prep ; then post_2_6_16=Yes else post_2_6_16= fi -if dpkg --compare-versions $release ge 2.6.18; then +if dpkg --compare-versions $release ge 2.6.18 $arch != prep ; then post_2_6_18=Yes else post_2_6_18= ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7723 - in dists/trunk/linux-modules-extra-2.6: debian mol
Author: luther Date: Thu Nov 9 09:45:37 2006 New Revision: 7723 Added: dists/trunk/linux-modules-extra-2.6/mol/ dists/trunk/linux-modules-extra-2.6/mol/copyright dists/trunk/linux-modules-extra-2.6/mol/defines dists/trunk/linux-modules-extra-2.6/mol/rules dists/trunk/linux-modules-extra-2.6/mol/rules.old Modified: dists/trunk/linux-modules-extra-2.6/debian/changelog dists/trunk/linux-modules-extra-2.6/debian/rules.defs Log: applied but disabled mol patch. Reverted the gencontrol.py changes from the patch, since it broke. Needs flavour support. Notice that the build breaks in unionfs, because of missing sioq.h. Modified: dists/trunk/linux-modules-extra-2.6/debian/changelog == --- dists/trunk/linux-modules-extra-2.6/debian/changelog(original) +++ dists/trunk/linux-modules-extra-2.6/debian/changelogThu Nov 9 09:45:37 2006 @@ -1,3 +1,10 @@ +linux-modules-extra-2.6 (2.6.18-2) UNRELEASED; urgency=low + + * Add mol modules. ### DISABLED FOR NOW SINCE BROKEN ### + * Update to 2.6.18-2. + + -- Gaudenz Steinlin [EMAIL PROTECTED] Sat, 7 Oct 2006 18:05:43 +0200 + linux-modules-extra-2.6 (2.6.18-1) unstable; urgency=low * Update to 2.6.18. Modified: dists/trunk/linux-modules-extra-2.6/debian/rules.defs == --- dists/trunk/linux-modules-extra-2.6/debian/rules.defs (original) +++ dists/trunk/linux-modules-extra-2.6/debian/rules.defs Thu Nov 9 09:45:37 2006 @@ -1 +1 @@ -KERNELVERSION := 2.6.18-1 +KERNELVERSION := 2.6.18-2 Added: dists/trunk/linux-modules-extra-2.6/mol/copyright == --- (empty file) +++ dists/trunk/linux-modules-extra-2.6/mol/copyright Thu Nov 9 09:45:37 2006 @@ -0,0 +1,25 @@ +This package was debianized by Jens Schmalzing [EMAIL PROTECTED] on +Thu, 19 Apr 2001 16:09:51 +0200. + +Officially released versions were downloaded from +ftp://ftp.nada.kth.se/home/f95-sry/Public/mac-on-linux/ . + +Snapshots of development versions were obtained from the anonymous +rsync tree at zorn.theophys.kth.se::mol, followed by `make libimport'. + +Meanwhile, both of the above-mentioned locations have moved, to +http://www.maconlinux.org/downloads/ and rsync.penguinppc.org::mol, +respectively. + +No activity on http://www.maconlinux.org/ since 2004. This package is now +built from unofficial sources downloaded from http://dev.gentoo.org/~josejx/ + +Copyright: + +(C) 1997-2004 Samuel Rydh [EMAIL PROTECTED] + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public Licence version 2. + +See the file /usr/share/common-licenses/GPL-2 for more information. + Added: dists/trunk/linux-modules-extra-2.6/mol/defines == --- (empty file) +++ dists/trunk/linux-modules-extra-2.6/mol/defines Thu Nov 9 09:45:37 2006 @@ -0,0 +1,12 @@ +[base] +arches: + powerpc +flavours: powerpc powerpc-smp powerpc-miboot +desc: Mac-on-Linux emulator +longdesc: + Mac-on-Linux is basically an emulator capable of running + MacOS on most Debian/PowerPC machines. However, several + things are not emulated -- in particular, the processor + runs natively, which makes Mac-on-Linux very fast. The + main drawback is the need for special support code in the + kernel. Added: dists/trunk/linux-modules-extra-2.6/mol/rules == --- (empty file) +++ dists/trunk/linux-modules-extra-2.6/mol/rules Thu Nov 9 09:45:37 2006 @@ -0,0 +1,10 @@ +export BUILD_SHEEP=m + +$(BUILD_STAMP): + $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/kmod $(JOBS_ARG) + $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/netdriver $(JOBS_ARG) + touch $@ + +install: + $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/kmod modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE) + $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR)/netdriver modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) INSTALL_MOD_DIR=extra/$(MODULE) Added: dists/trunk/linux-modules-extra-2.6/mol/rules.old == --- (empty file) +++ dists/trunk/linux-modules-extra-2.6/mol/rules.old Thu Nov 9 09:45:37 2006 @@ -0,0 +1,7 @@ + +$(BUILD_STAMP): + $(MAKE) -f $(DIR)/Makefile + touch $@ + +install: + $(MAKE) -f $(DIR)/Makefile install ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7672 - in dists/trunk/linux-2.6/debian: . patches/bugfix/powerpc patches/series
Author: luther
Date: Wed Nov 1 09:00:32 2006
New Revision: 7672
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/interrupt-alignement.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/4
Log:
Added interrupt alignement patch from Benjamin Herrenschmidt.
Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Wed Nov 1 09:00:32 2006
@@ -38,7 +38,10 @@
* r8169: pull revert mac address change support.
* [amd64]: Add upstream fix C3 timer test for dual core laptops.
- -- maximilian attems [EMAIL PROTECTED] Mon, 30 Oct 2006 16:54:29 +0100
+ [ Sven Luther ]
+ * [powerpc] Added exception alignement patch from Benjamin Herrenschmidt.
+
+ -- Sven Luther [EMAIL PROTECTED] Wed, 1 Nov 2006 08:57:13 +0100
linux-2.6 (2.6.18-3) unstable; urgency=low
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/interrupt-alignement.patch
==
--- (empty file)
+++
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/interrupt-alignement.patch
Wed Nov 1 09:00:32 2006
@@ -0,0 +1,39 @@
+# Fixes exceptions alignement.
+# Author: Benjamin Herrenschmidt benh at kernel.crashing.org
+# Reference: http://ozlabs.org/pipermail/linuxppc-dev/2006-October/027374.html
+# Upstream: will be pushed upstream.
+
+Index: linux-work/arch/powerpc/kernel/traps.c
+===
+--- linux-work.orig/arch/powerpc/kernel/traps.c2006-10-23
14:41:37.0 +1000
linux-work/arch/powerpc/kernel/traps.c 2006-10-30 13:59:41.0
+1100
+@@ -843,7 +843,7 @@ void __kprobes program_check_exception(s
+
+ void alignment_exception(struct pt_regs *regs)
+ {
+- int fixed = 0;
++ int sig, fixed = 0;
+
+ /* we don't implement logging of alignment exceptions */
+ if (!(current-thread.align_ctl PR_UNALIGN_SIGBUS))
+@@ -856,15 +856,11 @@ void alignment_exception(struct pt_regs
+ }
+
+ /* Operand address was bad */
+- if (fixed == -EFAULT) {
+- if (user_mode(regs))
+- _exception(SIGSEGV, regs, SEGV_ACCERR, regs-dar);
+- else
+- /* Search exception table */
+- bad_page_fault(regs, regs-dar, SIGSEGV);
+- return;
+- }
+- _exception(SIGBUS, regs, BUS_ADRALN, regs-dar);
++ sig = fixed == -EFAULT ? SIGSEGV : SIGBUS;
++ if (user_mode(regs))
++ _exception(sig, regs, SEGV_ACCERR, regs-dar);
++ else
++ bad_page_fault(regs, regs-dar, sig);
+ }
+
+ void StackOverflow(struct pt_regs *regs)
Modified: dists/trunk/linux-2.6/debian/patches/series/4
==
--- dists/trunk/linux-2.6/debian/patches/series/4 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/4 Wed Nov 1 09:00:32 2006
@@ -20,3 +20,4 @@
+ features/arm/ixp4xx-0.2.1-driver.patch
+ features/arm/ixp4xx-net-driver-fix-qmgr.patch
+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
++ bugfix/powerpc/interrupt-alignement.patch
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7677 - dists/trunk/linux-2.6/debian/patches/bugfix/powerpc
Author: luther
Date: Wed Nov 1 22:34:14 2006
New Revision: 7677
Modified:
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/interrupt-alignement.patch
Log:
Updated powerpc interrupt alignement patch.
Modified:
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/interrupt-alignement.patch
==
---
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/interrupt-alignement.patch
(original)
+++
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/interrupt-alignement.patch
Wed Nov 1 22:34:14 2006
@@ -1,37 +1,92 @@
# Fixes exceptions alignement.
# Author: Benjamin Herrenschmidt benh at kernel.crashing.org
-# Reference: http://ozlabs.org/pipermail/linuxppc-dev/2006-October/027374.html
+# Reference: http://ozlabs.org/pipermail/linuxppc-dev/2006-November/027453.html
# Upstream: will be pushed upstream.
+The alignment exception used to only check the exception table for
+-EFAULT, not for other errors. That opens an oops window if we can
+coerce the kernel into getting an alignment exception for other reasons
+in what would normally be a user-protected accessor, which can be done
+via some of the futex ops. This fixes it by always checking the
+exception tables.
+
+Signed-off-by: Benjamin Herrenschmidt [EMAIL PROTECTED]
+---
+
+Paul: this version sets the correct si_code
+
+This is 2.6.19 material and should probably go into stable as well.
+(Greg: take it if paulus acks it and it applies :)
+
Index: linux-work/arch/powerpc/kernel/traps.c
===
linux-work.orig/arch/powerpc/kernel/traps.c2006-10-23
14:41:37.0 +1000
-+++ linux-work/arch/powerpc/kernel/traps.c 2006-10-30 13:59:41.0
+1100
+--- linux-work.orig/arch/powerpc/kernel/traps.c2006-11-01
14:59:07.0 +1100
linux-work/arch/powerpc/kernel/traps.c 2006-11-01 15:01:06.0
+1100
@@ -843,7 +843,7 @@ void __kprobes program_check_exception(s
void alignment_exception(struct pt_regs *regs)
{
- int fixed = 0;
-+ int sig, fixed = 0;
++ int sig, code, fixed = 0;
/* we don't implement logging of alignment exceptions */
if (!(current-thread.align_ctl PR_UNALIGN_SIGBUS))
-@@ -856,15 +856,11 @@ void alignment_exception(struct pt_regs
- }
+@@ -857,14 +857,16 @@ void alignment_exception(struct pt_regs
/* Operand address was bad */
-- if (fixed == -EFAULT) {
+ if (fixed == -EFAULT) {
- if (user_mode(regs))
- _exception(SIGSEGV, regs, SEGV_ACCERR, regs-dar);
- else
- /* Search exception table */
- bad_page_fault(regs, regs-dar, SIGSEGV);
- return;
-- }
++ sig = SIGSEGV;
++ code = SEGV_ACCERR;
++ } else {
++ sig = SIGBUS;
++ code = BUS_ADRALN;
+ }
+- _exception(SIGBUS, regs, BUS_ADRALN, regs-dar);
++ if (user_mode(regs))
++ _exception(sig, regs, code, regs-dar);
++ else
++ bad_page_fault(regs, regs-dar, sig);
+ }
+
+ void StackOverflow(struct pt_regs *regs)
+Index: linux-work/arch/ppc/kernel/traps.c
+===
+--- linux-work.orig/arch/ppc/kernel/traps.c2006-11-01 14:59:07.0
+1100
linux-work/arch/ppc/kernel/traps.c 2006-11-01 15:01:32.0 +1100
+@@ -708,7 +708,7 @@ void single_step_exception(struct pt_reg
+
+ void alignment_exception(struct pt_regs *regs)
+ {
+- int fixed;
++ int sig, code, fixed = 0;
+
+ fixed = fix_alignment(regs);
+ if (fixed == 1) {
+@@ -717,14 +717,16 @@ void alignment_exception(struct pt_regs
+ return;
+ }
+ if (fixed == -EFAULT) {
+- /* fixed == -EFAULT means the operand address was bad */
+- if (user_mode(regs))
+- _exception(SIGSEGV, regs, SEGV_ACCERR, regs-dar);
+- else
+- bad_page_fault(regs, regs-dar, SIGSEGV);
+- return;
++ sig = SIGSEGV;
++ code = SEGV_ACCERR;
++ } else {
++ sig = SIGBUS;
++ code = BUS_ADRALN;
+ }
- _exception(SIGBUS, regs, BUS_ADRALN, regs-dar);
-+ sig = fixed == -EFAULT ? SIGSEGV : SIGBUS;
+ if (user_mode(regs))
-+ _exception(sig, regs, SEGV_ACCERR, regs-dar);
++ _exception(sig, regs, code, regs-dar);
+ else
+ bad_page_fault(regs, regs-dar, sig);
}
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7614 - dists/trunk/linux-2.6/debian
Author: luther Date: Mon Oct 16 07:44:43 2006 New Revision: 7614 Modified: dists/trunk/linux-2.6/debian/changelog Log: Added bug closer for 392065. Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Mon Oct 16 07:44:43 2006 @@ -24,7 +24,7 @@ - V4L: copy-paste bug in videodev.c - block layer: elv_iosched_show should get elv_list_lock - NETFILTER: NAT: fix NOTRACK checksum handling - - bcm43xx: fix regressions in 2.6.18 + - bcm43xx: fix regressions in 2.6.18 (Closes: #392065) - x86-64: Calgary IOMMU: Fix off by one when calculating register space location - ide-generic: jmicron fix ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7594 - dists/trunk/scripts
Author: luther Date: Tue Oct 10 21:05:32 2006 New Revision: 7594 Modified: dists/trunk/scripts/kconfig.ml Log: Added support for diffing config files in kconfig.ml. Modified: dists/trunk/scripts/kconfig.ml == --- dists/trunk/scripts/kconfig.ml (original) +++ dists/trunk/scripts/kconfig.ml Tue Oct 10 21:05:32 2006 @@ -1,41 +1,120 @@ #!/usr/bin/ocamlrun /usr/bin/ocaml +(* + * kconfig.ml Copyright (C) 2006 Sven Luther [EMAIL PROTECTED] + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +(* + * Syntax : + * kconfig.ml action [-bs sourcedir] file [file] + *action : single | check | create | diff + *file : -c filename | [-b basedir | -ba basedir] -a arch [-s subarch] -f flavour + *) + +let usage_string = + Usage:\n\n ^ +Check single config file : ./kconfig.ml single -c filename\n ^ +Create config file : ./kconfig.ml create [ -ba dir | -b dir ] -a arch [ -s subarch ] -f flavour\n ^ +Check all config files : ./kconfig.ml check [ -ba dir | -b dir ] [ -bs dir ]\n ^ +Diff two config files: ./kconfig.ml diff [ -ba dir | -b dir ] config config\n ^ + where config is : (-c filename | -a arch [ -s subarch ] -f flavour)\n ^ + \nOptions:\n + +(* Command line argument parsing *) +exception Bad_action of string +exception Double_action of string +exception Bad_args of string + +type action = Single | Check | Create | Diff | NoAction | Help +let action = ref NoAction +let set_action a = + if !action != NoAction then raise (Double_action a) else + match a with + | check - action := Check + | create - action := Create + | diff - action := Diff + | single - action := Single + | _ - raise (Bad_action a) +let string_of_action = function + | Single - single + | Check - check + | Create - create + | Diff - diff + | NoAction - NoAction + | Help - Help -(* Command line arguments parsing *) let basedir = ref debian/arch let sourcedir = ref . -let arch = ref -let subarch = ref -let flavour = ref -let config_name = ref -let verbose = ref false -let archindir = ref false +let set_basedir archindir dir = + basedir := if archindir then Filename.dirname dir else dir -type action = Single | Create | Check -let action = ref Create +type kind = TConfig | TArch | TSubarch | TFlavour +type temp = (kind * string) list +let temp : temp ref = ref [] +let set_temp k s = temp := (k,s) :: !temp +let rec print_temp = function + | [] - () + | (TConfig,s)::t - Printf.printf Config %s\n s; print_temp t + | (TArch,s)::t - Printf.printf Arch %s\n s; print_temp t + | (TSubarch,s)::t - Printf.printf Subarch %s\n s; print_temp t + | (TFlavour,s)::t - Printf.printf Flavour %s\n s; print_temp t +let string_of_temp_error a s l = + let rec pte e = function + | [] - e + | (TConfig,s)::t - pte (e ^ (Printf.sprintf -c %s s)) t + | (TArch,s)::t - pte (e ^ (Printf.sprintf -a %s s)) t + | (TSubarch,s)::t - pte (e ^ (Printf.sprintf -s %s s)) t + | (TFlavour,s)::t - pte (e ^ (Printf.sprintf -f %s s)) t + in + (match a with Some a - Printf.sprintf-a %s a | None - ) ^ + (match s with Some s - Printf.sprintf -s %s s | None - ) ^ + (pte l) + +type config = Config of string | Flavour of string * string | Subarch of string * string * string +let config_of_temp t = + let rec config_of_temp ta ts l = match ta, ts, l with + | None, None, (TArch,a)::t - config_of_temp (Some a) None t + | Some a, None, (TSubarch,s)::t - config_of_temp (Some a) (Some s) t + | Some a, Some s, (TFlavour,f)::t - (Subarch (a,s,f))::(config_of_temp None None t) + | Some a, None, (TFlavour,f)::t - (Flavour (a,f))::(config_of_temp None None t) + | None, None, (TConfig,f)::t - (Config f)::(config_of_temp None None t) + | None, None, [] - [] + | _, _, _ - raise (Bad_args (string_of_temp_error ta ts l)) + in config_of_temp None None t + +let rec print_configs = function + | [] - () + | (Config f) :: t - Printf.printf Config file: %s\n f; print_configs t + | (Flavour (a,f)) :: t - Printf.printf Arch: %s, Flavour: %s\n a f; print_configs t + | (Subarch (a,s,f)) :: t - Printf.printf Arch: %s, Subarch: %s, Flavour: %s\n a s f; print_configs t -let set_action a () = action := a +let verbose = ref false let spec = [ - -b, Arg.Set_string basedir, base dir of the arch
[kernel] r7595 - in dists/trunk/linux-2.6/debian: . arch/powerpc
Author: luther Date: Tue Oct 10 21:19:37 2006 New Revision: 7595 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 dists/trunk/linux-2.6/debian/changelog Log: Added AMD74xx driver to powerpc64 flavour. Closes #391861. Particular blame goes to Frans Pop, who couldn't stop himself from bashing the powerpc kernel maintainers, as usual. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 == --- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 Tue Oct 10 21:19:37 2006 @@ -109,5 +109,4 @@ CONFIG_MIGRATION=y CONFIG_CMDLINE=console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0 # CONFIG_MV643XX_ETH is not set - - +CONFIG_BLK_DEV_AMD74XX=m Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Tue Oct 10 21:19:37 2006 @@ -31,6 +31,10 @@ * bugfix/sky2-receive-FIFO-fix.patch: fix sky2 hangs on some chips Thanks to Stephen Hemminger for the patch. (Closes: #391382) + [ Sven Luther ] + * [powerpc] Added AMD74xx driver module to the powerpc64 flavour +(Closes: #391861). + -- Bastian Blank [EMAIL PROTECTED] Tue, 10 Oct 2006 16:40:26 +0200 linux-2.6 (2.6.18-2) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7568 - dists/trunk/scripts
Author: luther Date: Sun Oct 1 20:49:31 2006 New Revision: 7568 Modified: dists/trunk/scripts/kconfig.ml Log: Updated kconfig.ml with the version deleted by Bastian in the linux-2.6 tree. Modified: dists/trunk/scripts/kconfig.ml == --- dists/trunk/scripts/kconfig.ml (original) +++ dists/trunk/scripts/kconfig.ml Sun Oct 1 20:49:31 2006 @@ -1,26 +1,43 @@ #!/usr/bin/ocamlrun /usr/bin/ocaml +(* Command line arguments parsing *) let basedir = ref debian/arch +let sourcedir = ref . let arch = ref +let subarch = ref let flavour = ref let config_name = ref +let verbose = ref false +let archindir = ref false + +type action = Single | Create | Check +let action = ref Create + +let set_action a () = action := a let spec = [ -b, Arg.Set_string basedir, base dir of the arch configurations [default: debian/arch]; - -a, Arg.Set_string arch, architecture; + -bs, Arg.Set_string sourcedir, base source dir containing the patched debian linux source tree [default: .]; + -ba, Arg.Set archindir, basedir includes arch; + -a, Arg.Set_string arch, arch; + -s, Arg.Set_string subarch, subarch; -f, Arg.Set_string flavour, flavour; + -v, Arg.Set verbose, verbose; + -c, Arg.Unit (set_action Check), check; ] let usage = - ./kconfig.ml [ -b basedir ] -a arch -f flavour ^ \n ^ - ./kconfig.ml config_file + Check single config file : ./kconfig.ml config_file\n ^ + Create config file : ./kconfig.ml [ -ba ] [ -b basedir ] -a arch [ -s subarch ] -f flavour ^ \n ^ + Check all config files : ./kconfig.ml -c [ -ba ] [ -b basedir ] [ -bs sourcedir ] [ -a arch ] [ -s subarch ] [ -f flavour ] ^ \n let () = Arg.parse spec - (function s - config_name := s) + (function s - config_name := s; action := Single) usage let usage () = Arg.usage spec usage +(* Config file parsing *) type options = | Config_Yes of string | Config_No of string @@ -38,8 +55,9 @@ | Config_Empty - Printf.printf \n exception Comment +exception Error -let parse_line fd = +let parse_config_line fd = let line = input_line fd in let len = String.length line in if len = 0 then Config_Empty else @@ -77,7 +95,7 @@ (* Map.add behavior ensures the latest entry is the one staying *) let rec parse_config fd m = try -let line = parse_line fd in +let line = parse_config_line fd in match line with | Config_Comment _ | Config_Empty - parse_config fd m | Config_Yes s | Config_No s | Config_Module s | Config_Value (s,_) - @@ -86,26 +104,117 @@ let print_config m = C.iter (function _ - print_option) m -let () = - if !config_name then -try - let config = open_in !config_name in - let m = parse_config config C.empty in - print_config m; - close_in config -with Sys_error s - Printf.printf Error: %s\n s - else if !arch!flavour then -try - let config = open_in (!basedir ^ /config) in - let m = parse_config config C.empty in - close_in config; - let config = open_in (!basedir ^ / ^ !arch ^ /config) in - let m = parse_config config C.empty in - close_in config; - let config = open_in (!basedir ^ / ^ !arch ^ /config. ^ !flavour) in - let m = parse_config config C.empty in - close_in config; - print_config m; -with Sys_error s - Printf.printf Error: %s\n s +let parse_config_file name m force = + try +let config = open_in name in +let m = parse_config config m in +close_in config; +m + with Sys_error s - +if force then raise (Sys_error s) else m + +(* Defines parsing *) +type define = + | Defines_Base of string + | Defines_Field of string * string + | Defines_List of string + | Defines_Comment of string + | Defines_Error of string + | Defines_Empty + +let print_define = function + | Defines_Base s - Printf.printf [%s]\n s + | Defines_Field (n, v) - Printf.printf %s:%s\n n v + | Defines_List s - Printf.printf %s\n s + | Defines_Comment s - Printf.printf #%s\n s + | Defines_Error s - Printf.printf *** ERROR *** %s\n s + | Defines_Empty - Printf.printf \n + +let parse_define_line fd = + let line = input_line fd in + let len = String.length line in + if len = 0 then begin Defines_Empty end else + try +match line.[0] with +| '#' - Defines_Comment (String.sub line 1 (len - 1)) +| '[' - begin +try + let c = String.index_from line 1 ']' in + Defines_Base (String.sub line 1 (c - 1)) +with Not_found | Invalid_argument String.sub - raise Error + end +| ' ' - Defines_List (String.sub line 1 (len - 1)) +| _ - begin +try + let c = String.index_from line 1 ':' in + Defines_Field (String.sub line 0 c, String.sub line (c + 1) (len - c - 1)) +with Not_found | Invalid_argument String.sub - raise Error + end + with Error - Defines_Error line + +let rec parse_defines fd m l = +
Re: [kernel] r7535 - dists/trunk/linux-2.6/debian/patches
On Wed, Sep 27, 2006 at 08:40:21AM +, Bastian Blank wrote: Author: waldi Date: Wed Sep 27 08:40:20 2006 New Revision: 7535 Modified: dists/trunk/linux-2.6/debian/patches/powerpc-build-links.patch Log: debian/patches/powerpc-build-links.patch: Also fixup compatibility symlink in the ppc tree. Thanks for this, Bastian. Friendly, Sven Luther ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7488 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: . debian
Author: luther Date: Sat Sep 23 19:39:26 2006 New Revision: 7488 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Log: Adapted arch/powerpc/boot uncompressor list to 2.6.18 kernels. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Sat Sep 23 19:39:26 2006 @@ -1,3 +1,9 @@ +mkvmlinuz (24) unstable; urgency=low + + * Adapted uncompressor object list to 2.6.18. + + -- Sven Luther [EMAIL PROTECTED] Sat, 23 Sep 2006 21:36:49 +0200 + mkvmlinuz (23) unstable; urgency=low * Fallback arch/powerpc/boot object files for chrp kernels without mkvmlinuz Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Sat Sep 23 19:39:26 2006 @@ -146,6 +146,12 @@ post_2_6_16= fi +if dpkg --compare-versions $release ge 2.6.18; then + post_2_6_18=Yes +else + post_2_6_18= +fi + test -z $verbose || echo === Release version seems to be $release. # if no object file directory was specified, try to find one @@ -215,7 +221,11 @@ dummy_kernel=$objs/mkvmlinuz-kernel-vmlinux.strip.o dummy_initrd=$objs/mkvmlinuz-kernel-initrd.o OBJS=$objs/crt0.o $objs/string.o $objs/prom.o $objs/stdio.o $objs/main.o $objs/div64.o - OBJS=$OBJS $objs/infblock.o $objs/infcodes.o $objs/inffast.o $objs/inflate.o $objs/inftrees.o $objs/infutil.o + if test $post_2_6_18; then + OBJS=$OBJS $objs/inffast.o $objs/inflate.o $objs/inftrees.o + else + OBJS=$OBJS $objs/infblock.o $objs/infcodes.o $objs/inffast.o $objs/inflate.o $objs/inftrees.o $objs/infutil.o + fi ;; apus,,*|miboot,,*|*,Yes,*) ;; ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7490 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: . debian
Author: luther Date: Sat Sep 23 19:54:41 2006 New Revision: 7490 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Log: Re-enabled -prep support. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Sat Sep 23 19:54:41 2006 @@ -1,8 +1,9 @@ mkvmlinuz (24) unstable; urgency=low * Adapted uncompressor object list to 2.6.18. + * Re-enabled -prep support. - -- Sven Luther [EMAIL PROTECTED] Sat, 23 Sep 2006 21:36:49 +0200 + -- Sven Luther [EMAIL PROTECTED] Sat, 23 Sep 2006 21:51:52 +0200 mkvmlinuz (23) unstable; urgency=low Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Sat Sep 23 19:54:41 2006 @@ -371,7 +371,7 @@ do_cmd $MKNOTE $work/note do_cmd $OBJCOPY $OBJCOPY_ARGS $vmlinuz $vmlinuz ;; -ppcbug,,2.6*) +ppcbug,*,2.6*) if [ -z $linkaddr ]; then linkaddr=0x0080; fi LD_ARGS=$LD_ARGS -Ttext $linkaddr -Bstatic OBJCOPY_ARGS=-O elf32-powerpc $OBJCOPY_ARGS -R .stab -R .stabstr -R .sysmap @@ -379,7 +379,7 @@ do_cmd $OBJCOPY $OBJCOPY_ARGS $vmlinuz $vmlinuz.tmp do_cmd $MKBUGBOOT $vmlinuz.tmp $vmlinuz ;; -prep,,2.6*) +prep,*,2.6*) if [ -z $linkaddr ]; then linkaddr=0x0080; fi LD_ARGS=$LD_ARGS -Ttext $linkaddr -Bstatic OBJCOPY_ARGS=-O elf32-powerpc $OBJCOPY_ARGS -R .stab -R .stabstr -R .sysmap ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7492 - dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian
Author: luther Date: Sat Sep 23 20:03:07 2006 New Revision: 7492 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Log: Fixed typoed email address in changelog. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Sat Sep 23 20:03:07 2006 @@ -3,7 +3,7 @@ * Adapted uncompressor object list to 2.6.18. * Re-enabled -prep support. - -- Sven Luther [EMAIL PROTECTED] Sat, 23 Sep 2006 21:51:52 +0200 + -- Sven Luther [EMAIL PROTECTED] Sat, 23 Sep 2006 21:51:52 +0200 mkvmlinuz (23) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7494 - releases/utils/mkvmlinuz/24
Author: luther Date: Sat Sep 23 20:05:31 2006 New Revision: 7494 Added: releases/utils/mkvmlinuz/24/ - copied from r7493, /dists/trunk/utils/mkvmlinuz/mkvmlinuz/ Log: Tagged mkvmlinuz 24 after upload. ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
Re: [kernel] r7478 - in dists/trunk/linux-2.6/debian/patches: . bugfix/powerpc
On Thu, Sep 21, 2006 at 07:09:23PM +, Bastian Blank wrote: Author: waldi Date: Thu Sep 21 19:09:22 2006 New Revision: 7478 Removed: dists/trunk/linux-2.6/debian/patches/fs-asfs.patch Why did you remove this, we are working on a fix to it, so it can be reenabled :/ Friendly, Sven Luther ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7470 - in dists/trunk/linux-2.6/debian: . arch/powerpc arch/powerpc/vserver patches/series
Author: luther Date: Wed Sep 20 17:06:24 2006 New Revision: 7470 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/patches/series/1 Log: mv643xx_eth is only ever useful on 32bit, sodisable its built on powerpc64, where it caused build problem. backing out Bastian patch which is thus no more needed. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 == --- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 Wed Sep 20 17:06:24 2006 @@ -109,4 +109,6 @@ CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_MIGRATION=y CONFIG_CMDLINE=console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0 +# CONFIG_MV643XX_ETH is not set + Modified: dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 == --- dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 Wed Sep 20 17:06:24 2006 @@ -108,3 +108,4 @@ # CONFIG_LPARCFG is not set CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_MIGRATION=y +# CONFIG_MV643XX_ETH is not set Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Wed Sep 20 17:06:24 2006 @@ -25,6 +25,8 @@ Herrenschmidt for providing the patch. (Closes: #366620, #375035). * [powerpc] Fixes hvc_console caused suspsend-to-disk breakage. Thanks to Andrew Morton for providing the patch. (Closes: #387178) + * [powerpc] Disabled mv643xx_eth on powerpc64 flavours, as there never was a +Marvell Discovery northbrige for 64bit powerpc cpus. [ Frederik Schüler ] * Remove obsolete options from amd64 and i386 configs. @@ -36,7 +38,7 @@ * Enable CONFIG_PRINTER=m for all powerpc flavours. * Enable the new alsa CONFIG_SND_AOA framework for powerpc. - -- Bastian Blank [EMAIL PROTECTED] Wed, 20 Sep 2006 12:09:47 +0200 + -- Sven Luther [EMAIL PROTECTED] Wed, 20 Sep 2006 19:00:51 +0200 linux-2.6 (2.6.17-8) UNRELEASED; urgency=low Modified: dists/trunk/linux-2.6/debian/patches/series/1 == --- dists/trunk/linux-2.6/debian/patches/series/1 (original) +++ dists/trunk/linux-2.6/debian/patches/series/1 Wed Sep 20 17:06:24 2006 @@ -30,4 +30,3 @@ + arm-get_unaligned-gcc41-const.patch + powerpc-serial.patch + powerpc-oldworld-boot-fix.patch -+ bugfix/powerpc/mv643-define.patch ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7439 - in dists/trunk/linux-2.6/debian: . patches
Author: luther
Date: Mon Sep 18 12:08:36 2006
New Revision: 7439
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.patch
Log:
Added new patch by Benjamin Herrenschmidt for the powermac/oldworld/quik
ramdisk bug.
Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Mon Sep 18 12:08:36 2006
@@ -20,9 +20,9 @@
port, but at the cost powermac pcmcia serial cards support.
Thanks go to Mark Hymers for providing the patch.
(Closes: #364637, #375194)
- * [powerpc] Added tentative patch to fix oldworld ramdisk size bug.
-Thanks fo to Christian Aichinger for investigating and providing the
-patch. (Closes: #366620, #375035).
+ * [powerpc] Added patch to fix oldworld/quik booting.
+Thanks fo to Christian Aichinger for investigating to Benjamin
+Herrenschmidt for providingthe patch. (Closes: #366620, #375035).
* [powerpc] Fixes hvc_console caused suspsend-to-disk breakage. Thanks to
Andrew Morton for providing the patch. (Closes: #387178)
Modified: dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.patch
==
--- dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.patch
(original)
+++ dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.patch
Mon Sep 18 12:08:36 2006
@@ -1,40 +1,54 @@
-#
-# Patch author: Christian Aichinger [EMAIL PROTECTED]
+# Patch author: Benjamin Herrenschmidt [EMAIL PROTECTED]
# Description: Fix oldworld initrd loading problems.
-# The kernel somehow loses the information where the initrd image is
-# placed in memory. The correct data is there in
-# arch/powerpc/kernel/prom_init.c:prom_check_initrd(), but in
-# init/initramfs.c:populate_rootfs() it's wrong, initrd_{start,end}
-# are both 0.
-# arch/powerpc/kernel/prom_init.c:prom_check_initrd() is broken. The
-# relevant part of the code is:
+# It looks like older OF setprop is bogus and isn't actually copying the
+# data but just taking a pointer. The LongTrail workaround also has that
+# problem as property will not copy the data. This fixes the workaround
+# and applies it to Apple OF 1.0.5.
+# Signed-off-by: Benjamin Herrenschmidt [EMAIL PROTECTED]
# Closes:
# 375035: Kernel 2.6.16 attempts to access root device before running
initramfs init
# 366620: initramfs-tools: 2.6.16-1-powerpc fails to mount rootfs,
2.6.15-1-powerpc works
#
a/arch/powerpc/kernel/prom_init.c 2006-09-15 18:33:50.0 +0200
-+++ b/arch/powerpc/kernel/prom_init.c 2006-09-15 18:33:44.0 +0200
-@@ -2141,17 +2141,17 @@
- struct prom_t *_prom = RELOC(prom);
+Index: linux-tika/arch/powerpc/kernel/prom_init.c
+===
+--- linux-tika.orig/arch/powerpc/kernel/prom_init.c2006-09-02
09:53:00.0 +1000
linux-tika/arch/powerpc/kernel/prom_init.c 2006-09-18 20:55:26.0
+1000
+@@ -102,7 +102,7 @@
+ #endif
- if (r3 r4 r4 != 0xdeadbeef) {
-- unsigned long val;
-+ unsigned long *ptr;
+ #define OF_WA_CLAIM 1 /* do phys/virt claim separately, then map */
+-#define OF_WA_LONGTRAIL 2 /* work around longtrail bugs */
++#define OF_WA_SETPROP 2 /* work around setprop bugs */
- RELOC(prom_initrd_start) = is_kernel_addr(r3) ? __pa(r3) : r3;
- RELOC(prom_initrd_end) = RELOC(prom_initrd_start) + r4;
+ #define PROM_BUG() do { \
+ prom_printf(kernel BUG at %s line 0x%x!\n, \
+@@ -472,7 +472,7 @@
+ {
+ char cmd[256], *p;
-- val = RELOC(prom_initrd_start);
-+ ptr = RELOC(prom_initrd_start);
- prom_setprop(_prom-chosen, /chosen, linux,initrd-start,
-- val, sizeof(val));
-- val = RELOC(prom_initrd_end);
-+ ptr, sizeof(prom_initrd_start));
-+ ptr = RELOC(prom_initrd_end);
- prom_setprop(_prom-chosen, /chosen, linux,initrd-end,
-- val, sizeof(val));
-+ ptr, sizeof(prom_initrd_end));
+- if (!(OF_WORKAROUNDS OF_WA_LONGTRAIL))
++ if (!(OF_WORKAROUNDS OF_WA_SETPROP))
+ return call_prom(setprop, 4, 1, node, ADDR(pname),
+(u32)(unsigned long) value, (u32) valuelen);
- reserve_mem(RELOC(prom_initrd_start),
- RELOC(prom_initrd_end) - RELOC(prom_initrd_start));
+@@ -482,6 +482,7 @@
+ add_string(p, nodename);
+ add_string(p, tohex((u32)(unsigned long) value));
+ add_string(p, tohex(valuelen));
++
[kernel] r7428 - in dists/trunk/linux-2.6/debian: . arch/powerpc
Author: luther Date: Sun Sep 17 20:26:21 2006 New Revision: 7428 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config dists/trunk/linux-2.6/debian/arch/powerpc/config.apus dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot dists/trunk/linux-2.6/debian/changelog Log: The sisfb framebuffer device is now builtin on powerpc, except for the apus and miboot flavours. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config == --- dists/trunk/linux-2.6/debian/arch/powerpc/config(original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/configSun Sep 17 20:26:21 2006 @@ -886,7 +886,7 @@ CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m +CONFIG_FB_SIS=y CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y CONFIG_FB_NEOMAGIC=m Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.apus == --- dists/trunk/linux-2.6/debian/arch/powerpc/config.apus (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/config.apus Sun Sep 17 20:26:21 2006 @@ -163,3 +163,4 @@ # CONFIG_BLZ1230_SCSI is not set # CONFIG_BLZ2060_SCSI is not set # CONFIG_IPMI_HANDLER is not set +# CONFIG_FB_SIS is not set Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot == --- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot Sun Sep 17 20:26:21 2006 @@ -84,3 +84,5 @@ CONFIG_FB_IMSTT=y # CONFIG_PPC64 is not set CONFIG_CLASSIC32=y +CONFIG_FB_SIS=m + Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Sun Sep 17 20:26:21 2006 @@ -15,6 +15,7 @@ [ Sven Luther ] * [powerpc] Enabled the -prep flavour. + * [powerpc] The sisfb framebuffer device is now builtin. [ Frederik Schüler ] * Remove obsolete options from amd64 and i386 configs. ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7429 - in dists/trunk/linux-2.6/debian: . patches patches/series
Author: luther
Date: Sun Sep 17 20:31:29 2006
New Revision: 7429
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/powerpc-serial.patch
dists/trunk/linux-2.6/debian/patches/series/0experimental.1
Log:
Added patch from Mark Hymers to enable serial port on Xserve, but at the
expense of pcmcia serial ports.
Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Sun Sep 17 20:31:29 2006
@@ -16,6 +16,9 @@
[ Sven Luther ]
* [powerpc] Enabled the -prep flavour.
* [powerpc] The sisfb framebuffer device is now builtin.
+ * [powerpc] Updated the powerpc serial patch. This fixes the XServe serial
+port, but at the cost powermac pcmcia serial cards support.
+Thanks go to Mark Hymers for providing the patch.
[ Frederik Schüler ]
* Remove obsolete options from amd64 and i386 configs.
Modified: dists/trunk/linux-2.6/debian/patches/powerpc-serial.patch
==
--- dists/trunk/linux-2.6/debian/patches/powerpc-serial.patch (original)
+++ dists/trunk/linux-2.6/debian/patches/powerpc-serial.patch Sun Sep 17
20:31:29 2006
@@ -4,28 +4,29 @@
## DP: Description: Disables legacy serial driver on powermacs.
## DP: Patch author: Sven Luther [EMAIL PROTECTED]
## DP: Patch author: adapted from the SuSE kernel tree.
+## DP: Forward ported to 2.6.17 by Mark Hymers [EMAIL PROTECTED]
## DP: Upstream status: workaround hack waiting for a clean legacy device
solution.
diff -aurN a/drivers/serial/8250.c b/drivers/serial/8250.c
--- a/drivers/serial/8250.c2005-06-17 15:48:29.0 -0400
+++ b/drivers/serial/8250.c2005-06-18 12:05:39.0 -0400
-@@ -46,6 +46,10 @@
+@@ -45,6 +45,10 @@
+ #include asm/io.h
+ #include asm/irq.h
- #include 8250.h
-
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+#include asm/processor.h
++#ifdef CONFIG_PPC_PMAC
++#include asm/machdep.h
+#endif
+
+ #include 8250.h
+
/*
- * Configuration:
- * share_irqs - whether we pass SA_SHIRQ to request_irq(). This option
-@@ -2188,6 +2192,12 @@
+@@ -2307,6 +2312,12 @@
static int __init serial8250_console_init(void)
{
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+ if(_machine == _MACH_Pmac) {
++#ifdef CONFIG_PPC_PMAC
++ if(machine_is(powermac)) {
+ printk(%s: nothing to do on PowerMac\n,__FUNCTION__);
+ return -ENODEV;
+ }
@@ -33,16 +34,17 @@
serial8250_isa_init_ports();
register_console(serial8250_console);
return 0;
-@@ -2491,6 +2501,12 @@
+@@ -2617,6 +2628,13 @@
{
int ret, i;
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+ if(_machine == _MACH_Pmac) {
-+ printk(%s: nothing to do on PowerMac\n,__FUNCTION__);
-+ return -ENODEV;
-+ }
++#ifdef CONFIG_PPC_PMAC
++if(machine_is(powermac)) {
++printk(%s: nothing to do on PowerMac\n,__FUNCTION__);
++return -ENODEV;
++}
+#endif
- printk(KERN_INFO Serial: 8250/16550 driver $Revision: 1.90 $
- %d ports, IRQ sharing %sabled\n, (int) UART_NR,
- share_irqs ? en : dis);
++
+ if (nr_uarts UART_NR)
+ nr_uarts = UART_NR;
+
Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1 Sun Sep 17
20:31:29 2006
@@ -29,3 +29,4 @@
+ powerpc-mkvmlinuz-support-powerpc.patch
+ arm-iop-fix-cpuid
+ arm-get_unaligned-gcc41-const.patch
++ powerpc-serial.patch
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7431 - in dists/trunk/linux-2.6/debian: . patches patches/series
Author: luther
Date: Sun Sep 17 20:37:49 2006
New Revision: 7431
Added:
dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.diff
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/0experimental.1
Log:
Added tentative patch to fix oldworld ramdisk size bug.
Thanks fo to Christian Aichinger for investigating and providing the patch.
(Closes: #366620, #375035).
Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Sun Sep 17 20:37:49 2006
@@ -19,6 +19,9 @@
* [powerpc] Updated the powerpc serial patch. This fixes the XServe serial
port, but at the cost powermac pcmcia serial cards support.
Thanks go to Mark Hymers for providing the patch.
+ * [powerpc] Added tentative patch to fix oldworld ramdisk size bug.
+Thanks fo to Christian Aichinger for investigating and providing the
+patch. (Closes: #366620, #375035).
[ Frederik Schüler ]
* Remove obsolete options from amd64 and i386 configs.
Added: dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.diff
==
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/powerpc-oldworld-boot-fix.diff Sun Sep
17 20:37:49 2006
@@ -0,0 +1,40 @@
+#
+# Patch author: Christian Aichinger [EMAIL PROTECTED]
+# Description: Fix oldworld initrd loading problems.
+# The kernel somehow loses the information where the initrd image is
+# placed in memory. The correct data is there in
+# arch/powerpc/kernel/prom_init.c:prom_check_initrd(), but in
+# init/initramfs.c:populate_rootfs() it's wrong, initrd_{start,end}
+# are both 0.
+# arch/powerpc/kernel/prom_init.c:prom_check_initrd() is broken. The
+# relevant part of the code is:
+# Closes:
+# 375035: Kernel 2.6.16 attempts to access root device before running
initramfs init
+# 366620: initramfs-tools: 2.6.16-1-powerpc fails to mount rootfs,
2.6.15-1-powerpc works
+#
+
+--- a/arch/powerpc/kernel/prom_init.c 2006-09-15 18:33:50.0 +0200
b/arch/powerpc/kernel/prom_init.c 2006-09-15 18:33:44.0 +0200
+@@ -2141,17 +2141,17 @@
+ struct prom_t *_prom = RELOC(prom);
+
+ if (r3 r4 r4 != 0xdeadbeef) {
+- unsigned long val;
++ unsigned long *ptr;
+
+ RELOC(prom_initrd_start) = is_kernel_addr(r3) ? __pa(r3) : r3;
+ RELOC(prom_initrd_end) = RELOC(prom_initrd_start) + r4;
+
+- val = RELOC(prom_initrd_start);
++ ptr = RELOC(prom_initrd_start);
+ prom_setprop(_prom-chosen, /chosen, linux,initrd-start,
+- val, sizeof(val));
+- val = RELOC(prom_initrd_end);
++ ptr, sizeof(prom_initrd_start));
++ ptr = RELOC(prom_initrd_end);
+ prom_setprop(_prom-chosen, /chosen, linux,initrd-end,
+- val, sizeof(val));
++ ptr, sizeof(prom_initrd_end));
+
+ reserve_mem(RELOC(prom_initrd_start),
+ RELOC(prom_initrd_end) - RELOC(prom_initrd_start));
Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1 Sun Sep 17
20:37:49 2006
@@ -30,3 +30,4 @@
+ arm-iop-fix-cpuid
+ arm-get_unaligned-gcc41-const.patch
+ powerpc-serial.patch
++ powerpc-oldworld-boot-fix.diff
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7432 - dists/trunk/linux-2.6/debian
Author: luther Date: Sun Sep 17 21:00:16 2006 New Revision: 7432 Modified: dists/trunk/linux-2.6/debian/changelog Log: Added bug closer for the -prep support. Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Sun Sep 17 21:00:16 2006 @@ -14,7 +14,7 @@ * arm/ixp4xx: Likewise. [ Sven Luther ] - * [powerpc] Enabled the -prep flavour. + * [powerpc] Enabled the -prep flavour. (Closes: #359025) * [powerpc] The sisfb framebuffer device is now builtin. * [powerpc] Updated the powerpc serial patch. This fixes the XServe serial port, but at the cost powermac pcmcia serial cards support. ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7433 - dists/trunk/linux-2.6/debian
Author: luther Date: Sun Sep 17 22:03:34 2006 New Revision: 7433 Modified: dists/trunk/linux-2.6/debian/changelog Log: Added bug closer. Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Sun Sep 17 22:03:34 2006 @@ -19,6 +19,7 @@ * [powerpc] Updated the powerpc serial patch. This fixes the XServe serial port, but at the cost powermac pcmcia serial cards support. Thanks go to Mark Hymers for providing the patch. +(Closes: #364637) * [powerpc] Added tentative patch to fix oldworld ramdisk size bug. Thanks fo to Christian Aichinger for investigating and providing the patch. (Closes: #366620, #375035). ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7435 - dists/trunk/linux-2.6/debian
Author: luther Date: Sun Sep 17 23:04:41 2006 New Revision: 7435 Modified: dists/trunk/linux-2.6/debian/changelog Log: Added bug closer. Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Sun Sep 17 23:04:41 2006 @@ -19,7 +19,7 @@ * [powerpc] Updated the powerpc serial patch. This fixes the XServe serial port, but at the cost powermac pcmcia serial cards support. Thanks go to Mark Hymers for providing the patch. -(Closes: #364637) +(Closes: #364637, #375194) * [powerpc] Added tentative patch to fix oldworld ramdisk size bug. Thanks fo to Christian Aichinger for investigating and providing the patch. (Closes: #366620, #375035). ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7396 - in dists/sid/linux-2.6/debian: . arch/powerpc
Author: luther Date: Wed Sep 13 17:10:21 2006 New Revision: 7396 Modified: dists/sid/linux-2.6/debian/arch/powerpc/config dists/sid/linux-2.6/debian/arch/powerpc/config.apus dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc-miboot dists/sid/linux-2.6/debian/changelog Log: Now build sisfb in on powerpc (except miboot and apus flavours). Modified: dists/sid/linux-2.6/debian/arch/powerpc/config == --- dists/sid/linux-2.6/debian/arch/powerpc/config (original) +++ dists/sid/linux-2.6/debian/arch/powerpc/config Wed Sep 13 17:10:21 2006 @@ -889,7 +889,7 @@ CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m +CONFIG_FB_SIS=y CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y CONFIG_FB_NEOMAGIC=m Modified: dists/sid/linux-2.6/debian/arch/powerpc/config.apus == --- dists/sid/linux-2.6/debian/arch/powerpc/config.apus (original) +++ dists/sid/linux-2.6/debian/arch/powerpc/config.apus Wed Sep 13 17:10:21 2006 @@ -168,3 +168,5 @@ # CONFIG_BLZ1230_SCSI is not set # CONFIG_BLZ2060_SCSI is not set # CONFIG_IPMI_HANDLER is not set +# CONFIG_FB_SIS is not set + Modified: dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc-miboot == --- dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc-miboot (original) +++ dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc-miboot Wed Sep 13 17:10:21 2006 @@ -84,3 +84,4 @@ CONFIG_FB_IMSTT=y # CONFIG_PPC64 is not set CONFIG_CLASSIC32=y +CONFIG_FB_SIS=m Modified: dists/sid/linux-2.6/debian/changelog == --- dists/sid/linux-2.6/debian/changelog(original) +++ dists/sid/linux-2.6/debian/changelogWed Sep 13 17:10:21 2006 @@ -49,7 +49,10 @@ - s390-kernel-futex-barrier.patch * Unpatch ia64-mman.h-fix.patch - -- Bastian Blank [EMAIL PROTECTED] Wed, 13 Sep 2006 14:54:14 +0200 + [ Sven Luther ] + * [powerpc] now builtin sisfb, so sis/xgi users get a framebuffer device. + + -- Sven Luther [EMAIL PROTECTED] Wed, 13 Sep 2006 19:07:25 +0200 linux-2.6 (2.6.17-8) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7397 - in dists/sid/linux-2.6/debian: . patches
Author: luther
Date: Wed Sep 13 17:17:32 2006
New Revision: 7397
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/powerpc-prom-init-backport.patch
dists/sid/linux-2.6/debian/patches/powerpc-serial.patch
Log:
Added Mark Hymers's forward port of the powerpc serial patch, disabling it on
powermacs.
Reenabled the pegasos isa ranges patch, now that i fixed and tested it :/
Moved changelog entry from already released 9 to 10.
Modified: dists/sid/linux-2.6/debian/changelog
==
--- dists/sid/linux-2.6/debian/changelog(original)
+++ dists/sid/linux-2.6/debian/changelogWed Sep 13 17:17:32 2006
@@ -1,3 +1,13 @@
+linux-2.6 (2.6.17-10) UNRELEASED; urgency=low
+
+ [ Sven Luther ]
+ * [powerpc] now builtin sisfb, so sis/xgi users get a framebuffer device.
+ * [powerpc] prom-init patch, to work around broken pegasos isa ranges.
+ * [powerpc] added disabling of the serial driver on powermacs, courtesy of
+Mark Hymers.
+
+ -- Sven Luther [EMAIL PROTECTED] Wed, 13 Sep 2006 19:12:19 +0200
+
linux-2.6 (2.6.17-9) unstable; urgency=medium
[ Bastian Blank ]
@@ -49,9 +59,6 @@
- s390-kernel-futex-barrier.patch
* Unpatch ia64-mman.h-fix.patch
- [ Sven Luther ]
- * [powerpc] now builtin sisfb, so sis/xgi users get a framebuffer device.
-
-- Sven Luther [EMAIL PROTECTED] Wed, 13 Sep 2006 19:07:25 +0200
linux-2.6 (2.6.17-8) unstable; urgency=low
Modified: dists/sid/linux-2.6/debian/patches/powerpc-prom-init-backport.patch
==
--- dists/sid/linux-2.6/debian/patches/powerpc-prom-init-backport.patch
(original)
+++ dists/sid/linux-2.6/debian/patches/powerpc-prom-init-backport.patch Wed Sep
13 17:17:32 2006
@@ -14,17 +14,7 @@
--- linux-2.6.17.11/arch/powerpc/kernel/prom_init.c.orig 2006-09-10
11:04:34.0 +0200
+++ linux-2.6.17.11/arch/powerpc/kernel/prom_init.c2006-09-10
11:09:26.0 +0200
-@@ -565,7 +565,9 @@
- static void __init early_cmdline_parse(void)
- {
- struct prom_t *_prom = RELOC(prom);
-+#ifdef CONFIG_PPC64
- const char *opt;
-+#endif
- char *p;
- int l = 0;
-
-@@ -2103,6 +2105,37 @@
+@@ -2101,6 +2103,38 @@
#define fixup_device_tree_maple()
#endif
@@ -55,6 +45,7 @@
+ isa_ranges[5] = 0x0001;
+ prom_setprop(isa, name, ranges,
+ isa_ranges, sizeof(isa_ranges));
++}
+#else
+#define fixup_device_tree_chrp()
+#endif
Modified: dists/sid/linux-2.6/debian/patches/powerpc-serial.patch
==
--- dists/sid/linux-2.6/debian/patches/powerpc-serial.patch (original)
+++ dists/sid/linux-2.6/debian/patches/powerpc-serial.patch Wed Sep 13
17:17:32 2006
@@ -4,28 +4,29 @@
## DP: Description: Disables legacy serial driver on powermacs.
## DP: Patch author: Sven Luther [EMAIL PROTECTED]
## DP: Patch author: adapted from the SuSE kernel tree.
+## DP: Forward ported to 2.6.17 by Mark Hymers [EMAIL PROTECTED]
## DP: Upstream status: workaround hack waiting for a clean legacy device
solution.
diff -aurN a/drivers/serial/8250.c b/drivers/serial/8250.c
--- a/drivers/serial/8250.c2005-06-17 15:48:29.0 -0400
+++ b/drivers/serial/8250.c2005-06-18 12:05:39.0 -0400
-@@ -46,6 +46,10 @@
+@@ -45,6 +45,10 @@
+ #include asm/io.h
+ #include asm/irq.h
- #include 8250.h
-
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+#include asm/processor.h
++#ifdef CONFIG_PPC_PMAC
++#include asm/machdep.h
+#endif
+
+ #include 8250.h
+
/*
- * Configuration:
- * share_irqs - whether we pass SA_SHIRQ to request_irq(). This option
-@@ -2188,6 +2192,12 @@
+@@ -2307,6 +2312,12 @@
static int __init serial8250_console_init(void)
{
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+ if(_machine == _MACH_Pmac) {
++#ifdef CONFIG_PPC_PMAC
++ if(machine_is(powermac)) {
+ printk(%s: nothing to do on PowerMac\n,__FUNCTION__);
+ return -ENODEV;
+ }
@@ -33,16 +34,17 @@
serial8250_isa_init_ports();
register_console(serial8250_console);
return 0;
-@@ -2491,6 +2501,12 @@
+@@ -2617,6 +2628,13 @@
{
int ret, i;
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+ if(_machine == _MACH_Pmac) {
-+ printk(%s: nothing to do on PowerMac\n,__FUNCTION__);
-+ return -ENODEV;
-+ }
++#ifdef CONFIG_PPC_PMAC
++if(machine_is(powermac)) {
++printk(%s: nothing to do on PowerMac\n,__FUNCTION__);
++return -ENODEV;
++}
+#endif
- printk(KERN_INFO Serial: 8250/16550 driver $Revision: 1.90 $
- %d ports, IRQ sharing %sabled\n, (int) UART_NR,
- share_irqs ? en : dis);
++
+ if (nr_uarts UART_NR)
+ nr_uarts = UART_NR;
+
___
Kernel-svn-changes mailing list
[kernel] r7357 - in dists/trunk/linux-2.6/debian: . arch/powerpc
Author: luther Date: Thu Sep 7 08:48:55 2006 New Revision: 7357 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines dists/trunk/linux-2.6/debian/changelog Log: Cleaned up changelog entries and imported latest 2.6.17 entries from the sid branch. Enabled the -prep flavour again, since i confirmed that the config file works. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines == --- dists/trunk/linux-2.6/debian/arch/powerpc/defines (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/defines Thu Sep 7 08:48:55 2006 @@ -4,6 +4,8 @@ powerpc-smp powerpc-miboot powerpc64 + prep +# apus kernel-header-dirs: powerpc ppc m68k kernel-arch: powerpc kpkg-subarch: ppc Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Thu Sep 7 08:48:55 2006 @@ -1,19 +1,32 @@ -linux-2.6 (2.6.17+2.6.18-rc6-0experimental.2) UNRELEASED; urgency=low +linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low + + [ Bastian Blank ] + * Initial 2.6.18-rc packaging. [ Martin Michlmayr ] * Bump build-dependency on kernel-package to 10.054. * arm/iop32x: Build ext2/3 as modules. * arm/iop32x: Disable CONFIG_EMBEDDED. - -- Bastian Blank [EMAIL PROTECTED] Tue, 5 Sep 2006 11:05:54 +0200 + [ Sven Luther ] + * [powerpc] Enabled -prep flavour. + + -- Sven Luther [EMAIL PROTECTED] Thu, 7 Sep 2006 10:30:17 +0200 -linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low +linux-2.6 (2.6.17-9) UNRELEASED; urgency=low - * + [ dann frazier ] + * drivers-ide-pci-via82cxxx-vt8237a-id.patch, +drivers-ide-pci-via82cxxx-vt8237a-id-2.patch: +Add missing PCI ID for VT8237A chips, reported by Radek Oliwa. - -- Bastian Blank [EMAIL PROTECTED] Tue, 5 Sep 2006 11:05:54 +0200 + [ Bastian Blank ] + * Update vserver patch to 2.0.2. +- Fix possible priviledge escalation in remount code. (CVE-2006-4243) -linux-2.6 (2.6.17-8) UNRELEASED; urgency=low + -- Bastian Blank [EMAIL PROTECTED] Mon, 4 Sep 2006 18:20:24 +0200 + +linux-2.6 (2.6.17-8) unstable; urgency=low [ Martin Michlmayr ] * arm/ixp4xx: Enable CONFIG_W1. @@ -24,7 +37,22 @@ Updates to patch_sigmatel.c to add x86 mac-mini sound support Thanks to Matt Kraai. (closes: #384972) - -- dann frazier [EMAIL PROTECTED] Tue, 29 Aug 2006 00:06:48 -0600 + [ Kyle McMartin ] + * hppa: Re-enable pa8800 fixing patches from James Bottomley. +Pulled fresh from parisc-linux git tree. + * ia64: Pull in compile-failure fix from Christian Cotte-Barrot. +Pulled from linux-ia64 mailing list. Fix is correct. + * hppa/alpha/mips: Fix compile-failure due to missing arch_mmap_check. Patch sent +upstream to [EMAIL PROTECTED] + + [ dann frazier ] + * sym2: only claim Storage class devices - the cpqarray driver should be +used for 5c1510 devices in RAID mode. (closes: #380272) + + [ Bastian Blank ] + * Backport change to allow all hypercalls for xen. + + -- Bastian Blank [EMAIL PROTECTED] Thu, 31 Aug 2006 12:12:51 +0200 linux-2.6 (2.6.17-7) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7359 - in dists/trunk/linux-2.6/debian: . arch/powerpc
Author: luther Date: Thu Sep 7 09:10:07 2006 New Revision: 7359 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines dists/trunk/linux-2.6/debian/changelog Log: Imported 2.6.17 sid branch changelog. Added powerpc -prep flavour, since it is confirmed to build. kept empty experimental1 changelog entry, even though it seems strange. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines == --- dists/trunk/linux-2.6/debian/arch/powerpc/defines (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/defines Thu Sep 7 09:10:07 2006 @@ -4,6 +4,8 @@ powerpc-smp powerpc-miboot powerpc64 + prep +# apus kernel-header-dirs: powerpc ppc m68k kernel-arch: powerpc kpkg-subarch: ppc Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Thu Sep 7 09:10:07 2006 @@ -5,7 +5,10 @@ * arm/iop32x: Build ext2/3 as modules. * arm/iop32x: Disable CONFIG_EMBEDDED. - -- Bastian Blank [EMAIL PROTECTED] Tue, 5 Sep 2006 11:05:54 +0200 + [ Sven Luther ] + * [powerpc] Enabled the -prep flavour. + + -- Sven Luther [EMAIL PROTECTED] Thu, 7 Sep 2006 11:06:50 +0200 linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low @@ -13,7 +16,20 @@ -- Bastian Blank [EMAIL PROTECTED] Tue, 5 Sep 2006 11:05:54 +0200 -linux-2.6 (2.6.17-8) UNRELEASED; urgency=low +linux-2.6 (2.6.17-9) UNRELEASED; urgency=low + + [ dann frazier ] + * drivers-ide-pci-via82cxxx-vt8237a-id.patch, +drivers-ide-pci-via82cxxx-vt8237a-id-2.patch: +Add missing PCI ID for VT8237A chips, reported by Radek Oliwa. + + [ Bastian Blank ] + * Update vserver patch to 2.0.2. +- Fix possible priviledge escalation in remount code. (CVE-2006-4243) + + -- Bastian Blank [EMAIL PROTECTED] Mon, 4 Sep 2006 18:20:24 +0200 + +linux-2.6 (2.6.17-8) unstable; urgency=low [ Martin Michlmayr ] * arm/ixp4xx: Enable CONFIG_W1. @@ -24,7 +40,23 @@ Updates to patch_sigmatel.c to add x86 mac-mini sound support Thanks to Matt Kraai. (closes: #384972) - -- dann frazier [EMAIL PROTECTED] Tue, 29 Aug 2006 00:06:48 -0600 + [ Kyle McMartin ] + * hppa: Re-enable pa8800 fixing patches from James Bottomley. +Pulled fresh from parisc-linux git tree. + * ia64: Pull in compile-failure fix from Christian Cotte-Barrot. +Pulled from linux-ia64 mailing list. Fix is correct. + * hppa/alpha/mips: Fix compile-failure due to missing arch_mmap_check. Patch sent +upstream to [EMAIL PROTECTED] + + [ dann frazier ] + * sym2: only claim Storage class devices - the cpqarray driver should be +used for 5c1510 devices in RAID mode. (closes: #380272) + + [ Bastian Blank ] + * Backport change to allow all hypercalls for xen. + + -- Bastian Blank [EMAIL PROTECTED] Thu, 31 Aug 2006 12:12:51 +0200 + linux-2.6 (2.6.17-7) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
Re: [kernel] r7360 - in dists/trunk/linux-2.6/debian: . arch/powerpc
On Thu, Sep 07, 2006 at 09:18:18AM +, Bastian Blank wrote: Author: waldi Date: Thu Sep 7 09:18:17 2006 New Revision: 7360 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines dists/trunk/linux-2.6/debian/changelog Log: Revert r7359: Always merge _all_ sensible changes since the last merge without breaking the state which defines the merge base. Bastian, can you please stop this svn commit game, and actually explain what you are speaking about ? The above two logs seems pure giberish to me, as i did a svn up on the changelog file (on the whole trunk/linux-2.6 subtree even), and did a clean merge. The removal of the experimental1 package, i understand, even though you should have added some info into the changelog for the experimental1, since as it was, it seemed a mistake from Martin. Also, do you have any hint or idea on the build failure ? It seems to die in one of the nice python scripts as Zomb discovered yesterday : 22:53 Zomb make[3]: Leaving directory `/home/bloch/debian/kernel/linux-2.6/linux-2.6-2.6.17+2.6.18-rc5/debian/build/build-powerpc-none-prep' 22:53 Zomb python2.4 debian/bin/abicheck.py debian/build/build-powerpc-none-prep powerpc none prep 22:53 Zomb Traceback (most recent call last): 22:53 Zomb File debian/bin/abicheck.py, line 88, in ? 22:53 Zomb ok, what is missing? 22:58 svenl Zomb: i had the same error. waldi you around ? Friendly, Sven Luther ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7361 - in dists/trunk/linux-2.6/debian: . arch/powerpc
Author: luther Date: Thu Sep 7 10:01:49 2006 New Revision: 7361 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines dists/trunk/linux-2.6/debian/changelog Log: Well, only commit the prep enablement, and let Bastian sort out the mess that is the changelog file. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines == --- dists/trunk/linux-2.6/debian/arch/powerpc/defines (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/defines Thu Sep 7 10:01:49 2006 @@ -4,6 +4,8 @@ powerpc-smp powerpc-miboot powerpc64 + prep +# apus kernel-header-dirs: powerpc ppc m68k kernel-arch: powerpc kpkg-subarch: ppc Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Thu Sep 7 10:01:49 2006 @@ -5,7 +5,10 @@ * arm/iop32x: Build ext2/3 as modules. * arm/iop32x: Disable CONFIG_EMBEDDED. - -- Bastian Blank [EMAIL PROTECTED] Tue, 5 Sep 2006 11:05:54 +0200 + [ Sven Luther ] + * [powerpc] Enabled the -prep flavour. + + -- Sven Luther [EMAIL PROTECTED] Thu, 7 Sep 2006 11:59:26 +0200 linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7362 - dists/trunk/linux-2.6/debian/patches/series
Author: luther Date: Thu Sep 7 10:14:41 2006 New Revision: 7362 Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra Log: removed broken xen patch from -extra : cd 'debian/build/source-amd64-xen'; python2.4 '/home/sven/debian/kernel/package/linux-2.6-2.6.17+2.6.18-rc5/debian/bin/patch-apply' --overwrite-home='/home/sven/debian/kernel/package/linux-2.6-2.6.17+2.6.18-rc5/debian/patches' -a amd64 -s xen Warning: Can't find series file for 0experimental.2 1 out of 2 hunks FAILED -- saving rejects to file arch/x86_64/kernel/init_task.c.rej (+) FAIL xen-fedora-35901.patch make[2]: *** [debian/stamps/source-amd64-xen] Error 1 make[2]: Leaving directory `/home/sven/debian/kernel/package/linux-2.6-2.6.17+2.6.18-rc5' make[1]: *** [source-amd64-xen-real] Error 2 make[1]: Leaving directory `/home/sven/debian/kernel/package/linux-2.6-2.6.17+2.6.18-rc5' Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra == --- dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra (original) +++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra Thu Sep 7 10:14:41 2006 @@ -1,4 +1,3 @@ -+ xen-fedora-35901.patch *_xen *_xen-vserver + mips-tulip.patch mipsel + mips-tulip_dc21143.patch mipsel + mips-dec-scsi.patch mipsel ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7363 - dists/trunk/linux-2.6/debian/patches/series
Author: luther Date: Thu Sep 7 10:15:57 2006 New Revision: 7363 Added: dists/trunk/linux-2.6/debian/patches/series/0experimental.2 Log: Added various powerpc patches that got removed, as they apply well with source-all. Added: dists/trunk/linux-2.6/debian/patches/series/0experimental.2 == --- (empty file) +++ dists/trunk/linux-2.6/debian/patches/series/0experimental.2 Thu Sep 7 10:15:57 2006 @@ -0,0 +1,3 @@ ++ fs-asfs.patch ++ powerpc-mkvmlinuz-support-ppc.patch ++ powerpc-mkvmlinuz-support-powerpc.patch ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7367 - dists/trunk/linux-2.6/debian/patches
Author: luther Date: Thu Sep 7 15:12:07 2006 New Revision: 7367 Modified: dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch Log: Fixed patch, removed openfirmware support, since now only simple is built from ARCH=ppc. Modified: dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch == --- dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch (original) +++ dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch Thu Sep 7 15:12:07 2006 @@ -20,7 +20,7 @@ # --- linux-kernel-2.6.12-2.6.12/arch/ppc/boot/Makefile.orig 2005-07-15 12:46:28.0 + +++ linux-kernel-2.6.12-2.6.12/arch/ppc/boot/Makefile 2005-07-15 12:55:56.0 + -@@ -32,3 +32,37 @@ +@@ -32,3 +32,25 @@ $(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \ $(addprefix $(obj)/,$(hostprogs-y)) $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS) @@ -29,9 +29,6 @@ + # mkvmlinuz support, based on work done originally by Jens Schmalzing [EMAIL PROTECTED] + mkdir -p $(INSTALL_MKVMLINUZ)/boot + install -m 644 ld.script $(INSTALL_MKVMLINUZ)/boot -+ if [ -e openfirmware/note ]; then \ -+ install -m 644 openfirmware/note $(INSTALL_MKVMLINUZ)/boot; \ -+ fi + + mkdir -p $(INSTALL_MKVMLINUZ)/lib + install -m 644 ../../../lib/lib.a $(INSTALL_MKVMLINUZ)/lib @@ -41,20 +38,11 @@ + install -m 644 of1275/lib.a $(INSTALL_MKVMLINUZ)/lib/of.a; \ + fi + -+ if [ -e openfirmware/common.o ]; then \ -+ mkdir -p $(INSTALL_MKVMLINUZ)/obj/openfirmware; \ -+ install -m 644 openfirmware/*.o $(INSTALL_MKVMLINUZ)/obj/openfirmware; \ -+ rm -f $(INSTALL_MKVMLINUZ)/obj/openfirmware/image*; \ -+ fi -+ + mkdir -p $(INSTALL_MKVMLINUZ)/obj/simple + install -m 644 simple/*.o $(INSTALL_MKVMLINUZ)/obj/simple + rm -f $(INSTALL_MKVMLINUZ)/obj/simple/image*.o + + mkdir -p $(INSTALL_MKVMLINUZ)/utils -+ install -m 755 utils/addnote $(INSTALL_MKVMLINUZ)/utils -+ install -m 755 utils/hack-coff $(INSTALL_MKVMLINUZ)/utils + install -m 755 utils/mkbugboot $(INSTALL_MKVMLINUZ)/utils -+ install -m 755 utils/mknote $(INSTALL_MKVMLINUZ)/utils + install -m 755 utils/mkprep $(INSTALL_MKVMLINUZ)/utils + install -m 755 utils/mktree $(INSTALL_MKVMLINUZ)/utils ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7365 - dists/trunk/linux-2.6/debian/patches/series
Author: luther Date: Thu Sep 7 11:27:44 2006 New Revision: 7365 Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.2 Log: Mmm, disabled fs-asfs again, since altough it applies, it fails to build. Pinged patch author. Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.2 == --- dists/trunk/linux-2.6/debian/patches/series/0experimental.2 (original) +++ dists/trunk/linux-2.6/debian/patches/series/0experimental.2 Thu Sep 7 11:27:44 2006 @@ -1,3 +1,2 @@ -+ fs-asfs.patch + powerpc-mkvmlinuz-support-ppc.patch + powerpc-mkvmlinuz-support-powerpc.patch ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7118 - in dists/sid/linux-2.6/debian: arch/powerpc
Author: luther Date: Wed Aug 9 18:32:50 2006 New Revision: 7118 Modified: dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64 dists/sid/linux-2.6/debian/changelog Log: [powerpc] Added console=hvsi0 too to CMDLINE to the powerpc64 flavour. Modified: dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64 == --- dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64(original) +++ dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64Wed Aug 9 18:32:50 2006 @@ -111,5 +111,5 @@ # CONFIG_LPARCFG is not set CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_MIGRATION=y -CONFIG_CMDLINE=console=hvc0 console=ttyS0,9600 console=tty0 +CONFIG_CMDLINE=console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0 Modified: dists/sid/linux-2.6/debian/changelog == --- dists/sid/linux-2.6/debian/changelog(original) +++ dists/sid/linux-2.6/debian/changelogWed Aug 9 18:32:50 2006 @@ -51,7 +51,11 @@ - Don't allow chmod() on the /proc/pid/ files - PCI: fix issues with extended conf space when MMCONFIG disabled because of e820 - -- maximilian attems [EMAIL PROTECTED] Tue, 8 Aug 2006 09:50:28 +0200 + [ Sven Luther ] + * [powerpc] Added console=hvsi0 too to CMDLINE to the powerpc64 flavour, for +non-virtualized IBM power machines serial console. + + -- Sven Luther [EMAIL PROTECTED] Wed, 9 Aug 2006 20:28:41 +0200 linux-2.6 (2.6.17-5) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7119 - in dists/sid/linux-2.6.16/debian: .
Author: luther Date: Wed Aug 9 18:36:23 2006 New Revision: 7119 Modified: dists/sid/linux-2.6.16/debian/arch/powerpc/config.powerpc64 dists/sid/linux-2.6.16/debian/changelog Log: [powerpc] Added console=hvsi0 too to CMDLINE to the powerpc64 flavour. Modified: dists/sid/linux-2.6.16/debian/arch/powerpc/config.powerpc64 == --- dists/sid/linux-2.6.16/debian/arch/powerpc/config.powerpc64 (original) +++ dists/sid/linux-2.6.16/debian/arch/powerpc/config.powerpc64 Wed Aug 9 18:36:23 2006 @@ -110,4 +110,4 @@ CONFIG_SPU_FS=m CONFIG_SPIDER_NET=m # CONFIG_LPARCFG is not set -CONFIG_CMDLINE=console=hvc0 console=ttyS0,9600 console=tty0 +CONFIG_CMDLINE=console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0 Modified: dists/sid/linux-2.6.16/debian/changelog == --- dists/sid/linux-2.6.16/debian/changelog (original) +++ dists/sid/linux-2.6.16/debian/changelog Wed Aug 9 18:36:23 2006 @@ -1,3 +1,10 @@ +linux-2.6.16 (2.6.16-18) UNRELEASED; urgency=low + + * [powerpc] Added console=hvsi0 too to CMDLINE to the powerpc64 flavour, +for non-virtualized IBM power machines serial console. + + -- Sven Luther [EMAIL PROTECTED] Wed, 9 Aug 2006 20:34:19 +0200 + linux-2.6.16 (2.6.16-17) unstable; urgency=high [ Martin Michlmayr ] ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r7120 - in dists/trunk/linux-2.6/debian: .
Author: luther Date: Wed Aug 9 18:38:00 2006 New Revision: 7120 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 dists/trunk/linux-2.6/debian/changelog Log: [powerpc] Added console=hvsi0 too to CMDLINE to the powerpc64 flavour. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 == --- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 Wed Aug 9 18:38:00 2006 @@ -111,5 +111,5 @@ # CONFIG_LPARCFG is not set CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_MIGRATION=y -CONFIG_CMDLINE=console=hvc0 console=ttyS0,9600 console=tty0 +CONFIG_CMDLINE=console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0 Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Wed Aug 9 18:38:00 2006 @@ -1,8 +1,13 @@ linux-2.6 (2.6.17+2.6.18-rc3-0experimental.1) unstable; urgency=low - * + [ Bastian Blank ] + * Initial fork. + + [ Sven Luther ] + * [powerpc] Added console=hvsi0 too to CMDLINE to the powerpc64 flavour, +for non-virtualized IBM power machines serial console. - -- Bastian Blank [EMAIL PROTECTED] Sun, 06 Aug 2006 23:41:23 +0200 + -- Sven Luther [EMAIL PROTECTED] Wed, 9 Aug 2006 20:35:39 +0200 linux-2.6 (2.6.17-5) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6951 - in dists/trunk/linux-2.6/debian: . patches/series
Author: luther Date: Wed Jul 5 21:39:23 2006 New Revision: 6951 Added: dists/trunk/linux-2.6/debian/patches/fs-asfs.patch - copied, changed from r6949, /dists/trunk/linux-2.6/debian/patches/fs-asfs-2.patch Removed: dists/trunk/linux-2.6/debian/patches/fs-asfs-2.patch Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/patches/series/3 Log: Fixed trivial mis-applying asfs hunk, and readded it. Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Wed Jul 5 21:39:23 2006 @@ -1,5 +1,6 @@ linux-2.6 (2.6.17-3) UNRELEASED; urgency=low + [ maximilian attems ] * Add stable release 2.6.17.2: - ide-io: increase timeout value to allow for slave wakeup - NTFS: Critical bug fix (affects MIPS and possibly others) @@ -33,7 +34,10 @@ reference, the asfs patch is in the Debian kernel. Remove reference to AMD 768 erratum 10, it was solved in 2.6.12. Add wording corrections. - -- maximilian attems [EMAIL PROTECTED] Tue, 4 Jul 2006 14:30:11 +0200 + [ Sven Luther ] + * Re-enabled fs-asfs patch. + + -- Sven Luther [EMAIL PROTECTED] Wed, 5 Jul 2006 23:25:30 +0200 linux-2.6 (2.6.17-2) unstable; urgency=low Copied: dists/trunk/linux-2.6/debian/patches/fs-asfs.patch (from r6949, /dists/trunk/linux-2.6/debian/patches/fs-asfs-2.patch) == --- /dists/trunk/linux-2.6/debian/patches/fs-asfs-2.patch (original) +++ dists/trunk/linux-2.6/debian/patches/fs-asfs.patch Wed Jul 5 21:39:23 2006 @@ -9,15 +9,15 @@ diff -aurN a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX --- a/Documentation/filesystems/00-INDEX 2005-06-06 11:22:29.0 -0400 +++ b/Documentation/filesystems/00-INDEX 2005-06-15 22:05:09.0 -0400 -@@ -6,6 +6,8 @@ - - info and mount options for the Acorn Advanced Disc Filing System. +@@ -10,6 +10,8 @@ + - info and examples for the distributed AFS (Andrew File System) fs. affs.txt - info and mount options for the Amiga Fast File System. +asfs.txt + - info and mount options for the Amiga Smart File System. - bfs.txt - - info for the SCO UnixWare Boot Filesystem (BFS). - cifs.txt + automount-support.txt + - information about filesystem automount support. + befs.txt diff -aurN a/Documentation/filesystems/asfs.txt b/Documentation/filesystems/asfs.txt --- a/Documentation/filesystems/asfs.txt 1969-12-31 19:00:00.0 -0500 +++ b/Documentation/filesystems/asfs.txt 2005-06-15 22:05:09.0 -0400 Modified: dists/trunk/linux-2.6/debian/patches/series/3 == --- dists/trunk/linux-2.6/debian/patches/series/3 (original) +++ dists/trunk/linux-2.6/debian/patches/series/3 Wed Jul 5 21:39:23 2006 @@ -1,3 +1,5 @@ - sparc32-iotlb.patch + 2.6.17.2 + 2.6.17.3 ++ fs-asfs.patch + ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6946 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: debian
Author: luther Date: Tue Jul 4 23:02:01 2006 New Revision: 6946 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz dists/trunk/utils/mkvmlinuz/mkvmlinuz/output Log: Added support for mkvmlinuz /boot/vmlinuz symlink to the latest installed kernel. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Tue Jul 4 23:02:01 2006 @@ -1,9 +1,11 @@ -mkvmlinuz (23) UNRELEASED; urgency=low +mkvmlinuz (23) unstable; urgency=low * Fallback arch/powerpc/boot object files for chrp kernels without mkvmlinuz support. This uses the 2.6.16+ code, but should work with any 2.6 kernel. + * Now supports the creation of a /boot/vmlinuz symlink to the last created +vmlinuz kernel. - -- Sven Luther [EMAIL PROTECTED] Thu, 29 Jun 2006 23:38:07 +0200 + -- Sven Luther [EMAIL PROTECTED] Tue, 4 Jul 2006 22:04:50 +0200 mkvmlinuz (22) unstable; urgency=high Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Tue Jul 4 23:02:01 2006 @@ -384,14 +384,34 @@ echo Sorry, I do not know how to handle PowerPC sub-architecture $arch in version $release. esac -# move bootable kernel image to its final location +# move bootable kernel image to its final location and creating symlinks. if test -e $vmlinuz; then +if test -n $linkname; then + oldlink=`readlink $linkname` +fi test -z $verbose || echo === Moving bootable kernel image file to $output... if test -e $output; then echo Output file $output exists, attempting to back it up... mv $output $output.old 2 /dev/null + if test -n $linkname test $oldlink = `basename $output`; then + oldlink=$output.old + fi fi cat $vmlinuz $output +if test -n $linkname; then + test -z $verbose || echo Creating symlink : $linkname -\ $output + if test -L $linkname; then + unlink $linkname + fi + ln -sf `basename $output` $linkname + if test -n $oldlink; then + test -z $verbose || echo Creating backup symlink : $linkname.old -\ $oldlink + if test -L $linkname.old; then + unlink $linkname.old + fi + ln -sf $oldlink $linkname.old +fi +fi fi # clean up Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/output == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/output(original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/outputTue Jul 4 23:02:01 2006 @@ -25,3 +25,7 @@ #else #output=/boot/vmlinuz-initrd-$release.$arch #fi + +# Let's define also the name of the symlink here. +# An empty $linkname means no symlink created. +linkname=/boot/vmlinuz ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6947 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: debian
Author: luther
Date: Tue Jul 4 23:07:57 2006
New Revision: 6947
Modified:
dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
Log:
Added bug closer.
Now defaults to bash, so we can use bashisms.
Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
==
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Tue Jul 4
23:07:57 2006
@@ -3,7 +3,8 @@
* Fallback arch/powerpc/boot object files for chrp kernels without mkvmlinuz
support. This uses the 2.6.16+ code, but should work with any 2.6 kernel.
* Now supports the creation of a /boot/vmlinuz symlink to the last created
-vmlinuz kernel.
+vmlinuz kernel. (Closes: #260219)
+ * Now uses /bin/bash as interpeter, as we use bashisms. (Closes: #374185)
-- Sven Luther [EMAIL PROTECTED] Tue, 4 Jul 2006 22:04:50 +0200
Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
==
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Tue Jul 4 23:07:57 2006
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# usage information
usage() {
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6949 - releases/utils/mkvmlinuz/23
Author: luther Date: Tue Jul 4 23:12:38 2006 New Revision: 6949 Added: releases/utils/mkvmlinuz/23/ - copied from r6948, /dists/trunk/utils/mkvmlinuz/mkvmlinuz/ Log: Tagged mkvmlinuz 23 after upload. ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6943 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: debian
Author: luther Date: Mon Jul 3 16:44:36 2006 New Revision: 6943 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Log: Well, the code should work for any 2.6 chrp kernel, so removing the post_2_6_16 check. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Mon Jul 3 16:44:36 2006 @@ -1,7 +1,7 @@ mkvmlinuz (23) UNRELEASED; urgency=low - * Fallback arch/powerpc/boot object files, for 2.6.16+ CHRP kernels -without mkvmlinuz support. + * Fallback arch/powerpc/boot object files for chrp kernels without mkvmlinuz +support. This uses the 2.6.16+ code, but should work with any 2.6 kernel. -- Sven Luther [EMAIL PROTECTED] Thu, 29 Jun 2006 23:38:07 +0200 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Mon Jul 3 16:44:36 2006 @@ -159,8 +159,8 @@ : elif objdir=/usr/lib/kernel-image-$release; test -d $objdir; then : -elif objdir=/usr/lib/mkvmlinuz; test -d $objdir test -n $post_2_6_16 test $arch = chrp; then - : +elif objdir=/usr/lib/mkvmlinuz; test -d $objdir test $arch = chrp; then + post_2_6_16=Yes else objdir=$PWD fi ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6919 - in dists/trunk/linux-2.6/debian/arch/powerpc: .
Author: luther Date: Thu Jun 29 08:50:40 2006 New Revision: 6919 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 Log: Made the fancontrol drivers again modular, now that initramfs-tools/yaird include i2c-powermac. Added support for newer powerbook keyboards. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config == --- dists/trunk/linux-2.6/debian/arch/powerpc/config(original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/configThu Jun 29 08:50:40 2006 @@ -1019,6 +1019,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_HID=m CONFIG_USB_HIDINPUT=y +CONFIG_USB_HIDINPUT_POWERBOOK=y CONFIG_HID_FF=y CONFIG_HID_PID=y CONFIG_LOGITECH_FF=y Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 == --- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 Thu Jun 29 08:50:40 2006 @@ -66,8 +66,7 @@ CONFIG_SMP=y CONFIG_STOP_MACHINE=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_I2C_POWERMAC=y -CONFIG_THERM_PM72=y +CONFIG_THERM_PM72=m CONFIG_U3_DART=y CONFIG_WATCHDOG_RTAS=m CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -99,11 +98,11 @@ # CONFIG_PPC_83xx is not set CONFIG_POWER3=y CONFIG_POWER4=y -CONFIG_WINDFARM=y -CONFIG_WINDFARM_PM91=y -CONFIG_WINDFARM_PM112=y +CONFIG_WINDFARM=m +CONFIG_WINDFARM_PM91=m +CONFIG_WINDFARM_PM112=m CONFIG_SPLIT_PTLOCK_CPUS=4096 -CONFIG_WINDFARM_PM81=y +CONFIG_WINDFARM_PM81=m CONFIG_KERNEL_START=0xc000 # CONFIG_MAC_FLOPPY is not set # CONFIG_IBMEBUS is not set Modified: dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 == --- dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 Thu Jun 29 08:50:40 2006 @@ -66,8 +66,7 @@ CONFIG_SMP=y CONFIG_STOP_MACHINE=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_I2C_POWERMAC=y -CONFIG_THERM_PM72=y +CONFIG_THERM_PM72=m CONFIG_U3_DART=y CONFIG_WATCHDOG_RTAS=m CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -99,11 +98,11 @@ # CONFIG_PPC_83xx is not set CONFIG_POWER3=y CONFIG_POWER4=y -CONFIG_WINDFARM=y -CONFIG_WINDFARM_PM91=y -CONFIG_WINDFARM_PM112=y +CONFIG_WINDFARM=m +CONFIG_WINDFARM_PM91=m +CONFIG_WINDFARM_PM112=m CONFIG_SPLIT_PTLOCK_CPUS=4096 -CONFIG_WINDFARM_PM81=y +CONFIG_WINDFARM_PM81=m CONFIG_KERNEL_START=0xc000 # CONFIG_MAC_FLOPPY is not set # CONFIG_IBMEBUS is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6929 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: src
Author: luther Date: Thu Jun 29 21:44:17 2006 New Revision: 6929 Added: dists/trunk/utils/mkvmlinuz/mkvmlinuz/boot/ - copied from r6928, /dists/trunk/utils/mkvmlinuz/mkvmlinuz/src/boot/ Removed: dists/trunk/utils/mkvmlinuz/mkvmlinuz/src/ Log: Moved src/boot to just boot. ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6930 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: debian
Author: luther Date: Thu Jun 29 21:47:20 2006 New Revision: 6930 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Log: Only use the fallback object files on 2.6.16+ CHRP kernels. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Thu Jun 29 21:47:20 2006 @@ -1,7 +1,7 @@ mkvmlinuz (23) UNRELEASED; urgency=low - * Added arch/powerpc/boot object files in /usr/lib/mkvmlinuz, so mkvmlinuz -will work even if the used kernel has no mkvmlinuz support. + * Fallback arch/powerpc/boot object files, for 2.6.16+ CHRP kernels +without mkvmlinuz support. -- Sven Luther [EMAIL PROTECTED] Thu, 29 Jun 2006 23:38:07 +0200 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Thu Jun 29 21:47:20 2006 @@ -159,7 +159,7 @@ : elif objdir=/usr/lib/kernel-image-$release; test -d $objdir; then : -elif test -n $post_2_6_16 ( objdir=/usr/lib/mkvmlinuz; test -d $objdir ); then +elif test -n $post_2_6_16 test $arch = chrp ( objdir=/usr/lib/mkvmlinuz; test -d $objdir ); then : else objdir=$PWD ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6910 - in dists/trunk/linux-2.6/debian: . patches/series
Author: luther Date: Tue Jun 27 12:22:09 2006 New Revision: 6910 Added: dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-powerpc.patch - copied, changed from r6909, /dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-ppc.patch - copied unchanged from r6909, /dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support.patch Removed: dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support.patch Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/patches/series/2 Log: [powerpc] Fixed mkvmlinuz support, closes #375645 Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Tue Jun 27 12:22:09 2006 @@ -9,13 +9,14 @@ [ Sven Luther ] * [powerpc] Added console=hvc0 default commandline option to powerpc64 flavour. * [powerpc] Now THERM_PM72 and all WINDFARMs are builtin, for better fan control. + * [powerpc] Fixed mkvmlinuz support, which was missing from -1. (Closes: #375645) [ Martin Michlmayr ] * [mipsel] Fix compilation error in dz serial driver. * [mipsel] Update configs. * [mipsel] Add a build fix for the Cobalt early console support. - -- Jurij Smakov [EMAIL PROTECTED] Sat, 24 Jun 2006 10:54:59 -0700 + -- Sven Luther [EMAIL PROTECTED] Tue, 27 Jun 2006 13:52:03 +0200 linux-2.6 (2.6.17-1) unstable; urgency=low Copied: dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-powerpc.patch (from r6909, /dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch) == --- /dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch (original) +++ dists/trunk/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-powerpc.patch Tue Jun 27 12:22:09 2006 @@ -18,16 +18,16 @@ # Upstream status: This patch stays a debian specific patch for now, # but it is not in a form where it could go upstream. # linux-2.6.16/arch/powerpc/Makefile.orig2006-04-12 16:57:16.0 + -+++ linux-2.6.16/arch/powerpc/Makefile 2006-04-12 16:58:53.0 + -@@ -148,7 +148,7 @@ +--- linux-2.6.17/arch/powerpc/Makefile.orig2006-04-12 16:57:16.0 + linux-2.6.17/arch/powerpc/Makefile 2006-04-12 16:58:53.0 + +@@ -147,7 +147,7 @@ CPPFLAGS_vmlinux.lds := -Upowerpc --BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage -+BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage mkvmlinuz_support_install +-BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage vmlinux.bin ++BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage vmlinux.bin mkvmlinuz_support_install - .PHONY: $(BOOT_TARGETS) + PHONY += $(BOOT_TARGETS) --- linux-2.6.16/arch/powerpc/boot/Makefile.orig 2006-04-12 16:40:11.0 + +++ linux-2.6.16/arch/powerpc/boot/Makefile2006-04-12 19:23:06.0 + Modified: dists/trunk/linux-2.6/debian/patches/series/2 == --- dists/trunk/linux-2.6/debian/patches/series/2 (original) +++ dists/trunk/linux-2.6/debian/patches/series/2 Tue Jun 27 12:22:09 2006 @@ -1,2 +1,4 @@ + serial-dz.patch + mips-cobalt-console.patch ++ powerpc-mkvmlinuz-support-ppc.patch ++ powerpc-mkvmlinuz-support-powerpc.patch ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6892 - in dists/sid/linux-2.6.16/debian: . arch/powerpc/vserver
Author: luther Date: Sun Jun 25 09:45:06 2006 New Revision: 6892 Modified: dists/sid/linux-2.6.16/debian/arch/powerpc/config.powerpc64 dists/sid/linux-2.6.16/debian/arch/powerpc/vserver/config.powerpc64 dists/sid/linux-2.6.16/debian/changelog Log: Now all powermac G5 fan control modules are builtin. Modified: dists/sid/linux-2.6.16/debian/arch/powerpc/config.powerpc64 == --- dists/sid/linux-2.6.16/debian/arch/powerpc/config.powerpc64 (original) +++ dists/sid/linux-2.6.16/debian/arch/powerpc/config.powerpc64 Sun Jun 25 09:45:06 2006 @@ -66,6 +66,7 @@ CONFIG_SMP=y CONFIG_STOP_MACHINE=y CONFIG_SYSVIPC_COMPAT=y +CONFIG_I2C_POWERMAC=y CONFIG_THERM_PM72=y CONFIG_U3_DART=y CONFIG_WATCHDOG_RTAS=m @@ -98,10 +99,11 @@ # CONFIG_PPC_83xx is not set CONFIG_POWER3=y CONFIG_POWER4=y -CONFIG_WINDFARM_PM91=m -CONFIG_WINDFARM_PM112=m +CONFIG_WINDFARM=y +CONFIG_WINDFARM_PM91=y +CONFIG_WINDFARM_PM112=y CONFIG_SPLIT_PTLOCK_CPUS=4096 -CONFIG_WINDFARM_PM81=m +CONFIG_WINDFARM_PM81=y CONFIG_KERNEL_START=0xc000 # CONFIG_MAC_FLOPPY is not set # CONFIG_IBMEBUS is not set Modified: dists/sid/linux-2.6.16/debian/arch/powerpc/vserver/config.powerpc64 == --- dists/sid/linux-2.6.16/debian/arch/powerpc/vserver/config.powerpc64 (original) +++ dists/sid/linux-2.6.16/debian/arch/powerpc/vserver/config.powerpc64 Sun Jun 25 09:45:06 2006 @@ -66,6 +66,7 @@ CONFIG_SMP=y CONFIG_STOP_MACHINE=y CONFIG_SYSVIPC_COMPAT=y +CONFIG_I2C_POWERMAC=y CONFIG_THERM_PM72=y CONFIG_U3_DART=y CONFIG_WATCHDOG_RTAS=m @@ -98,10 +99,11 @@ # CONFIG_PPC_83xx is not set CONFIG_POWER3=y CONFIG_POWER4=y -CONFIG_WINDFARM_PM91=m -CONFIG_WINDFARM_PM112=m +CONFIG_WINDFARM=y +CONFIG_WINDFARM_PM91=y +CONFIG_WINDFARM_PM112=y CONFIG_SPLIT_PTLOCK_CPUS=4096 -CONFIG_WINDFARM_PM81=m +CONFIG_WINDFARM_PM81=y CONFIG_KERNEL_START=0xc000 # CONFIG_MAC_FLOPPY is not set # CONFIG_IBMEBUS is not set Modified: dists/sid/linux-2.6.16/debian/changelog == --- dists/sid/linux-2.6.16/debian/changelog (original) +++ dists/sid/linux-2.6.16/debian/changelog Sun Jun 25 09:45:06 2006 @@ -2,6 +2,7 @@ [ Sven Luther ] * [powerpc] Added console=hvc0 default commandline option to powerpc64 flavour. + * [powerpc] Now THERM_PM72 and all WINDFARMs are builtin, for better fan control. -- Jurij Smakov [EMAIL PROTECTED] Sat, 24 Jun 2006 11:22:08 -0700 ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6893 - in dists/trunk/linux-2.6/debian: . arch/powerpc
Author: luther Date: Sun Jun 25 10:00:49 2006 New Revision: 6893 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 dists/trunk/linux-2.6/debian/changelog Log: [powerpc] Now THERM_PM72 and all WINDFARMs are builtin, for better fan control. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 == --- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 Sun Jun 25 10:00:49 2006 @@ -66,6 +66,7 @@ CONFIG_SMP=y CONFIG_STOP_MACHINE=y CONFIG_SYSVIPC_COMPAT=y +CONFIG_I2C_POWERMAC=y CONFIG_THERM_PM72=y CONFIG_U3_DART=y CONFIG_WATCHDOG_RTAS=m @@ -98,10 +99,11 @@ # CONFIG_PPC_83xx is not set CONFIG_POWER3=y CONFIG_POWER4=y -CONFIG_WINDFARM_PM91=m -CONFIG_WINDFARM_PM112=m +CONFIG_WINDFARM=y +CONFIG_WINDFARM_PM91=y +CONFIG_WINDFARM_PM112=y CONFIG_SPLIT_PTLOCK_CPUS=4096 -CONFIG_WINDFARM_PM81=m +CONFIG_WINDFARM_PM81=y CONFIG_KERNEL_START=0xc000 # CONFIG_MAC_FLOPPY is not set # CONFIG_IBMEBUS is not set Modified: dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 == --- dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64 Sun Jun 25 10:00:49 2006 @@ -66,6 +66,7 @@ CONFIG_SMP=y CONFIG_STOP_MACHINE=y CONFIG_SYSVIPC_COMPAT=y +CONFIG_I2C_POWERMAC=y CONFIG_THERM_PM72=y CONFIG_U3_DART=y CONFIG_WATCHDOG_RTAS=m @@ -98,10 +99,11 @@ # CONFIG_PPC_83xx is not set CONFIG_POWER3=y CONFIG_POWER4=y -CONFIG_WINDFARM_PM91=m -CONFIG_WINDFARM_PM112=m +CONFIG_WINDFARM=y +CONFIG_WINDFARM_PM91=y +CONFIG_WINDFARM_PM112=y CONFIG_SPLIT_PTLOCK_CPUS=4096 -CONFIG_WINDFARM_PM81=m +CONFIG_WINDFARM_PM81=y CONFIG_KERNEL_START=0xc000 # CONFIG_MAC_FLOPPY is not set # CONFIG_IBMEBUS is not set Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Sun Jun 25 10:00:49 2006 @@ -8,6 +8,7 @@ [ Sven Luther ] * [powerpc] Added console=hvc0 default commandline option to powerpc64 flavour. + * [powerpc] Now THERM_PM72 and all WINDFARMs are builtin, for better fan control. -- Jurij Smakov [EMAIL PROTECTED] Sat, 24 Jun 2006 10:54:59 -0700 ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6889 - in dists/trunk/linux-2.6/debian: .
Author: luther Date: Sat Jun 24 22:09:35 2006 New Revision: 6889 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 dists/trunk/linux-2.6/debian/changelog Log: Added console=hvc0 to -powerpc64 flavour default command line options. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 == --- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 Sat Jun 24 22:09:35 2006 @@ -110,3 +110,5 @@ # CONFIG_LPARCFG is not set CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_MIGRATION=y +CONFIG_CMDLINE=console=hvc0 console=ttyS0,9600 console=tty0 + Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Sat Jun 24 22:09:35 2006 @@ -7,6 +7,9 @@ * [sparc32] Add sparc32-iotlb.patch to fix DMA errors on sparc32. * Add myself to uploaders. + [ Sven Luther ] + * [powerpc] Added console=hvc0 default commandline option to powerpc64 flavour. + -- Jurij Smakov [EMAIL PROTECTED] Sat, 24 Jun 2006 10:54:59 -0700 linux-2.6 (2.6.17-1) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6790 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: debian
Author: luther Date: Mon Jun 12 21:08:13 2006 New Revision: 6790 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Log: Fixed mkvmlinuz support. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Mon Jun 12 21:08:13 2006 @@ -1,3 +1,9 @@ +mkvmlinuz (22) unstable; urgency=high + + * Fixed broken 2.6.16+ support. + + -- Sven Luther [EMAIL PROTECTED] Wed, 31 May 2006 17:40:37 +0200 + mkvmlinuz (21) unstable; urgency=low * Fixed commented out cleanup call, now doesn't fill /tmp with cruft Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Mon Jun 12 21:08:13 2006 @@ -271,7 +271,7 @@ # create the compressed kernel image file test -z $verbose || echo === Creating compressed kernel image vmlinux.gz... -if test -n $elf; then +if test -n $elf || test -n $post_2_6_16; then do_cmd $STRIP $kernel -o $work/vmlinux else do_cmd $OBJCOPY -O binary $kernel $work/vmlinux @@ -281,12 +281,12 @@ # create the raw ELF image file; this is not needed for the miBoot image if test -z $elf; then test -z $verbose || echo === Putting everything into ELF image file image.o... -if test $post_2_6_16; then - do_cmd $OBJCOPY $dummy_kernel $work/image.o \ +if test -n $post_2_6_16; then + do_cmd $OBJCOPY $dummy_kernel $work/dummy_kernel.o \ --add-section=.kernel:vmlinux.strip=$work/vmlinux.gz \ --set-section-flags=.kernel:vmlinux.strip=contents,alloc,load,readonly,data if test -n $initrd; then - do_cmd $OBJCOPY $work/image.o $work/image.o \ + do_cmd $OBJCOPY $dummy_initrd $work/dummy_initrd.o \ --add-section=.kernel:initrd=$work/initrd.gz \ --set-section-flags=.kernel:initrd=contents,alloc,load,readonly,data fi @@ -313,7 +313,7 @@ # link everything into the final image file and make it bootable vmlinuz=$work/vmlinuz.$arch if test $post_2_6_16; then - LD_ARGS=-T $objs/zImage.lds + LD_ARGS=-m elf32ppc -T $objs/zImage.lds else LD_ARGS=-T $objdir/boot/ld.script fi @@ -321,7 +321,11 @@ test -z $verbose || echo === Creating bootable kernel image file vmlinuz.$arch... case $arch,$post_2_6_16,$release in chrp,Yes,*|pmac,Yes,*) - do_cmd $LD $LD_ARGS -o $vmlinuz $OBJS $work/image.o + if test -n $initrd; then + do_cmd $LD $LD_ARGS -o $vmlinuz $OBJS $work/dummy_kernel.o $work/dummy_initrd.o + else + do_cmd $LD $LD_ARGS -o $vmlinuz $OBJS $work/dummy_kernel.o + fi do_cmd $ADDNOTE $vmlinuz ;; chrp,,2.6*) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6791 - releases/utils/mkvmlinuz/22
Author: luther Date: Mon Jun 12 21:59:43 2006 New Revision: 6791 Added: releases/utils/mkvmlinuz/22/ - copied from r6790, /dists/trunk/utils/mkvmlinuz/mkvmlinuz/ Log: Tagging mkvmlinuz 22 after upload. ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6471 - dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian
Author: luther Date: Fri Apr 21 11:18:52 2006 New Revision: 6471 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Log: Preparing for release. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Fri Apr 21 11:18:52 2006 @@ -1,6 +1,7 @@ -mkvmlinuz (20) UNRELEASABLE; urgency=low +mkvmlinuz (20) unstable; urgency=low - * Ported to 2.6.16 powerpc kernels. Added powerpc64 support. + * Ported to 2.6.16 powerpc kernels. + * Added powerpc64 support. -- Sven Luther [EMAIL PROTECTED] Thu, 20 Apr 2006 18:42:41 + ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6462 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: . debian
Author: luther
Date: Thu Apr 20 18:48:31 2006
New Revision: 6462
Modified:
dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
Log:
Added preliminary 2.6.16 support to mkvmlinuz.
Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
==
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Thu Apr 20
18:48:31 2006
@@ -1,3 +1,9 @@
+mkvmlinuz (20) unstable; urgency=low
+
+ * Ported to 2.6.16 powerpc kernels. Added powerpc64 support.
+
+ -- Sven Luther [EMAIL PROTECTED] Thu, 20 Apr 2006 18:42:41 +
+
mkvmlinuz (19) unstable; urgency=low
* Added debconf dependency. (Closes: #342372)
Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
==
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Thu Apr 20 18:48:31 2006
@@ -140,6 +140,10 @@
fi
fi
+if dpkg --compare-versions 2.6.16-1-powerpc ge 2.6.16; then
+ post_2_6_16=Yes
+fi
+
test -z $verbose || echo === Release version seems to be $release.
# if no object file directory was specified, try to find one
@@ -179,44 +183,58 @@
test -z $verbose || echo === Doing build in $work.
# utilities
-ADDNOTE=$objdir/utils/addnote
-HACKOFF=$objdir/utils/hack-coff
-MKNOTE=$objdir/utils/mknote
-MKPREP=$objdir/utils/mkprep
-MKBUGBOOT=$objdir/utils/mkbugboot
+if test $post_2_6_16; then
+ ADDNOTE=$objdir/addnote
+ ADDRAMDISK=$objdir/addRamDisk
+ objs=$objdir
+ STRIP=strip -s -R .comment
+ GZIP=gzip --force --best
+else
+ ADDNOTE=$objdir/utils/addnote
+ HACKOFF=$objdir/utils/hack-coff
+ MKNOTE=$objdir/utils/mknote
+ MKPREP=$objdir/utils/mkprep
+ MKBUGBOOT=$objdir/utils/mkbugboot
+ libs=$objdir/lib
+ objs=$objdir/obj
+ GZIP=gzip
+ STRIP=strip
+fi
LD=ld
OBJCOPY=objcopy
MV=mv
-STRIP=strip
-GZIP=--force --best
-
-# libraries and common object files
-libs=$objdir/lib
-objs=$objdir/obj
-case $arch,$release in
-apus,*|miboot,*)
+case $arch,$post_2_6_16,$release in
+apus,Yes,*|miboot,Yes,*|prep,Yes,*|ppcbug,Yes,*)
+ ;;
+chrp,Yes,*|pmac,Yes,*)
+ dummy_kernel=$objs/mkvmlinuz-kernel-vmlinux.strip.o
+ dummy_initrd=$objs/mkvmlinuz-kernel-initrd.o
+ OBJS=$objs/crt0.o $objs/string.o $objs/prom.o $objs/stdio.o
$objs/main.o $objs/div64.o
+ OBJS=$OBJS $objs/infblock.o $objs/infcodes.o $objs/inffast.o
$objs/inflate.o $objs/inftrees.o $objs/infutil.o
+ ;;
+apus,,*|miboot,,*|*,Yes,*)
;;
-prep,2.6*|ppcbug,2.6*)
+prep,,2.6*|ppcbug,,2.6*)
test -d $objs/simple objs=$objs/simple
if test -r $objs/legacy.o; then prepmap=legacy; else prepmap=prepmap; fi
OBJS=$objs/head.o $objs/relocate.o $objs/$prepmap.o $objs/misc.o
$objs/misc-prep.o $objs/mpc10x_memory.o
LIBS=$libs/common.a $libs/ppc.a $libs/of.a
dummy=$objs/dummy.o
;;
-pmac,2.6*)
+pmac,,2.6*)
test -d $objs/openfirmware objs=$objs/openfirmware
OBJS=$objs/start.o $objs/misc.o $objs/common.o $objs/newworldmain.o
LIBS=$libs/lib.a $libs/ppc.a $libs/of.a $libs/common.a
dummy=$objs/dummy.o
;;
-*,2.6*)
+*,,2.6*)
test -d $objs/openfirmware objs=$objs/openfirmware
OBJS=$objs/start.o $objs/misc.o $objs/common.o $objs/${arch}main.o
LIBS=$libs/lib.a $libs/ppc.a $libs/of.a $libs/common.a
dummy=$objs/dummy.o
;;
-chrp,2.4*)
+chrp,,2.4*)
test -d $objs/chrp objs=$objs/chrp
OBJS=$objs/start.o $objs/main.o $objs/misc.o
OBJS=$OBJS $objs/../common/string.o $objs/../common/ofcommon.o
@@ -227,15 +245,6 @@
# off we go...
-# create the compressed kernel image file
-test -z $verbose || echo === Creating compressed kernel image vmlinux.gz...
-if test -n $elf; then
-do_cmd $STRIP $kernel -o $work/vmlinux
-else
-do_cmd $OBJCOPY -O binary $kernel $work/vmlinux
-fi
-do_cmd gzip $work/vmlinux
-
# create the compressed initrd image file
if test -n $initrd; then
test -z $verbose || echo === Creating compressed initrd image
initrd.gz...
@@ -253,27 +262,47 @@
;;
No)
do_cmd cp -p $initrd $work/initrd
- do_cmd gzip $work/initrd
+ do_cmd $GZIP $work/initrd
;;
esac
fi
+# create the compressed kernel image file
+test -z $verbose || echo === Creating compressed kernel image vmlinux.gz...
+if test -n $elf; then
+if test -n $initrd test $post_2_6_16; then
+ do_cmd $STRIP $kernel -o $work/vmlinux-strip
+ $ADDRAMDISK $work/initrd.gz $work/vmlinux-strip $work/vmlinux
+else
+ do_cmd $STRIP $kernel -o $work/vmlinux
+fi
+else
+do_cmd $OBJCOPY -O binary $kernel $work/vmlinux
+fi
+do_cmd $GZIP $work/vmlinux
[kernel] r6463 - dists/sid/linux-2.6/debian/arch/powerpc
Author: luther Date: Thu Apr 20 18:49:51 2006 New Revision: 6463 Modified: dists/sid/linux-2.6/debian/arch/powerpc/defines Log: Oh well, since mkvmlinuz 19 was uploaded without the fixes, i need to bump those dependencies to mkvmlinuz 20. Modified: dists/sid/linux-2.6/debian/arch/powerpc/defines == --- dists/sid/linux-2.6/debian/arch/powerpc/defines (original) +++ dists/sid/linux-2.6/debian/arch/powerpc/defines Thu Apr 20 18:49:51 2006 @@ -11,16 +11,16 @@ vserver [apus] -depends: mkvmlinuz (= 19) +depends: mkvmlinuz (= 20) [powerpc] -depends: mkvmlinuz (= 19) +depends: mkvmlinuz (= 20) [powerpc-smp] -depends: mkvmlinuz (= 19) +depends: mkvmlinuz (= 20) [powerpc-miboot] -depends: mkvmlinuz (= 19) +depends: mkvmlinuz (= 20) [powerpc64] kpkg-subarch: powerpc64 ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6466 - in dists/sid/linux-2.6/debian/arch/powerpc: . vserver
Author: luther Date: Thu Apr 20 20:40:56 2006 New Revision: 6466 Modified: dists/sid/linux-2.6/debian/arch/powerpc/defines dists/sid/linux-2.6/debian/arch/powerpc/vserver/defines Log: The powerpc kernels should depend on mkvmlinuz, or some subarch will be unbootable. Modified: dists/sid/linux-2.6/debian/arch/powerpc/defines == --- dists/sid/linux-2.6/debian/arch/powerpc/defines (original) +++ dists/sid/linux-2.6/debian/arch/powerpc/defines Thu Apr 20 20:40:56 2006 @@ -11,16 +11,16 @@ vserver [apus] -suggests: mkvmlinuz (= 20) +depends: mkvmlinuz (= 20) [powerpc] -suggests: mkvmlinuz (= 20) +depends: mkvmlinuz (= 20) [powerpc-smp] -suggests: mkvmlinuz (= 20) +depends: mkvmlinuz (= 20) [powerpc-miboot] -suggests: mkvmlinuz (= 20) +depends: mkvmlinuz (= 20) [powerpc64] kpkg-subarch: powerpc64 Modified: dists/sid/linux-2.6/debian/arch/powerpc/vserver/defines == --- dists/sid/linux-2.6/debian/arch/powerpc/vserver/defines (original) +++ dists/sid/linux-2.6/debian/arch/powerpc/vserver/defines Thu Apr 20 20:40:56 2006 @@ -4,7 +4,7 @@ powerpc64 [powerpc] -suggests: mkvmlinuz (= 20) +depends: mkvmlinuz (= 20) [powerpc64] kpkg-subarch: powerpc64 ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6467 - dists/trunk/utils/mkvmlinuz/mkvmlinuz
Author: luther Date: Thu Apr 20 22:44:15 2006 New Revision: 6467 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Log: Now generates a correct vmlinuz on pmac hardware. Need to test on pegasos. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Thu Apr 20 22:44:15 2006 @@ -270,12 +270,7 @@ # create the compressed kernel image file test -z $verbose || echo === Creating compressed kernel image vmlinux.gz... if test -n $elf; then -if test -n $initrd test $post_2_6_16; then - do_cmd $STRIP $kernel -o $work/vmlinux-strip - $ADDRAMDISK $work/initrd.gz $work/vmlinux-strip $work/vmlinux -else - do_cmd $STRIP $kernel -o $work/vmlinux -fi +do_cmd $STRIP $kernel -o $work/vmlinux else do_cmd $OBJCOPY -O binary $kernel $work/vmlinux fi @@ -285,9 +280,14 @@ if test -z $elf; then test -z $verbose || echo === Putting everything into ELF image file image.o... if test $post_2_6_16; then - do_cmd $OBJCOPY $dummy_kernel \ - --add-section=.kernel:vmlinux.strip= $work/vmlinux.gz \ - --set-section-flags=.kernel:contents,alloc,load,readonly,data + do_cmd $OBJCOPY $dummy_kernel $work/image.o \ + --add-section=.kernel:vmlinux.strip=$work/vmlinux.gz \ + --set-section-flags=.kernel:vmlinux.strip=contents,alloc,load,readonly,data + if test -n $initrd; then + do_cmd $OBJCOPY $work/image.o $work/image.o \ + --add-section=.kernel:initrd=$work/initrd.gz \ + --set-section-flags=.kernel:initrd=contents,alloc,load,readonly,data + fi else do_cmd $OBJCOPY -R .comment $dummy $work/image.o do_cmd $OBJCOPY $work/image.o $work/image.o \ @@ -310,12 +310,16 @@ # link everything into the final image file and make it bootable vmlinuz=$work/vmlinuz.$arch -LD_ARGS=-T $objdir/boot/ld.script +if test $post_2_6_16; then + LD_ARGS=-T $objs/zImage.lds +else + LD_ARGS=-T $objdir/boot/ld.script +fi OBJCOPY_ARGS=-R .comment test -z $verbose || echo === Creating bootable kernel image file vmlinuz.$arch... case $arch,$post_2_6_16,$release in chrp,Yes,*|pmac,Yes,*) - do_cmd $LD $LD_ARGS -T $obj/zImage.lds -o $vmlinuz $OBJS + do_cmd $LD $LD_ARGS -o $vmlinuz $OBJS $work/image.o do_cmd $ADDNOTE $vmlinuz ;; chrp,,2.6*) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6468 - dists/trunk/utils/mkvmlinuz/mkvmlinuz
Author: luther Date: Thu Apr 20 23:23:56 2006 New Revision: 6468 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Log: Removed two small typos. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz Thu Apr 20 23:23:56 2006 @@ -140,8 +140,10 @@ fi fi -if dpkg --compare-versions 2.6.16-1-powerpc ge 2.6.16; then +if dpkg --compare-versions $release ge 2.6.16; then post_2_6_16=Yes +else + post_2_6_16= fi test -z $verbose || echo === Release version seems to be $release. @@ -388,4 +390,4 @@ # clean up test -z $verbose || echo === Cleaning up... -rm -rf $work +#rm -rf $work ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6408 - dists/sid/linux-2.6/debian/arch/powerpc
Author: luther Date: Thu Apr 13 12:14:58 2006 New Revision: 6408 Modified: dists/sid/linux-2.6/debian/arch/powerpc/defines Log: Updated powerpc build-depends to mkvmlinuz 19. Modified: dists/sid/linux-2.6/debian/arch/powerpc/defines == --- dists/sid/linux-2.6/debian/arch/powerpc/defines (original) +++ dists/sid/linux-2.6/debian/arch/powerpc/defines Thu Apr 13 12:14:58 2006 @@ -1,14 +1,14 @@ [base] flavours: powerpc - powerpc-smp - powerpc-miboot - powerpc64 +# powerpc-smp +# powerpc-miboot +# powerpc64 kernel-header-dirs: powerpc ppc m68k kernel-arch: powerpc kpkg-subarch: ppc subarches: - vserver +# vserver [image] @@ -16,13 +16,13 @@ depends: mkvmlinuz (= 18) [powerpc] -depends: mkvmlinuz (= 18) +depends: mkvmlinuz (= 19) [powerpc-smp] -depends: mkvmlinuz (= 18) +depends: mkvmlinuz (= 19) [powerpc-miboot] -depends: mkvmlinuz (= 18) +depends: mkvmlinuz (= 19) [powerpc64] kpkg-subarch: powerpc64 ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6405 - in dists/sid/linux-2.6/debian: . patches patches/series
Author: luther Date: Wed Apr 12 20:32:18 2006 New Revision: 6405 Added: dists/sid/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch Modified: dists/sid/linux-2.6/debian/changelog dists/sid/linux-2.6/debian/patches/series/7 Log: Transitioned mkvmlinuz support patch to the 2.6.16 ARCH=powerpc tree. Modified: dists/sid/linux-2.6/debian/changelog == --- dists/sid/linux-2.6/debian/changelog(original) +++ dists/sid/linux-2.6/debian/changelogWed Apr 12 20:32:18 2006 @@ -8,7 +8,11 @@ * Add stable release 2.6.16.4: - RCU signal handling (CVE-2006-1523) - -- Bastian Blank [EMAIL PROTECTED] Tue, 11 Apr 2006 20:40:25 +0200 + [ Sven Luther ] + * [powerpc] Transitioned mkvmlinuz support patch to the 2.6.16 ARCH=powerpc +tree. PReP is broken in 2.6.16 though. + + -- Sven Luther [EMAIL PROTECTED] Wed, 12 Apr 2006 19:46:30 + linux-2.6 (2.6.16-6) unstable; urgency=medium Added: dists/sid/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch == --- (empty file) +++ dists/sid/linux-2.6/debian/patches/powerpc-mkvmlinuz-support-2.patch Wed Apr 12 20:32:18 2006 @@ -0,0 +1,57 @@ +# +# Mkvmlinuz support patch, called by debian's kernel-package to generate +# the files needed by mkvmlinuz to generate the bootable images from vmlinux. +# Author: Sven Luther [EMAIL PROTECTED] +# Based on work from: Jens Schmalzing [EMAIL PROTECTED] +# Original comment from Jens : +# This shell script is intended to be put into the debian subdirectory +# of a Linux kernel tree, where make-kpkg will find and execute it +# while building a kernel-image package. The purpose of this script +# is to add glue (object code, libraries, utilities and so on) from +# the kernel tree to the kernel-image package. Later, the mkvmlinuz +# utility, which is available as a separate Debian package, can use +# this glue to create a bootable compressed kernel from the +# uncompressed kernel in the kernel-image package and optionally a +# ramdisk. This is especially important on PowerPC subarchitectures +# that don't have a boot loader, but also comes handy for rescue +# systems and the like. +# Upstream status: This patch stays a debian specific patch for now, +# but it is not in a form where it could go upstream. +# +--- linux-2.6.16/arch/powerpc/Makefile.orig2006-04-12 16:57:16.0 + linux-2.6.16/arch/powerpc/Makefile 2006-04-12 16:58:53.0 + +@@ -148,7 +148,7 @@ + + CPPFLAGS_vmlinux.lds := -Upowerpc + +-BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage ++BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage mkvmlinuz_support_install + + .PHONY: $(BOOT_TARGETS) + +--- linux-2.6.16/arch/powerpc/boot/Makefile.orig 2006-04-12 16:40:11.0 + linux-2.6.16/arch/powerpc/boot/Makefile2006-04-12 19:23:06.0 + +@@ -213,3 +213,23 @@ + sh -x $(srctree)/$(src)/install.sh $(KERNELRELEASE) vmlinux System.map $(INSTALL_PATH) $(BOOTIMAGE) + + clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip) ++ ++#--- ++# install mkvmlinuz support files ++#--- ++quiet_cmd_mkvmlinuz = INSTALL mkvmlinuz support files ++ cmd_mkvmlinuz = cp -f $? $(INSTALL_MKVMLINUZ) ++ ++mkvmlinuz-obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/mkvmlinuz-kernel-%.o, $(section))) ++mkvmlinuz-src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/mkvmlinuz-kernel-%.c, $(section))) ++ ++$(call mkvmlinuz-src-sec, $(required) $(initrd)): $(obj)/mkvmlinuz-kernel-%.c: ++ @touch $@ ++$(call mkvmlinuz-obj-sec, $(required) $(initrd)): $(obj)/mkvmlinuz-kernel-%.o: $(obj)/mkvmlinuz-kernel-%.c ++ $(call if_changed_dep,bootcc) ++ ++$(obj)/mkvmlinuz_support_install: $(obj)/addRamDisk $(obj)/addnote $(obj-boot) $(call mkvmlinuz-obj-sec, $(required) $(initrd)) $(srctree)/$(src)/zImage.lds ++ mkdir -p $(INSTALL_MKVMLINUZ) ++ $(call cmd,mkvmlinuz) ++targets += mkvmlinuz_support_install ++ Modified: dists/sid/linux-2.6/debian/patches/series/7 == --- dists/sid/linux-2.6/debian/patches/series/7 (original) +++ dists/sid/linux-2.6/debian/patches/series/7 Wed Apr 12 20:32:18 2006 @@ -1,2 +1,4 @@ + 2.6.16.3 + 2.6.16.4 ++ powerpc-mkvmlinuz-support-2.patch + ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6078 - in dists/sid/linux-2.6/debian: . arch/powerpc
Author: luther Date: Mon Mar 6 08:54:24 2006 New Revision: 6078 Modified: dists/sid/linux-2.6/debian/arch/powerpc/config dists/sid/linux-2.6/debian/changelog Log: Disabled Modified: dists/sid/linux-2.6/debian/arch/powerpc/config == --- dists/sid/linux-2.6/debian/arch/powerpc/config (original) +++ dists/sid/linux-2.6/debian/arch/powerpc/config Mon Mar 6 08:54:24 2006 @@ -240,7 +240,7 @@ CONFIG_IEEE1394_OHCI1394=m CONFIG_IEEE1394_VIDEO1394=m CONFIG_IEEE1394_SBP2=m -CONFIG_IEEE1394_SBP2_PHYS_DMA=y +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m Modified: dists/sid/linux-2.6/debian/changelog == --- dists/sid/linux-2.6/debian/changelog(original) +++ dists/sid/linux-2.6/debian/changelogMon Mar 6 08:54:24 2006 @@ -48,7 +48,11 @@ - mempolicy.c compile fix, make sure BITS_PER_BYTE is defined - [IA64] die_if_kernel() can return (CVE-2006-0742) - -- maximilian attems [EMAIL PROTECTED] Sun, 5 Mar 2006 22:20:26 +0100 + [ Sven Luther ] + * [powerpc] Disabled CONFIG_IEEE1394_SBP2_PHYS_DMA, which was broken on +powerpc64, as it used the long deprecated bus_to_virt symbol. + + -- Sven Luther [EMAIL PROTECTED] Mon, 6 Mar 2006 08:46:08 + linux-2.6 (2.6.15-7) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r6079 - in dists/trunk/linux-2.6/debian: . arch/powerpc
Author: luther Date: Mon Mar 6 09:02:32 2006 New Revision: 6079 Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config dists/trunk/linux-2.6/debian/changelog Log: Disabled CONFIG_IEEE1394_SBP2_PHYS_DMA, which was broken on powerpc64, as it used the long deprecated bus_to_virt symbol. Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config == --- dists/trunk/linux-2.6/debian/arch/powerpc/config(original) +++ dists/trunk/linux-2.6/debian/arch/powerpc/configMon Mar 6 09:02:32 2006 @@ -237,7 +237,7 @@ CONFIG_IEEE1394_OHCI1394=m CONFIG_IEEE1394_VIDEO1394=m CONFIG_IEEE1394_SBP2=m -CONFIG_IEEE1394_SBP2_PHYS_DMA=y +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Mon Mar 6 09:02:32 2006 @@ -1,3 +1,10 @@ +linux-2.6 (2.6.15+2.6.16-rc5-0experimental.2) UNRELEASED; urgency=low + + * [powerpc] Disabled CONFIG_IEEE1394_SBP2_PHYS_DMA, which was broken on +powerpc64, as it used the long deprecated bus_to_virt symbol. + + -- Sven Luther [EMAIL PROTECTED] Mon, 6 Mar 2006 08:57:20 + + linux-2.6 (2.6.15+2.6.16-rc5-0experimental.1) experimental; urgency=low [ Frederik Schüler ] ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5801 - dists/sid/linux-2.6/debian
Author: luther Date: Fri Feb 10 09:06:25 2006 New Revision: 5801 Modified: dists/sid/linux-2.6/debian/changelog Log: Fixed waldi's too short changelog entry. Modified: dists/sid/linux-2.6/debian/changelog == --- dists/sid/linux-2.6/debian/changelog(original) +++ dists/sid/linux-2.6/debian/changelogFri Feb 10 09:06:25 2006 @@ -1,6 +1,8 @@ linux-2.6 (2.6.15-6) unstable; urgency=low - * Revert changed patch. + [ Bastian Blank ] + * Moved the mkvmlinuz support patch modification to a -1 version of the +patch. -- Bastian Blank [EMAIL PROTECTED] Thu, 09 Feb 2006 20:16:23 + ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5732 - in dists/sid/linux-2.6/debian: . patches
Author: luther Date: Tue Feb 7 19:32:05 2006 New Revision: 5732 Modified: dists/sid/linux-2.6/debian/changelog dists/sid/linux-2.6/debian/patches/powerpc-mkvmlinuz-support.patch Log: Now no more use -o root -g root for installing the mkvmlinuz support files. Closes: #351412 Modified: dists/sid/linux-2.6/debian/changelog == --- dists/sid/linux-2.6/debian/changelog(original) +++ dists/sid/linux-2.6/debian/changelogTue Feb 7 19:32:05 2006 @@ -6,7 +6,11 @@ * Add stable tree 2.6.15.3: - Fix extra dst release when ip_options_echo fails (CVE-2006-0454) - -- Martin Michlmayr [EMAIL PROTECTED] Mon, 06 Feb 2006 03:25:54 + + [ Sven Luther ] + * [powerpc] Removed -o root -g root option to mkvmlinuz support patch. +(Closes: #351412) + + -- Sven Luther [EMAIL PROTECTED] Tue, 7 Feb 2006 19:23:14 + linux-2.6 (2.6.15-4) unstable; urgency=low Modified: dists/sid/linux-2.6/debian/patches/powerpc-mkvmlinuz-support.patch == --- dists/sid/linux-2.6/debian/patches/powerpc-mkvmlinuz-support.patch (original) +++ dists/sid/linux-2.6/debian/patches/powerpc-mkvmlinuz-support.patch Tue Feb 7 19:32:05 2006 @@ -28,33 +28,33 @@ +mkvmlinuz_support_install: + # mkvmlinuz support, based on work done originally by Jens Schmalzing [EMAIL PROTECTED] + mkdir -p $(INSTALL_MKVMLINUZ)/boot -+ install -m 644 -o root -g root ld.script $(INSTALL_MKVMLINUZ)/boot ++ install -m 644 ld.script $(INSTALL_MKVMLINUZ)/boot + if [ -e openfirmware/note ]; then \ -+ install -m 644 -o root -g root openfirmware/note $(INSTALL_MKVMLINUZ)/boot; \ ++ install -m 644 openfirmware/note $(INSTALL_MKVMLINUZ)/boot; \ + fi + + mkdir -p $(INSTALL_MKVMLINUZ)/lib -+ install -m 644 -o root -g root ../../../lib/lib.a $(INSTALL_MKVMLINUZ)/lib -+ install -m 644 -o root -g root lib/lib.a $(INSTALL_MKVMLINUZ)/lib/ppc.a -+ install -m 644 -o root -g root common/lib.a $(INSTALL_MKVMLINUZ)/lib/common.a ++ install -m 644 ../../../lib/lib.a $(INSTALL_MKVMLINUZ)/lib ++ install -m 644 lib/lib.a $(INSTALL_MKVMLINUZ)/lib/ppc.a ++ install -m 644 common/lib.a $(INSTALL_MKVMLINUZ)/lib/common.a + if [ -e of1275/lib.a ]; then \ -+ install -m 644 -o root -g root of1275/lib.a $(INSTALL_MKVMLINUZ)/lib/of.a; \ ++ install -m 644 of1275/lib.a $(INSTALL_MKVMLINUZ)/lib/of.a; \ + fi + + if [ -e openfirmware/common.o ]; then \ + mkdir -p $(INSTALL_MKVMLINUZ)/obj/openfirmware; \ -+ install -m 644 -o root -g root openfirmware/*.o $(INSTALL_MKVMLINUZ)/obj/openfirmware; \ ++ install -m 644 openfirmware/*.o $(INSTALL_MKVMLINUZ)/obj/openfirmware; \ + rm -f $(INSTALL_MKVMLINUZ)/obj/openfirmware/image*; \ + fi + + mkdir -p $(INSTALL_MKVMLINUZ)/obj/simple -+ install -m 644 -o root -g root simple/*.o $(INSTALL_MKVMLINUZ)/obj/simple ++ install -m 644 simple/*.o $(INSTALL_MKVMLINUZ)/obj/simple + rm -f $(INSTALL_MKVMLINUZ)/obj/simple/image*.o + + mkdir -p $(INSTALL_MKVMLINUZ)/utils -+ install -m 755 -o root -g root utils/addnote $(INSTALL_MKVMLINUZ)/utils -+ install -m 755 -o root -g root utils/hack-coff $(INSTALL_MKVMLINUZ)/utils -+ install -m 755 -o root -g root utils/mkbugboot $(INSTALL_MKVMLINUZ)/utils -+ install -m 755 -o root -g root utils/mknote $(INSTALL_MKVMLINUZ)/utils -+ install -m 755 -o root -g root utils/mkprep $(INSTALL_MKVMLINUZ)/utils -+ install -m 755 -o root -g root utils/mktree $(INSTALL_MKVMLINUZ)/utils ++ install -m 755 utils/addnote $(INSTALL_MKVMLINUZ)/utils ++ install -m 755 utils/hack-coff $(INSTALL_MKVMLINUZ)/utils ++ install -m 755 utils/mkbugboot $(INSTALL_MKVMLINUZ)/utils ++ install -m 755 utils/mknote $(INSTALL_MKVMLINUZ)/utils ++ install -m 755 utils/mkprep $(INSTALL_MKVMLINUZ)/utils ++ install -m 755 utils/mktree $(INSTALL_MKVMLINUZ)/utils ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5342 - dists/trunk/linux-2.6/debian/bin
Author: luther Date: Sun Jan 8 09:13:43 2006 New Revision: 5342 Modified: dists/trunk/linux-2.6/debian/bin/kconfig.ml Log: Added defines file parsing to kconfig.ml. Modified: dists/trunk/linux-2.6/debian/bin/kconfig.ml == --- dists/trunk/linux-2.6/debian/bin/kconfig.ml (original) +++ dists/trunk/linux-2.6/debian/bin/kconfig.ml Sun Jan 8 09:13:43 2006 @@ -1,5 +1,6 @@ #!/usr/bin/ocamlrun /usr/bin/ocaml +(* Command line arguments parsing *) let basedir = ref debian/arch let arch = ref let subarch = ref @@ -8,6 +9,11 @@ let verbose = ref false let archindir = ref false +type action = Single | Create | Check +let action = ref Create + +let set_action a () = action := a + let spec = [ -b, Arg.Set_string basedir, base dir of the arch configurations [default: debian/arch]; -ba, Arg.Set archindir, basedir includes arch; @@ -15,18 +21,21 @@ -s, Arg.Set_string subarch, subarch; -f, Arg.Set_string flavour, flavour; -v, Arg.Set verbose, verbose; + -c, Arg.Unit (set_action Check), check; ] let usage = - ./kconfig.ml [ -b basedir ] -a arch [ -s subarch ] -f flavour ^ \n ^ - ./kconfig.ml config_file + Check single config file : ./kconfig.ml config_file\n ^ + Create config file : ./kconfig.ml [ -ba ] [ -b basedir ] -a arch [ -s subarch ] -f flavour ^ \n ^ + Check all config files : ./kconfig.ml -c [ -b basedir ] -a arch [ -s subarch ] -f flavour ^ \n let () = Arg.parse spec - (function s - config_name := s) + (function s - config_name := s; action := Single) usage let usage () = Arg.usage spec usage +(* Config file parsing *) type options = | Config_Yes of string | Config_No of string @@ -44,8 +53,9 @@ | Config_Empty - Printf.printf \n exception Comment +exception Error -let parse_line fd = +let parse_config_line fd = let line = input_line fd in let len = String.length line in if len = 0 then Config_Empty else @@ -83,7 +93,7 @@ (* Map.add behavior ensures the latest entry is the one staying *) let rec parse_config fd m = try -let line = parse_line fd in +let line = parse_config_line fd in match line with | Config_Comment _ | Config_Empty - parse_config fd m | Config_Yes s | Config_No s | Config_Module s | Config_Value (s,_) - @@ -101,35 +111,114 @@ with Sys_error s - if force then raise (Sys_error s) else m -let () = - begin -if !verbose then - if !config_name then -Printf.eprintf Reading config file %s !config_name - else -Printf.eprintf Creating config file for arch %s, subarch %s, flavour %s (basedir is %s)\n !arch !subarch !flavour !basedir - end; - if !config_name then -try - let config = open_in !config_name in - let m = parse_config config C.empty in - print_config m; - close_in config -with Sys_error s - Printf.eprintf Error: %s\n s - else if !arch!flavour then +(* Defines parsing *) +type define = + | Defines_Base of string + | Defines_Field of string * string + | Defines_List of string + | Defines_Comment of string + | Defines_Error of string + | Defines_Empty + +let print_define = function + | Defines_Base s - Printf.printf [%s]\n s + | Defines_Field (n, v) - Printf.printf %s:%s\n n v + | Defines_List s - Printf.printf %s\n s + | Defines_Comment s - Printf.printf #%s\n s + | Defines_Error s - Printf.printf *** ERROR *** %s\n s + | Defines_Empty - Printf.printf \n + +let parse_define_line fd = + let line = input_line fd in + let len = String.length line in + if len = 0 then begin Defines_Empty end else + try +match line.[0] with +| '#' - Defines_Comment (String.sub line 1 (len - 1)) +| '[' - begin +try + let c = String.index_from line 1 ']' in + Defines_Base (String.sub line 1 (c - 1)) +with Not_found | Invalid_argument String.sub - raise Error + end +| ' ' - Defines_List (String.sub line 1 (len - 1)) +| _ - begin +try + let c = String.index_from line 1 ':' in + Defines_Field (String.sub line 0 c, String.sub line (c + 1) (len - c - 1)) +with Not_found | Invalid_argument String.sub - raise Error + end + with Error - Defines_Error line + +let rec parse_defines fd m l = + try +let line = parse_define_line fd in +match line with +| Defines_Comment _ | Defines_Empty - parse_defines fd (line::m) (l+1) +| Defines_Error error - + Printf.eprintf *** Error at line %d : %s\n l error; + parse_defines fd m (l+1) +| Defines_Base _ | Defines_Field _ | Defines_List _ - parse_defines fd (line::m) (l+1) + with End_of_file - List.rev m + +let parse_defines_file name m force = + try +let defines = open_in name in +let m = parse_defines defines m 0 in +close_in defines; +m + with Sys_error s - +if force then raise (Sys_error s) else m + +let print_defines m = List.iter
[kernel] r5344 - in dists/trunk/linux-2.6/debian: . patches/series
Author: luther Date: Sun Jan 8 10:01:44 2006 New Revision: 5344 Modified: dists/trunk/linux-2.6/debian/patches/series/2 dists/trunk/linux-2.6/debian/rules Log: Commented buslogic-pci-id-table.patch out from series, i suppose someone did forget to check in the patch when modifying the series. Modified: dists/trunk/linux-2.6/debian/patches/series/2 == --- dists/trunk/linux-2.6/debian/patches/series/2 (original) +++ dists/trunk/linux-2.6/debian/patches/series/2 Sun Jan 8 10:01:44 2006 @@ -2,4 +2,4 @@ + alsa-opl3-oops.patch + alpha-generic-irq-1.patch + alpha-generic-irq-2.patch -+ buslogic-pci-id-table.patch +# + buslogic-pci-id-table.patch Commented out because it is missing. Modified: dists/trunk/linux-2.6/debian/rules == --- dists/trunk/linux-2.6/debian/rules (original) +++ dists/trunk/linux-2.6/debian/rules Sun Jan 8 10:01:44 2006 @@ -90,7 +90,7 @@ CheckConfs_DIR := $(CURDIR)/debian/build/check CheckConfs_srcfiles := $(filter-out debian, $(wildcard *)) # TODO : need to grab those directly from the changelog or whatever. -CheckConfs_SOURCE_VERSION := 2.6.15-1 +CheckConfs_SOURCE_VERSION := 2.6.15-2 CheckConfs_REVISIONS := 1 2 $(CheckConfs_DIR) source-configs: ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5348 - dists/trunk/linux-2.6/debian
Author: luther
Date: Sun Jan 8 14:33:15 2006
New Revision: 5348
Modified:
dists/trunk/linux-2.6/debian/rules
Log:
Now calculate SOURCE_VERSION and REVISIONS from the changelog, not the most
efficient way, but hey :)
Modified: dists/trunk/linux-2.6/debian/rules
==
--- dists/trunk/linux-2.6/debian/rules (original)
+++ dists/trunk/linux-2.6/debian/rules Sun Jan 8 14:33:15 2006
@@ -89,9 +89,8 @@
CheckConfs_DIR := $(CURDIR)/debian/build/check
CheckConfs_srcfiles := $(filter-out debian, $(wildcard *))
-# TODO : need to grab those directly from the changelog or whatever.
-CheckConfs_SOURCE_VERSION := 2.6.15-2
-CheckConfs_REVISIONS := 1 2
+CheckConfs_SOURCE_VERSION := ${shell a=`head -n 1 debian/changelog`;
a=$${a%%\)*}; a=$${a\#\#*\(}; echo $$a}
+CheckConfs_REVISIONS := ${shell a=$(CheckConfs_SOURCE_VERSION); a=$${a\#\#*-};
b=1; while [ $$b -lt $$a ]; do echo -n $$b ; b=$$(($$b+1)); done; echo $$b}
$(CheckConfs_DIR) source-configs:
rm -rf '$(CheckConfs_DIR)'
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5310 - in dists/trunk/linux-2.6/debian: . patches
Author: luther Date: Fri Jan 6 08:03:55 2006 New Revision: 5310 Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/patches/powerpc-apus.patch Log: Added bug closers to changelog entry about making initramfs-tools the default. Removed spurious 'sven' file from powerpc-apus.patch. Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Fri Jan 6 08:03:55 2006 @@ -2,15 +2,19 @@ [ maximilian attems ] * Default to initramfs-tools as initramfs generator. +(Closes: #346141, #343147, #341524) [ dann frazier ] * [ia64] Update config for 2.6.15. [ Frederik Schüler ] - * Make CONFIG_IPW2100 a per-architecture option and deactivate it on all + * Make CONFIG_IPW2100 a per-architecture option and deactivate it on all architectures but i386. (Closes: #344515) - -- Frederik Schüler [EMAIL PROTECTED] Thu, 5 Jan 2006 14:19:56 +0100 + [ Sven Luther ] + * Removed spurious file from powerpc-apus patch. (Closes: #346159) + + -- Sven Luther [EMAIL PROTECTED] Fri, 6 Jan 2006 07:56:52 + linux-2.6 (2.6.15-1) unstable; urgency=low Modified: dists/trunk/linux-2.6/debian/patches/powerpc-apus.patch == --- dists/trunk/linux-2.6/debian/patches/powerpc-apus.patch (original) +++ dists/trunk/linux-2.6/debian/patches/powerpc-apus.patch Fri Jan 6 08:03:55 2006 @@ -3353,57 +3353,3 @@ return -EFAULT; \ data = convsample(data);\ *righth++ = data8;\ -diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/sven linux-2.6-2.6.14+2.6.15-rc7/sven linux-2.6-2.6.14+2.6.15-rc7.orig/sven 1970-01-01 00:00:00.0 + -+++ linux-2.6-2.6.14+2.6.15-rc7/sven 2005-12-29 09:31:10.0 + -@@ -0,0 +1,50 @@ -+patching file arch/ppc/Kconfig -+patching file arch/ppc/amiga/Makefile -+patching file arch/ppc/amiga/amiints.c -+patching file arch/ppc/amiga/bootinfo.c -+patching file arch/ppc/amiga/cia.c -+patching file arch/ppc/amiga/config.c -+patching file arch/ppc/amiga/time.c -+patching file arch/ppc/configs/apus_defconfig -+patching file arch/ppc/kernel/Makefile -+Hunk #1 succeeded at 353 with fuzz 2. -+Hunk #4 succeeded at 1231 (offset -6 lines). -+Hunk #5 succeeded at 1248 (offset -6 lines). -+Hunk #6 succeeded at 1444 (offset -6 lines). -+patching file arch/ppc/kernel/head_end.S -+patching file arch/ppc/kernel/misc.S -+Hunk #1 succeeded at 1325 (offset -52 lines). -+patching file arch/ppc/kernel/ppc_ksyms.c -+Hunk #2 succeeded at 144 (offset 4 lines). -+patching file arch/ppc/kernel/setup.c -+Hunk #1 succeeded at 566 (offset 20 lines). -+Hunk #2 succeeded at 625 (offset 32 lines). -+patching file arch/ppc/kernel/time.c -+Hunk #1 succeeded at 156 (offset 4 lines). -+Hunk #2 succeeded at 183 (offset 4 lines). -+patching file arch/ppc/mm/Makefile -+patching file arch/ppc/mm/init.c -+patching file arch/ppc/mm/pgtable.c -+Hunk #2 succeeded at 427 (offset -2 lines). -+patching file arch/ppc/platforms/apus_setup.c -+patching file drivers/block/amiflop.c -+patching file include/asm-m68k/bootinfo.h -+patching file include/asm-ppc/amigahw.h -+patching file include/asm-ppc/bootinfo.h -+patching file include/asm-powerpc/current.h -+Hunk #1 FAILED at 1. -+1 out of 1 hunk FAILED -- saving rejects to file include/asm-powerpc/current.h.rej -+patching file include/asm-ppc/io.h -+Hunk #2 succeeded at 297 (offset 3 lines). -+Hunk #3 succeeded at 380 (offset 3 lines). -+Hunk #4 succeeded at 402 (offset 3 lines). -+Hunk #5 succeeded at 420 (offset 3 lines). -+Hunk #6 succeeded at 530 (offset -7 lines). -+Hunk #7 succeeded at 563 (offset 10 lines). -+patching file include/asm-ppc/machdep.h -+patching file include/asm-ppc/pgtable.h -+Hunk #1 succeeded at 724 (offset 1 line). -+patching file include/asm-ppc/zorro.h -+patching file include/video/vga.h -+patching file sound/oss/dmasound/dmasound_paula.c -+patching file drivers/video/console/fonts.c ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5313 - dists/trunk/linux-2.6/debian/patches/series
Author: luther Date: Fri Jan 6 15:26:31 2006 New Revision: 5313 Modified: dists/trunk/linux-2.6/debian/patches/series/1 Log: Removed the powerpc-arch-default patch for now, as we still keep ARCH=ppc for 32bit right now. Modified: dists/trunk/linux-2.6/debian/patches/series/1 == --- dists/trunk/linux-2.6/debian/patches/series/1 (original) +++ dists/trunk/linux-2.6/debian/patches/series/1 Fri Jan 6 15:26:31 2006 @@ -16,7 +16,7 @@ + m68k-mvme16x.patch + m68k-spinlock.patch + sparc64-atyfb-xl-gr-final.patch -+ powerpc-arch-default-powerpc.patch +#+ powerpc-arch-default-powerpc.patch + drivers-scsi-megaraid_splitup.patch + powerpc-mv643xx-spinlock-fix-support.patch + powerpc-prep-utah-ide-interrupt.patch ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5314 - dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian
Author: luther Date: Fri Jan 6 15:29:20 2006 New Revision: 5314 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control Log: Added debconf dependency, Closes: #342372. Removed Jens from uploaders. Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog (original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog Fri Jan 6 15:29:20 2006 @@ -1,3 +1,9 @@ +mkvmlinuz (19) unstable; urgency=low + + * Added debconf dependency. (Closes: #342372) + + -- Sven Luther [EMAIL PROTECTED] Fri, 6 Jan 2006 16:25:10 +0100 + mkvmlinuz (18) unstable; urgency=low * Now look at $STEM-image, linux-image and then only kernel-image for the Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control(original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/controlFri Jan 6 15:29:20 2006 @@ -2,13 +2,13 @@ Section: devel Priority: optional Maintainer: Debian Kernel Team debian-kernel@lists.debian.org -Uploaders: Sven Luther [EMAIL PROTECTED], Jens Schmalzing [EMAIL PROTECTED] +Uploaders: Sven Luther [EMAIL PROTECTED] Build-Depends: docbook-to-man, debhelper (= 4.0.0) Standards-Version: 3.6.0 Package: mkvmlinuz Architecture: powerpc -Depends: binutils +Depends: binutils, debconf Description: create a kernel to boot a PowerPC machine from Open Firmware . This little program takes a PowerPC Linux kernel as an uncompressed ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5317 - dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian
Author: luther Date: Fri Jan 6 16:15:21 2006 New Revision: 5317 Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control Log: Oh well, debconf-2.0 should be possible also ... Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control == --- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control(original) +++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/controlFri Jan 6 16:15:21 2006 @@ -8,7 +8,7 @@ Package: mkvmlinuz Architecture: powerpc -Depends: binutils, debconf +Depends: binutils, debconf | debconf-2.0 Description: create a kernel to boot a PowerPC machine from Open Firmware . This little program takes a PowerPC Linux kernel as an uncompressed ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5309 - in dists/trunk/linux-2.6/debian: . patches patches-debian
Author: luther Date: Fri Jan 6 07:58:54 2006 New Revision: 5309 Added: dists/trunk/linux-2.6/debian/patches/ - copied from r5308, dists/trunk/linux-2.6/debian/patches-debian/ Removed: dists/trunk/linux-2.6/debian/patches-debian/ Modified: dists/trunk/linux-2.6/debian/rules.real Log: Now that Bastian moved patches-arch under the arch directory, rename patches-debian to patches. Modified: dists/trunk/linux-2.6/debian/rules.real == --- dists/trunk/linux-2.6/debian/rules.real (original) +++ dists/trunk/linux-2.6/debian/rules.real Fri Jan 6 07:58:54 2006 @@ -106,7 +106,7 @@ rm -rf '$(DIR)' define patch_cmd -cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches-debian' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)' +cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)' endef srcfiles := $(filter-out debian, $(wildcard *)) @@ -251,7 +251,7 @@ dh_testroot dh_clean -d -k $(DH_OPTIONS) dh_installdirs $(DH_OPTIONS) '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch' - dh_install $(DH_OPTIONS) debian/patches-debian/* '$(pbase)/debian' + dh_install $(DH_OPTIONS) debian/patches/* '$(pbase)/debian' # Install the debian patches sed \ -e 's,@home@,$(pbase)/debian,' \ ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5124 - in dists/trunk/linux-2.6/debian: . patches-debian patches-debian/series
Author: luther Date: Thu Dec 29 09:53:49 2005 New Revision: 5124 Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/patches-debian/powerpc-apus.patch dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1 Log: Fixed apus patch, and reenabled it. Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Thu Dec 29 09:53:49 2005 @@ -40,7 +40,12 @@ * [arm] Compile ext3 support into the kernel on Footbridge. * [arm] Turn on CONFIG_SERIAL_8250 support on Footbridge. - -- Jonas Smedegaard [EMAIL PROTECTED] Thu, 29 Dec 2005 02:50:37 +0100 + [ Sven Luther ] + * [powerpc] Fixed apus patch for 2.6.15-rc7 (and beyond hopefully). + * [powerpc] Fixed config options, but i guess jonas broke it again with his +cleanup, oh well :) + + -- Sven Luther [EMAIL PROTECTED] Thu, 29 Dec 2005 09:48:36 + linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low Modified: dists/trunk/linux-2.6/debian/patches-debian/powerpc-apus.patch == --- dists/trunk/linux-2.6/debian/patches-debian/powerpc-apus.patch (original) +++ dists/trunk/linux-2.6/debian/patches-debian/powerpc-apus.patch Thu Dec 29 09:53:49 2005 @@ -10,9 +10,9 @@ # i will not apply by default. # -diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/Kconfig linux-apus-2.6/arch/ppc/Kconfig linux-2.6.14/arch/ppc/Kconfig 2005-10-28 00:02:08.0 + -+++ linux-apus-2.6/arch/ppc/Kconfig2005-11-17 14:15:32.0 + +diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/Kconfig linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/Kconfig +--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/Kconfig 2005-12-25 12:11:25.0 + linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/Kconfig 2005-12-29 09:27:43.0 + @@ -537,7 +537,6 @@ config APUS @@ -21,10 +21,10 @@ help Select APUS if configuring for a PowerUP Amiga. More information is available at: -diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/Makefile linux-apus-2.6/arch/ppc/Makefile linux-2.6.14/arch/ppc/Makefile 2005-10-28 00:02:08.0 + -+++ linux-apus-2.6/arch/ppc/Makefile 2005-11-17 14:15:32.0 + -@@ -55,9 +55,12 @@ +diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/Makefile linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/Makefile +--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/Makefile 2005-12-25 12:11:25.0 + linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/Makefile 2005-12-29 09:29:44.0 + +@@ -59,9 +59,12 @@ head-$(CONFIG_44x):= arch/ppc/kernel/head_44x.o head-$(CONFIG_FSL_BOOKE) := arch/ppc/kernel/head_fsl_booke.o @@ -32,12 +32,12 @@ +head-y+= arch/ppc/kernel/entry.o head-$(CONFIG_6xx)+= arch/ppc/kernel/idle_6xx.o head-$(CONFIG_POWER4) += arch/ppc/kernel/idle_power4.o - head-$(CONFIG_PPC_FPU)+= arch/ppc/kernel/fpu.o + head-$(CONFIG_PPC_FPU)+= arch/powerpc/kernel/fpu.o +head-y+= arch/ppc/kernel/head_end.o - core-y+= arch/ppc/kernel/ arch/ppc/platforms/ \ - arch/ppc/mm/ arch/ppc/lib/ arch/ppc/syslib/ -@@ -77,7 +80,9 @@ + core-y+= arch/ppc/kernel/ arch/powerpc/kernel/ \ + arch/ppc/platforms/ \ +@@ -84,7 +87,9 @@ .PHONY: $(BOOT_TARGETS) @@ -47,9 +47,9 @@ CPPFLAGS_vmlinux.lds := -Upowerpc -diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/Makefile linux-apus-2.6/arch/ppc/amiga/Makefile linux-2.6.14/arch/ppc/amiga/Makefile 2005-10-28 00:02:08.0 + -+++ linux-apus-2.6/arch/ppc/amiga/Makefile 2004-07-03 17:53:51.0 + +diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/Makefile linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/Makefile +--- linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/Makefile 2005-10-28 00:02:08.0 + linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/Makefile2005-12-29 09:27:43.0 + @@ -1,8 +1,8 @@ # -# Makefile for Linux arch/m68k/amiga source directory @@ -62,9 +62,9 @@ + amisound.o chipram.o amiga_ksyms.o obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o -diff -Nur -x.gitignore -xCVS linux-2.6.14/arch/ppc/amiga/amiints.c linux-apus-2.6/arch/ppc/amiga/amiints.c linux-2.6.14/arch/ppc/amiga/amiints.c 2005-10-28 00:02:08.0 + -+++ linux-apus-2.6/arch/ppc/amiga/amiints.c2004-02-04 21:21:34.0 + +diff -Nur linux-2.6-2.6.14+2.6.15-rc7.orig/arch/ppc/amiga/amiints.c linux-2.6-2.6.14+2.6.15-rc7/arch/ppc/amiga/amiints.c
[kernel] r5131 - dists/trunk/scripts
Author: luther Date: Thu Dec 29 14:18:26 2005 New Revision: 5131 Modified: dists/trunk/scripts/kconfig.ml Log: Fixed empty string usage message. Modified: dists/trunk/scripts/kconfig.ml == --- dists/trunk/scripts/kconfig.ml (original) +++ dists/trunk/scripts/kconfig.ml Thu Dec 29 14:18:26 2005 @@ -7,6 +7,9 @@ (function s - config_name := s) ./kconfig.ml config_file +let usage () = Arg.usage + [ ] + ./kconfig.ml config_file type options = | Config_Yes of string @@ -66,7 +69,7 @@ with End_of_file - () let () = - if !config_name != then + if !config_name = then usage () else try let config = open_in !config_name in parse_config config ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5132 - dists/trunk/linux-2.6/debian
Author: luther Date: Thu Dec 29 14:46:19 2005 New Revision: 5132 Modified: dists/trunk/linux-2.6/debian/rules.real Log: Reverted my wrong --arch changes. Modified: dists/trunk/linux-2.6/debian/rules.real == --- dists/trunk/linux-2.6/debian/rules.real (original) +++ dists/trunk/linux-2.6/debian/rules.real Thu Dec 29 14:46:19 2005 @@ -38,18 +38,13 @@ # replaced by the flavour for which the command is run. # kpkg_header += make-kpkg --append-to-version '$(KPKG_ABINAME)' +kpkg_header += --arch '$(ARCH)' kpkg_header += --stem linux kpkg_header += --config defconfig kpkg_image := make-kpkg --append-to-version '$(KPKG_ABINAME)-$(FLAVOUR)' +kpkg_image += --arch '$(ARCH)' kpkg_image += --stem linux kpkg_image += --initrd -ifdef KPKG_ARCH - kpkg_image += --arch '$(KPKG_ARCH)' - kpkg_header += --arch '$(KPKG_ARCH)' -else - kpkg_header += --arch '$(ARCH)' - kpkg_image += --arch '$(ARCH)' -endif ifdef KPKG_SUBARCH kpkg_image += --subarch '$(KPKG_SUBARCH)' kpkg_header += --subarch '$(KPKG_SUBARCH)' ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r5047 - in dists/trunk/linux-2.6/debian: . arch/powerpc bin
Author: luther
Date: Mon Dec 19 22:26:34 2005
New Revision: 5047
Modified:
dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
dists/trunk/linux-2.6/debian/arch/powerpc/defines
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/rules.real
Log:
Added support for make-kpkg --arch into gencontrol.py defines handling.
Added correct --arch entries for powerpc defines.
Untested though, may need a new kernel-package, but i think not.
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
==
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64 Mon Dec 19
22:26:34 2005
@@ -86,9 +86,7 @@
CONFIG_RTAS_ERROR_LOGGING=y
CONFIG_GENERIC_TBSYNC=y
# CONFIG_EMBEDDED6xx is not set
-CONFIG_WINDFARM_PM91=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_WINDFARM_PM81=y
CONFIG_HAVE_MEMORY_PRESENT=y
# CONFIG_PPC_64K_PAGES is not set
CONFIG_SPARSEMEM_EXTREME=y
@@ -100,3 +98,10 @@
CONFIG_POWER3=y
CONFIG_POWER4=y
# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_WINDFARM_PM91=m
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_WINDFARM_PM81=m
+CONFIG_KERNEL_START=0xc000
+CONFIG_MAC_FLOPPY is not set
+
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines
==
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines Mon Dec 19 22:26:34 2005
@@ -4,13 +4,15 @@
powerpc-smp
powerpc-miboot
powerpc64
-kernel-header-dirs: powerpc ppc ppc64 m68k
+kernel-header-dirs: powerpc ppc m68k
kernel-arch: powerpc
kpkg-subarch: powerpc
+kpkg-arch: powerpc
[apus]
kernel-arch: ppc
-kpkg-subarch: powerpc32
+kpkg-subarch: powerpc
+kpkg-arch: ppc
depends: mkvmlinuz (= 15)
[powerpc]
@@ -18,3 +20,6 @@
[powerpc-smp]
depends: mkvmlinuz (= 15)
+
+[powerpc64]
+kpkg-subarch: powerpc64
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Mon Dec 19 22:26:34 2005
@@ -341,7 +341,7 @@
makefile.append((%s-%s-%s-%s:: %s-%s-%s-%s-real % (i, arch, subarch,
flavour, i, arch, subarch, flavour), None))
makeflags['FLAVOUR'] = flavour
-for i in (('compiler', 'COMPILER'), ('kernel-header-dirs',
'KERNEL_HEADER_DIRS'), ('kpkg-subarch', 'KPKG_SUBARCH')):
+for i in (('compiler', 'COMPILER'), ('kernel-header-dirs',
'KERNEL_HEADER_DIRS'), ('kpkg-subarch', 'KPKG_SUBARCH'), ('kpkg-arch',
'KPKG_ARCH')):
if config_entry.has_key(i[0]):
makeflags[i[1]] = config_entry[i[0]]
makeflags_string = ' '.join([%s='%s' % i for i in makeflags.iteritems()])
Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Mon Dec 19 22:26:34 2005
@@ -16,12 +16,16 @@
486 to mention 2.6 (not 2.6.12).
[ Frederik Schüler ]
- * Add updated version of drivers-scsi-megaraid_splitup.patch.
+ * Add updated version of drivers-scsi-megaraid_splitup.patch.
(Closes: #317258)
* Deactivate CONFIG_IDE_TASK_IOCTL on alpha and ia64 and make it a global
option.
- -- Frederik Schüler [EMAIL PROTECTED] Mon, 19 Dec 2005 01:10:37 +0100
+ [ Sven Luther ]
+ * Added make-kpkg --arch option support to gencontrol.py.
+ * [powerpc] now set --arch kernel-package option correctly.
+
+ -- Sven Luther [EMAIL PROTECTED] Mon, 19 Dec 2005 22:21:46 +
linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low
Modified: dists/trunk/linux-2.6/debian/rules.real
==
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Mon Dec 19 22:26:34 2005
@@ -45,6 +45,10 @@
kpkg_image += --arch '$(ARCH)'
kpkg_image += --stem linux
kpkg_image += --initrd
+ifdef KPKG_ARCH
+ kpkg_image += --arch '$(KPKG_ARCH)'
+ kpkg_header += --arch '$(KPKG_ARCH)'
+endif
ifdef KPKG_SUBARCH
kpkg_image += --subarch '$(KPKG_SUBARCH)'
kpkg_header += --subarch '$(KPKG_SUBARCH)'
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
