r2529 - in trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27: config debian
Sven Luther
luther@costa.debian.org
Mon, 21 Feb 2005 17:11:35 +0100
Author: luther
Date: 2005-02-21 17:11:34 +0100 (Mon, 21 Feb 2005)
New Revision: 2529
Added:
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/changelog
Modified:
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/config/Makefile
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/flavours
trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules
Log:
Continued adaptation of kernel-patch-powerpc-2.4.27 to single per arch package building for various subarches.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/config/Makefile
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/config/Makefile 2005-02-21 06:54:56 UTC (rev 2528)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/config/Makefile 2005-02-21 16:11:34 UTC (rev 2529)
@@ -1,10 +1,8 @@
-#powerpc default: powerpc.stub nosmp.stub cpufreq.stub common.stub
-# cat $^
-#%-smp: %.stub smp.stub nocpufreq.stub common.stub
-# cat $^
-#%: %.stub nosmp.stub nocpufreq.stub common.stub
-# cat $^
-#
+apus.default: apus
+powerpc.default: powerpc
+nubus.default: nubus
+
%: %.stub
cat $^
+
Copied: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/changelog (from rev 2523, trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/debian/changelog)
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/debian/changelog 2005-02-19 02:22:51 UTC (rev 2523)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/changelog 2005-02-21 16:11:34 UTC (rev 2529)
@@ -0,0 +1,517 @@
+kernel-patch-powerpc-2.4.27 (2.4.27-3) unstable; urgency=high
+
+ * New package, includes the apus powerpc subarch in addition to the
+ traditional powerpc subarch, and tries for nubus subarch support too.
+
+ -- Sven Luther <luther@debian.org> Mon, 21 Feb 2005 15:51:28 +0100
+
+kernel-patch-powerpc-2.4.27 (2.4.27-2) unstable; urgency=high
+
+ * Rebuilt against kernel-source 2.4.27-6. See kernel-source-2.4.27 changelog
+ for details.
+
+ -- Sven Luther <luther@debian.org> Wed, 1 Dec 2004 13:33:22 +0100
+
+kernel-patch-powerpc-2.4.27 (2.4.27-1) unstable; urgency=high
+
+ * New upstream release.
+ The "Let's keep Branden happy" release :).
+ * benh has not yet forward ported the 2.4 -benh tree, so this is still based
+ on benh's 2.4.26 import.
+ * Again, 2.4 kernels are deprecated on powerpc, please use 2.6.8-1 or later
+ kernels.
+ * Disabled rivafb driver, since it is broken in benh's tree and need to be
+ forward ported. Benh doesn't seem inclined to do so, and i don't have the
+ hardware. It is not a problem, since pmac/nvidia hardware should work all
+ right with offb, and should run 2.6.8 kernels anyway.
+
+ -- Sven Luther <luther@debian.org> Thu, 2 Sep 2004 22:52:56 +0200
+
+kernel-patch-powerpc-2.4.26 (2.4.26-2) unstable; urgency=high
+
+ * Fixed bad hunks in the patch.
+ * Now the source package build-depends on kernel-tree 2.6.26-6 and the patch
+ binary package conflicts with earlier versions of kernel-tree.
+
+ -- Sven Luther <luther@debian.org> Mon, 23 Aug 2004 10:53:57 +0200
+
+kernel-patch-powerpc-2.4.26 (2.4.26-1) unstable; urgency=low
+
+ * New upstream release.
+ * Transferred maintainership to the Debian Kernel Team.
+ * Patches are now separate in the powerpc/pieces directory.
+
+ -- Sven Luther <luther@debian.org> Sat, 31 Jul 2004 17:45:36 +0200
+
+kernel-patch-2.4.25-powerpc (2.4.25-8) unstable; urgency=low
+
+ * Built against kernel-source 2.4.25-3 to pull in security fixes and more :
+ - Black listed "TOSHIBA CD-ROM XM-1702BC" in drivers/ide/ide-dma.c
+ (Moritz Lennert, closes: #222939).
+ - Set protocol in ip_route_me_harder in net/core/netfilter.c
+ (closes: #236479).
+ - Reverted hardsect change in drivers/scsi/sr.c (closes: #232586).
+ - Tighten sanity in time_init to 250 PPM in arch/alpha/kernel/time.c
+ (Scott Bailey, closes: #233096).
+ - Call mkdep on headers with xargs in Makefile.
+ - Fixed tuner support on WinTV-D boards in drivers/media/video/bttv-cards.c
+ (2.6, closes: #241272).
+ - Fixed single word src misalign > dest misalign case in
+ arch/alpha/lib/stxncpy.S (glibc, closes: #237884).
+ - Enhanced user input validation (Thomas Biege):
+ . drivers/char/drm/r128_state.c
+ . drivers/char/drm-4.0/r128_state.c
+ - Fixed audio sampe size in drivers/sound/sb_audio.c (bk).
+ - Fixed local root exploit in fs/isofs/rock.c (Ernie Petrides).
+ - Clear b_data in journal_get_descriptor_buffer in fs/jbd/journal.c
+ (Ted Ts'o).
+ - Zero log buffer at mount time in fs/xfs/xfs_log.c (bk).
+ - Fixed boundary checks for GUSAGE/SUSAGE in drivers/usb/hiddev.c.
+
+ -- Sven Luther <luther@debian.org> Wed, 14 Apr 2004 15:30:08 +0200
+
+kernel-patch-2.4.25-powerpc (2.4.25-7) unstable; urgency=low
+
+ * Increase kernel size for chrp boot loader.
+ * Built the serial driver modular on Power4. (Closes: #242548).
+ * Adapted agp-uninorth patch mentioned by Michel Daenzer. (Closes: #242553)
+ * Made sure trying to load the partport_pc module on pmacs didn't happen.
+ May break on oldwolrd though, no idea. (Closes: #237601)
+
+ -- Sven Luther <luther@debian.org> Thu, 8 Apr 2004 23:45:11 +0200
+
+kernel-patch-2.4.25-powerpc (2.4.25-6) unstable; urgency=low
+
+ * ReiserFS, JFS and XFS are now builtin in every config except
+ powerpc-small.
+ * Added more verbose SMP system description. (Closes: #241671)
+
+ -- Sven Luther <luther@debian.org> Fri, 2 Apr 2004 22:23:09 +0200
+
+kernel-patch-2.4.25-powerpc (2.4.25-5) unstable; urgency=low
+
+ * Added Promise Ultra 100 TX2 driver for Apple XServe.
+
+ -- Sven Luther <luther@debian.org> Sat, 27 Mar 2004 13:41:02 +0100
+
+kernel-patch-2.4.25-powerpc (2.4.25-4) unstable; urgency=low
+
+ * Adapted to the patch that actually made it into kernel-package.
+ * Added asm/delay.h include to kahlua driver. (Closes: #226333, #217506)
+ * Switched to using kernel-tree-2.4.25 instead of kernel-source-2.4.25.
+
+ -- Sven Luther <luther@debian.org> Fri, 19 Mar 2004 14:52:50 +0100
+
+kernel-patch-2.4.25-powerpc (2.4.25-3) unstable; urgency=low
+
+ * Fixed PReP builtin initrd build script.
+ * Build with fixed kernel-package, so no need for a local hack.
+ * Added missing radeon drm module.
+ * Added agpgart module for Apple UniNorth. (Closes: #122209)
+
+ -- Sven Luther <luther@debian.org> Wed, 17 Mar 2004 17:11:54 +0100
+
+kernel-patch-2.4.25-powerpc (2.4.25-2) unstable; urgency=low
+
+ * Added proper changelog and other stuff to kernel-build and kernel-image
+ files. Also cleaned up short description a bit.
+ * Fixed CPUFREQ to run only on pmacs, since it was causing OOPSes on chrp
+ hardware.
+ * Added Power3 config too. Not sure it will work as is though.
+
+ -- Sven Luther <luther@debian.org> Thu, 4 Mar 2004 10:41:54 +0100
+
+kernel-patch-2.4.25-powerpc (2.4.25-1) unstable; urgency=low
+
+ * Now based on the 2.4 -benh tree, using 2.4.25-benh1 tag.
+ * Added copying info for kernel-build package.
+ * Enabled Amiga SFS filesystem write support.
+ * Added builtin USB UHCI support.
+ * Enabled serial console & sym53c8xx_2 scsi driver builtin,
+ for IBM RS6000 B50 users (and others).
+ * Added Power4 config, enables 32bit kernel for Power4 based IBM hardware as
+ well as Powermacs G5s.
+
+ -- Sven Luther <luther@debian.org> Mon, 1 Mar 2004 18:42:46 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-13) unstable; urgency=low
+
+ * There was another error in kernel-package, so i rebuilt again.
+ Hopefully this is the right one now.
+
+ -- Sven Luther <luther@debian.org> Thu, 26 Feb 2004 11:08:22 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-12) unstable; urgency=low
+
+ * Rebuilt with fixed kernel-package patch :/. At debian-installer base
+ -install time, dpkg-architecture is not available, so use dpkg
+ --print-installation-architecture.
+
+ -- Sven Luther <luther@debian.org> Wed, 25 Feb 2004 11:29:23 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-11) unstable; urgency=high
+
+ * Built with a fixed version of kernel-package, in order to definitively fix
+ the d-i kernel-install problem.
+ * Enabled crypto lib stuff. (Closes: #232040)
+ * make kernel-images depend on the exact version of kernel-modules.
+ * Fixed truncated description. (Closes: #226398)
+ * Removed security patch already applied in kernel-source. (Closes: #234052)
+
+ -- Sven Luther <luther@debian.org> Tue, 24 Feb 2004 12:07:11 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-10) unstable; urgency=low
+
+ * Rebuilt against kernel-source 2.4.22-6 for security fix :
+ Applied patch extracted from Solar Designer's Owl patched kernel to fix
+ local privilege escalation discovered by Paul Starzetz (CAN-2004-0077).
+
+ -- Sven Luther <luther@debian.org> Wed, 11 Feb 2004 13:58:49 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-9) unstable; urgency=low
+
+ * Added 3DFx voodood framebuffer device builtin into powerpc kernel, as well
+ as a bunch of other framebuffer devices.
+
+ -- Sven Luther <luther@debian.org> Mon, 2 Feb 2004 14:09:15 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-8) unstable; urgency=low
+
+ * There is also some problem with the postinst, let's rebuild it one more
+ time.
+
+ -- Sven Luther <luther@debian.org> Fri, 30 Jan 2004 13:44:43 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-7) unstable; urgency=low
+
+ * Modules installs should be silent, since the modules are not in the same
+ packages as the kernel anymore. This is a hacky solution until
+ kernel-package get proper support for this kind of stuff.
+
+ -- Sven Luther <luther@debian.org> Thu, 29 Jan 2004 15:01:36 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-6) unstable; urgency=low
+
+ * Changed initrd size from 4096 to 8192.
+ * Added patch to enable the L2 cache on Pegasos.
+ * Removed udebs, now that linux-kernel-di is used to build them.
+
+ -- Sven Luther <luther@debian.org> Sat, 24 Jan 2004 17:11:13 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-5) unstable; urgency=low
+
+ * Aknowledged two past NMUs, thanks to Matt for doing them.
+ * Pegasos RTC clock fix.
+ * Added Input Core and kernel driver to powerc-small.
+
+ -- Sven Luther <luther@debian.org> Wed, 14 Jan 2004 15:52:06 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-4.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix mremap and rtc security holes.
+
+ -- Matt Kraai <kraai@debian.org> Mon, 05 Jan 2004 09:55:34 -0800
+
+kernel-patch-2.4.22-powerpc (2.4.22-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add support for Radeon 9200.
+
+ -- Matt Kraai <kraai@debian.org> Fri, 02 Jan 2004 08:49:48 -0800
+
+kernel-patch-2.4.22-powerpc (2.4.22-4) unstable; urgency=low
+
+ * Rebuilt against kernel-source 2.4.22-5 to close the local root exploit.
+
+ -- Sven Luther <luther@debian.org> Mon, 15 Dec 2003 13:48:56 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-3) unstable; urgency=low
+
+ * Replaced GMAC driver by the SUNGMEM one.
+ * Added md5sum to all non udeb packages.
+ * Now set CONFIG_NVRAM=y even on powerpc-small.
+ * Added --initrd option to powerpc-small make-kpkg invocation.
+ * Kernel-build cleanup, now includes build script.
+
+ -- Sven Luther <luther@debian.org> Thu, 13 Nov 2003 17:44:47 +0100
+
+kernel-patch-2.4.22-powerpc (2.4.22-2) unstable; urgency=low
+
+ * Create kernel-images for each subarch.
+ * Don't rebuild the same kernel again for building the udebs.
+ * Firewire support now builtin, not as modules, to be able to install from
+ firewire devices.
+ * Added HFS, HFS+ and AFFS as udebs. (Closes: #213248)
+ * Added kernel-build package.
+ * Added config-small configuration for miboot floppy installs.
+ (Closes: #197460)
+ * NFS root filesystem now builtin.
+ * Added Pegasos support.
+ * Added Voodoo patches (don't seem to be enough for Voodoo 4 & 5 though).
+
+ -- Sven Luther <luther@debian.org> Thu, 23 Oct 2003 14:41:42 +0200
+
+kernel-patch-2.4.22-powerpc (2.4.22-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sven Luther <luther@debian.org> Wed, 24 Sep 2003 17:06:38 +0200
+
+kernel-patch-2.4.21-powerpc (2.4.21-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sven Luther <luther@debian.org> Sun, 15 Jun 2003 17:25:43 +0200
+
+kernel-patch-2.4.20-powerpc (2.4.20-4) unstable; urgency=low
+
+ * Apparently the kernel-images-2.4.20-powerpc kernel packages are pmac only,
+ as i have a chrp box, wrong things happened in the -4 build. Forcing to
+ pmac again, while investigating what should really be hapenning.
+
+ -- Sven Luther <luther@debian.org> Fri, 20 Jun 2003 17:01:10 +0200
+
+kernel-patch-2.4.20-powerpc (2.4.20-3) unstable; urgency=low
+
+ * Changed maintainer field, as i took over the unstable powerpc kernel
+ patches from Daniel Jacobowitz. Thanks go to Dan for the greeat work he
+ did uptonow with these packages, and for having helped me take over the
+ package.
+
+ -- Sven Luther <luther@debian.org> Thu, 19 Jun 2003 10:46:17 +0200
+
+kernel-patch-2.4.20-powerpc (2.4.20-2) unstable; urgency=high
+
+ * Fix a reference to 2.2.15 in the kernel-headers-2.4.20 description.
+ * Build against updated kernel-source-2.4.20, with yet more security
+ fixes.
+ * Fix a packaging bug with zero-sized stamp files.
+ * Produce socket-modules udeb (Closes: #193402).
+
+ -- Daniel Jacobowitz <dan@debian.org> Sun, 8 Jun 2003 18:20:20 -0400
+
+kernel-patch-2.4.20-powerpc (2.4.20-1) unstable; urgency=high
+
+ * New upstream kernel release (long overdue).
+ - Includes ptrace security fix.
+ * Enable CONFIG_FB_ATY_GX.
+ * Update module lists for udebs.
+
+ -- Daniel Jacobowitz <dan@debian.org> Wed, 26 Mar 2003 12:29:35 -0500
+
+kernel-patch-2.4.19-powerpc (2.4.19-2) unstable; urgency=low
+
+ * Actually install files into the patch package (Closes: #160163).
+ * Work around bug in current kernel-package that fails to create
+ stamp-patch.
+
+ -- Daniel Jacobowitz <dan@debian.org> Mon, 9 Sep 2002 08:47:55 -0400
+
+kernel-patch-2.4.19-powerpc (2.4.19-1) unstable; urgency=low
+
+ * New upstream kernel release.
+ * Add debhelper build depends, and make the package buildable
+ from source (Closes: #146598).
+ * Remove newpmac image, add udebs - patch from Colin Walters
+ (Closes: #154573).
+ * Actually apply the kernel patch! No one noticed that 2.4.18 didn't
+ have this.
+ * Disable CMD640 support. It causes a crash at boot on some PowerMac
+ machines. This should not affect those machines with CMD646's, and
+ I don't believe any PowerPC actually has an original CMD640.
+
+ -- Daniel Jacobowitz <dan@debian.org> Fri, 16 Aug 2002 11:37:52 -0400
+
+kernel-patch-2.4.18-powerpc (2.4.18-1) unstable; urgency=low
+
+ * New upstream kernel release.
+ * Disable fdomain.o, fdomain_cs.o, and in2000.o for PowerPC-unfriendly
+ use of ISA functions (Closes: #129256).
+ * Add newpmac kernel config from 2.4.16-1.1.
+ * Correct newpmac kernel config slightly (Closes: #137734).
+
+ -- Daniel Jacobowitz <dan@debian.org> Thu, 14 Mar 2002 10:51:11 -0500
+
+kernel-patch-2.4.16-powerpc (2.4.16-1) unstable; urgency=low
+
+ * New upstream kernel release.
+ * This release includes fixed kernel headers (Closes: #117218).
+ * Turn off ADB keycodes here too (Closes: #120626).
+
+ -- Daniel Jacobowitz <dan@debian.org> Wed, 28 Nov 2001 14:09:12 -0500
+
+kernel-patch-2.4.12-powerpc (2.4.12-1) unstable; urgency=low
+
+ * New upstream kernel release.
+
+ -- Daniel Jacobowitz <dan@debian.org> Sun, 14 Oct 2001 13:40:14 -0400
+
+kernel-patch-2.4.8-powerpc (2.4.8-2) unstable; urgency=low
+
+ * Turn off CONFIG_RTC in favor of CONFIG_PPC_RTC.
+ * Provide kernel-headers-2.4 to make glibc happier.
+
+ -- Daniel Jacobowitz <dan@debian.org> Wed, 15 Aug 2001 12:36:32 -0700
+
+kernel-patch-2.4.8-powerpc (2.4.8-1) unstable; urgency=low
+
+ * Update to kernel 2.4.8 and associated BitKeeper snapshot
+ (Closes: #102123).
+ * Compile in ext2, since we are not yet ready for initrd booting
+ (Closes: #96828).
+ * Update config/powerpc for 2.4.8.
+ * Fix parallel build (pushed to bitkeeper also).
+ * Disable PlanB, which does not build.
+ * Add an SMP config.
+ * Call the kernel package kernel-image-2.4.8-powerpc instead of
+ kernel-image-2.4.8.
+
+ -- Daniel Jacobowitz <dan@debian.org> Tue, 14 Aug 2001 12:57:31 -0700
+
+kernel-patch-2.4.4-powerpc (2.4.4-1) unstable; urgency=low
+
+ * First patch package for kernel 2.4.x.
+ * Bitkeeper snapshot from 2001.04.29, at the 2.4.4 merge.
+ * Update to work with unstable's kernel-package.
+ * Warning - the input layer fixes from 2.2.19-2 are lost in this
+ upload. The patch needs to be redone for 2.4.
+ * Build only a unified PMac/PReP/CHRP kernel for now.
+
+ -- Daniel Jacobowitz <dan@debian.org> Sun, 6 May 2001 16:33:40 -0400
+
+kernel-patch-2.2.19-powerpc (2.2.19-2) stable unstable; urgency=medium
+
+ * Turn off CONFIG_MAGIC_SYSRQ for now - it breaks the arrow keys
+ on some iMac keyboards still (Closes: #93247).
+ * Add a patch to make enter work at boot time, finally!
+ * Enable a bunch of 3COM NIC's.
+ * Remove configs we don't support - they haven't built in ages...
+
+ -- Daniel Jacobowitz <dan@debian.org> Sat, 14 Apr 2001 20:19:51 -0500
+
+kernel-patch-2.2.19-powerpc (2.2.19-1) stable unstable; urgency=medium
+
+ * New upstream version, based on final 2.2.19. Snapshot from 20010407.
+ * Start building image packages properly; thanks to Herbert Xu for
+ pointing me at the (fairly obvious) mistake I was making.
+ * Oh well. Necessitated changing the versioning scheme.
+
+ -- Daniel Jacobowitz <dan@debian.org> Sat, 7 Apr 2001 20:45:40 -0500
+
+kernel-patch-2.2.19pre17-powerpc (20010304-2.2.19pre17-1) stable unstable; urgency=medium
+
+ * New upstream version.
+ * The patch is down to 299 lines!
+ * Use --bzip2 to tar.
+ * Update copyright and changelog files.
+
+ -- Daniel Jacobowitz <dan@debian.org> Thu, 22 Mar 2001 12:06:39 -0600
+
+kernel-patch-2.2.18pre21-powerpc (20001119-2.2.18pre21-2) stable unstable; urgency=medium
+
+ * Update configs a bit:
+ - sync networking options on pmac with the standard
+ Intel kernel image packages (Closes: #72503). I still need to do the
+ same for prep and chrp.
+ - Turn off CONFIG_BOOTX_TEXT; it interferes with Quik.
+ - Enable serial console on CHRP.
+
+ -- Daniel Jacobowitz <dan@debian.org> Mon, 20 Nov 2000 19:33:34 -0500
+
+kernel-patch-2.2.18pre21-powerpc (20001119-2.2.18pre21-1) stable unstable; urgency=medium
+
+ * New upstream version.
+ * The patch has gone from about 2MB down to about 20K now.
+ * Updated configs to 2.2.18pre21.
+
+ -- Daniel Jacobowitz <dan@debian.org> Sun, 19 Nov 2000 23:06:33 -0500
+
+kernel-patch-2.2.17-powerpc (20000714-2.2.17pre11-2) frozen unstable; urgency=medium
+
+ * Ack, somehow aty128fb got disabled upstream. Reenable it, so that our
+ users can see their screens again.
+
+ -- Daniel Jacobowitz <dan@debian.org> Tue, 18 Jul 2000 16:26:17 -0700
+
+kernel-patch-2.2.17-powerpc (20000714-2.2.17pre11-1) frozen unstable; urgency=medium
+
+ * New upstream version.
+ * Add NCR 53c8xx controller to powermac kernel, needed for some G4
+ configurations.
+ * Add a patch from Franz Sirl to ease transition to the new input layer.
+ * Hand myself a boot to the head and set EXTRAVERSION back to empty in the
+ kernel Makefile.
+
+ -- Daniel Jacobowitz <dan@debian.org> Sun, 25 Jul 2000 18:20:45 -0700
+
+kernel-patch-2.2.17-powerpc (20000625-2.2.17pre5-1) frozen unstable; urgency=medium
+
+ * Use new kernel-source package.
+ * Update to Cort's 2.2.17pre5 tree.
+
+ -- Daniel Jacobowitz <dan@debian.org> Sun, 25 Jun 2000 12:37:55 -0700
+
+kernel-patch-2.2.15-powerpc (20000422-2.2.16pre4-1) frozen unstable; urgency=medium
+
+ * Release critical - Needed for the new kernel-source, again.
+ * Use Cort's current tree again, 2.2.16pre4. Work around the epoch
+ problems this way, luckily.
+
+ -- Daniel Jacobowitz <dan@debian.org> Mon, 29 May 2000 21:15:11 -0500
+
+kernel-patch-2.2.15-powerpc (20000422-2.2.15pre20-1) frozen unstable; urgency=medium
+
+ * Use new version of kernel-source. This is release critical, because the
+ previous version does not build with the new kernel-source, and thus
+ boot-floppies can not build!
+
+ -- Daniel Jacobowitz <dan@debian.org> Thu, 4 May 2000 08:46:52 -0400
+
+kernel-patch-2.2.15-powerpc (20000422-2.2.15pre19-1) frozen unstable; urgency=medium
+
+ * New upstream version for boot-floppies.
+ * Use kernel-source-2.2.15, which is actually pre19. Reduces the diff by
+ a miraculous amount.
+ * All local debian patches merged into Cort's tree now.
+ * Got a clue, renamed upstream patch to simply bitkeeper.diff.gz, and
+ removed need to edit the patching scripts every version.
+
+ -- Daniel Jacobowitz <dan@debian.org> Sat, 22 Apr 2000 18:04:55 -0400
+
+kernel-patch-2.2.14-powerpc (20000418-2.2.15pre17-1) frozen unstable; urgency=medium
+
+ * First release into the archive. Release Manager: this is needed
+ in frozen for powerpc boot floppies.
+ * Update the rules file for some more automation (complexifying the
+ version number further).
+ * Remove the miBoot support patch; miBoot can load compressed
+ kernel images without going through coff now.
+ * Remove debugging statements from the load_ramdisk (separate
+ boot/root) patch.
+ * Update from Cort's tree.
+ * Conflict with other versions of kernel-patch-*-powerpc.
+ kernel-patches/apply/0powerpc is in each one for a reason - there
+ should never be more than one installed.
+
+ -- Daniel Jacobowitz <dan@debian.org> Tue, 18 Apr 2000 13:22:03 -0400
+
+kernel-patch-2.2.14-powerpc (20000406) frozen unstable; urgency=medium
+
+ * Now based on Cort's bitkeeper tree, available by rsync at
+ hq.fsmlabs.com::linuxppc_2_2.
+ * Add a small fix for controlfb, and experimental patches for separate
+ boot/root disk support, and Ben's miBoot support patch.
+
+ -- Daniel Jacobowitz <dan@debian.org> Thu, 6 Apr 2000 16:31:41 -0400
+
+kernel-patch-2.2.14-powerpc (20000206) frozen unstable; urgency=medium
+
+ * New package, based on kernel-patch-2.2.13-netwinder.
+ * Based on Benjamin Herrenschmidt <bh40@calva.net>'s rsync tree at
+ linuxcare.com.au::linux-pmac-benh.
+ * Include the configs in the distributed package. Just to make bootprep's
+ life less painful.
+
+ -- Daniel Jacobowitz <dan@debian.org> Sun, 6 Feb 2000 19:42:09 -0500
+
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/flavours
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/flavours 2005-02-21 06:54:56 UTC (rev 2528)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/flavours 2005-02-21 16:11:34 UTC (rev 2529)
@@ -1,3 +1,5 @@
-# This file contains the flavours we're building for.
-power3 power3-smp power4 power4-smp powerpc powerpc-smp
+# This file contains the arches, subarches and flavours we are handling.
+archs: powerpc
+subarchs powerpc: apus nubus powerpc
+flavours powerpc: powerpc powerpc-smp powerpc-small power3 power4
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules 2005-02-21 06:54:56 UTC (rev 2528)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-powerpc-2.4.27/debian/rules 2005-02-21 16:11:34 UTC (rev 2529)
@@ -2,19 +2,23 @@
# debian/rules for kernel-patch-powerpc
-# written by Jens Schmalzing <jensen@debian.org>
+# original version by Jens Schmalzing <jensen@debian.org>
+# modified by Sven Luther <luther@debian.org>
# debhelper compatibility version
export DH_COMPAT=4
-# Set to Yes if we are going to generate the metapackages.
+# set to Yes if we are going to generate the metapackages.
OFFICIAL_VERSION = No
# set the build architecture if necessary
DEB_HOST_ARCH ?= $(shell dpkg --print-architecture)
-# the flavours we're building for
-flavours := $(shell grep -v ^\# debian/flavours)
+# the archs, subarchs and flavours we are building for
+archs := $(shell grep ^archs: debian/flavours | sed -e 's/^archs: *//')
+arch := $(DEB_HOST_ARCH)
+subarchs := $(shell grep "^subarchs $(arch):" debian/flavours | sed -e 's/^subarchs $(arch): *//')
+flavours := $(shell grep "^flavours $(subarch):" debian/flavours | sed -e 's/^flavours $(subarch): *//')
# cut the upstream version and the Debian revision from the changelog
kernel := $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)-.*).*$$/\1/')
@@ -33,7 +37,8 @@
# build locations - point TMP to a tmpfs for best performance
TMP ?= $(CURDIR)/tmp
KSOURCE = $(TMP)/kernel-source-$(kernel)
-KFLAVOUR = $(TMP)/kernel-source-$(kernel)-$(flavour)
+KSUBARCH = $(TMP)/kernel-source-$(kernel)-$(subarch)
+KFLAVOUR = $(TMP)/kernel-source-$(kernel)-$(subarch)-$(flavour)
KDUMMY = $(TMP)/kernel-image-$(kernel)-$(flavour)_$(version)_powerpc.deb
KHEADERS = $(TMP)/kernel-headers-$(kernel)_$(version)_powerpc.deb
@@ -68,56 +73,68 @@
# process after the loop.
stamp-configure: \
-stamp-configure-prepare \
-$(foreach flavour,$(flavours),stamp-configure-flavour-$(flavour))
-
- cd $(KSOURCE); APPEND_TO_VERSION='' make-kpkg configure
-
+stamp-configure-$(arch) \
+$(foreach subarch,$(subarchs),stamp-configure-subarch-$(subarch))
touch $@
-# unpack the Debian kernel source, apply the PowerPC patch, add a
-# default .config file and the necessary Debian files (changelog,
-# control, copyright, post-install, and official)
-stamp-configure-prepare:
-
+# Per arch configure processing.
+# We unpack the main kernel-source tree and prepare it for our needs.
+stamp-configure-$(arch):
test -d $(dir $(KSOURCE)) || mkdir -p $(dir $(KSOURCE))
tar jxCf $(dir $(KSOURCE)) /usr/src/kernel-source-$(kernel).tar.bz2
cd $(KSOURCE); /usr/src/kernel-patches/all/$(kernel)/apply/debian
- for file in $(shell debian/list patches); do patch -d $(KSOURCE) -p1 < patches/$$file; done
- -$(MAKE) -s -C config default > $(KSOURCE)/.config
-
test -d $(KSOURCE)/debian || mkdir $(KSOURCE)/debian
cd debian; cp -p changelog control copyright post-install $(KSOURCE)/debian
+ cp -p /usr/share/doc/kernel-source-$(kernel)/changelog.Debian.gz \
+ $(KSOURCE)/debian/changelog.Debian.kernel-source.gz
> $(KSOURCE)/debian/official
touch $@
ifeq (0,$(MAKELEVEL))
-stamp-configure-flavour-%:
- $(MAKE) -f debian/rules stamp-configure-flavour-$* flavour=$*
+stamp-configure-subarch-%:
+ $(MAKE) -f debian/rules stamp-configure-subarch-$* subarch=$*
else
ifeq (1,$(MAKELEVEL))
-# create a separate build tree for a given flavour, add the flavour's
-# .config and control files
-stamp-configure-flavour-$(flavour): \
-stamp-configure-prepare
+# Per subarch configure processing.
+# We copy the kernel-source tree, apply the subarch patches
+# add subarch entries in the control file and add the default
+# subarch configuration file.
+stamp-configure-subarch-$(subarch): \
+$(foreach flavour,$(flavours),stamp-configure-flavour-$(subarch)-$(flavour))
+ test -d $(dir $(KSUBARCH)) || mkdir -p $(dir $(KSUBARCH))
+ cp -al $(KSOURCE) $(KSUBARCH)
+ zcat patches/debian-$(subarch).diff.gz | patch -d $(KSUBARCH)
+ -$(MAKE) -s -C config $(subarch.default) $(KSUBARCH)/.config
+
+ touch $@
+
+stamp-configure-flavour-$(subarch)-%:
+ $(MAKE) -f debian/rules stamp-configure-flavour-$(subarch)-$* subarch=$(subarch) flavour=$*
+
+else
+ifeq (2,$(MAKELEVEL))
+
+# Per flavour configure processing.
+# We copy the kernel-source tree, add flavour entries in the
+# contol file and add the flavour configuration file.
+stamp-configure-flavour-$(subarch)-$(flavour):
test -d $(dir $(KFLAVOUR)) || mkdir -p $(dir $(KFLAVOUR))
+ cp -al $(KSUBARCH) $(KFLAVOUR))
- cp -al $(KSOURCE) $(KFLAVOUR)
-
rm -f $(KFLAVOUR)/.config $(KFLAVOUR)/debian/control
-$(MAKE) -s -C config $(flavour) > $(KFLAVOUR)/.config
$(M4) debian/control-dummy.m4 > $(KFLAVOUR)/debian/control
-
touch $@
endif
endif
+endif
# the build target is responsible for, well, building the kernels and
# modules for each flavour. To that end, it uses the build target of
@@ -130,32 +147,38 @@
endif
stamp-build: \
-stamp-configure stamp-build-prepare
- $(MAKE) -f debian/rules $(PARALLEL_BUILD) $(foreach flavour,$(flavours),stamp-build-flavour-$(flavour))
- touch $@
+stamp-build-$(arch) \
+$(foreach subarch,$(subarchs),stamp-build-subarch-$(subarch))
+ touch $@
-stamp-build-prepare:
+# Per arch build processing.
+stamp-build-$(arch):
dh_testdir
touch $@
ifeq (0,$(MAKELEVEL))
-stamp-build-flavour-%:
- $(MAKE) -f debian/rules $@
+stamp-build-subarch-%:
+ $(MAKE) -f debian/rules stamp-build-subarch-$* subarch=$*
else
ifeq (1,$(MAKELEVEL))
-stamp-build-flavour-%:
- $(MAKE) -f debian/rules stamp-build-flavour-$* flavour=$*
+# Per subarch build processing.
+stamp-build-subarch-$(subarch): \
+$(foreach flavour,$(flavours),stamp-build-flavour-$(subarch)-$(flavour))
+ touch $@
+stamp-build-flavour-$(subarch)-%:
+ $(MAKE) -f debian/rules stamp-build-flavour-$(subarch)-$* subarch=$(subarch) flavour=$*
+
else
ifeq (2,$(MAKELEVEL))
-# build the pmac kernel and the modules for a given flavour
-stamp-build-flavour-$(flavour): \
-stamp-configure-flavour-$(flavour) stamp-build-prepare
+# Per flavour build processing.
+stamp-build-flavour-$(subarch)-$(flavour):
cd $(KFLAVOUR); \
+
MFLAGS="$(filter-out -j --j%,$(MFLAGS))" \
MAKEFLAGS="$(filter-out -j --j%,$(MAKEFLAGS))" make-kpkg build
touch $@
@@ -176,6 +199,42 @@
install: stamp-install
stamp-install: \
+stamp-install-$(arch) \
+$(foreach subarch,$(subarchs),stamp-install-subarch-$(subarch))
+ touch $@
+
+# Per arch install processing.
+stamp-install-$(arch):
+ touch $@
+
+ifeq (0,$(MAKELEVEL))
+
+stamp-install-subarch-%:
+ $(MAKE) -f debian/rules stamp-install-subarch-$* subarch=$*
+
+else
+ifeq (1,$(MAKELEVEL))
+
+# Per subarch install processing.
+stamp-install-subarch-$(subarch): \
+$(foreach flavour,$(flavours),stamp-install-flavour-$(subarch)-$(flavour))
+ touch $@
+
+stamp-install-flavour-$(subarch)-%:
+ $(MAKE) -f debian/rules stamp-install-flavour-$(subarch)-$* subarch=$(subarch) flavour=$*
+
+else
+ifeq (2,$(MAKELEVEL))
+
+# Per flavour install processing.
+stamp-install-flavour-$(subarch)-$(flavour):
+ touch $@
+
+endif
+endif
+endif
+
+stamp-install: \
stamp-build stamp-install-patch
$(MAKE) -f debian/rules $(PARALLEL_BUILD) $(foreach flavour,$(flavours),stamp-install-flavour-$(flavour))
touch $@
@@ -255,6 +314,46 @@
ifeq ($(DEB_HOST_ARCH),powerpc)
binary: \
+binary-$(arch) \
+$(foreach subarch,$(subarchs),binary-subarch-$(subarch))
+ touch $@
+else
+binary:
+endif
+
+# Per arch binary processing.
+binary-$(arch):
+ touch $@
+
+ifeq (0,$(MAKELEVEL))
+
+stamp-binary-subarch-%:
+ $(MAKE) -f debian/rules binary-subarch-$* subarch=$*
+
+else
+ifeq (1,$(MAKELEVEL))
+
+# Per subarch binary processing.
+stamp-binary-subarch-$(subarch): \
+$(foreach flavour,$(flavours),binary-flavour-$(subarch)-$(flavour))
+ touch $@
+
+binary-flavour-$(subarch)-%:
+ $(MAKE) -f debian/rules binary-flavour-$(subarch)-$* subarch=$(subarch) flavour=$*
+
+else
+ifeq (2,$(MAKELEVEL))
+
+# Per flavour binary processing.
+binary-flavour-$(subarch)-$(flavour):
+ touch $@
+
+endif
+endif
+endif
+
+ifeq ($(DEB_HOST_ARCH),powerpc)
+binary: \
binary-kernel-patch-powerpc-$(kernel) \
binary-kernel-headers-$(kernel) \
$(foreach flavour,$(flavours),binary-flavour-$(flavour))