r2009 - in trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27: debian powerpc powerpc/apply powerpc/unpatch
Sven Luther
luther@haydn.debian.org
Sun, 19 Dec 2004 05:45:26 -0700
Author: luther
Date: 2004-12-19 05:43:53 -0700 (Sun, 19 Dec 2004)
New Revision: 2009
Added:
trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/apply/0nubus
trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/debian-nubus.diff.gz
trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/unpatch/0nubus
Removed:
trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/apply/0apus
trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/unpatch/0apus
Modified:
trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/changelog
trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/control
trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/dirs
trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/rules
Log:
Added nubus patches and cleaned up debian and powerpc dirs.
Modified: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/changelog 2004-12-19 12:17:09 UTC (rev 2008)
+++ trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/changelog 2004-12-19 12:43:53 UTC (rev 2009)
@@ -1,261 +1,6 @@
-kernel-patch-2.4.27-apus (2.4.27-1) unstable; urgency=low
+kernel-patch-2.4.27-nubus (2.4.27-1) unstable; urgency=low
- * Forward ported patches to newest 2.4.27 kernel-source.
- * Fixed erroneous section which stopped the boot-loader from working.
- Thanks go to Roman Zippel.
+ * First release.
- -- Sven Luther <luther@debian.org> Sat, 25 Sep 2004 17:49:25 +0200
+ -- Sven Luther <luther@debian.org> Sun, 19 Dec 2004 13:40:01 +0100
-kernel-patch-2.4.25-apus (2.4.25-2) unstable; urgency=high
-
- * 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 14:27:49 +0200
-
-kernel-patch-2.4.25-apus (2.4.25-1) unstable; urgency=low
-
- * Updated to 2.4.25 kernel source (18-03-2004 CVS snapshot).
- * Modified to use 2.4.25-1 debian kernel source, and not just the plain
- debian tarball, which may be subject to changes.
-
- -- Sven Luther <luther@debian.org> Mon, 22 Mar 2004 15:17:00 +0100
-
-kernel-patch-2.4.20-apus (2.4.20-1) unstable; urgency=low
-
- * Linux/APUS CVS as of 2002-12-14
- * might fix hangs on bootup on BlizzardPPC systems
-
- -- Michel Daenzer <daenzer@debian.org> Sun, 15 Dec 2002 01:08:41 +0100
-
-kernel-patch-2.4.18-apus (2.4.18-3) unstable; urgency=low
-
- * Linux/APUS CVS as of 2002-09-04
- * The CybserstormPPC UW SCSI driver should work now, yay! Beware that it's
- still rather experimental - you've been warned
- * config/apus: disable PCI as it seems to cause more grief than joy yet
- * debian/control: add build dependency on debhelper
-
- -- Michel Daenzer <daenzer@debian.org> Thu, 5 Sep 2002 00:25:14 +0200
-
-kernel-patch-2.4.18-apus (2.4.18-2) unstable; urgency=low
-
- * Linux/APUS CVS as of 2002-04-08
- * Upstreams adds driver for GVP IO extender parallel port and virgefb fixes
- by Ken Tyler and another attempt to fix IRQ related boot problems by Roman
- Zippel. Feedback appreciated, as always
-
- -- Michel Daenzer <daenzer@debian.org> Mon, 8 Apr 2002 15:21:02 +0200
-
-kernel-patch-2.4.18-apus (2.4.18-1) unstable; urgency=low
-
- * Linux/APUS CVS as of 2002-03-30
- * contains upstream attempt to fix a boot problem on some machines related
- to IRQs; please let us know how it goes
-
- -- Michel Daenzer <daenzer@debian.org> Sat, 30 Mar 2002 12:59:18 +0100
-
-kernel-patch-2.4.17-apus (2.4.17-3) unstable; urgency=medium
-
- * Linux/APUS CVS as of 2002-02-17
- * Upstream has cleaned up some configuration options
- * Change CONFIG_PACKET to y for dhcp-client to work. This is needed for DHCP
- to work with the boot-floppies, hence the medium urgency
-
- -- Michel Daenzer <daenzer@debian.org> Sun, 17 Feb 2002 16:38:14 +0100
-
-kernel-patch-2.4.17-apus (2.4.17-2) unstable; urgency=low
-
- * Linux/APUS CVS as of 2002-01-19
- * Upstream fixes for boot problems
-
- -- Michel Daenzer <daenzer@debian.org> Sat, 19 Jan 2002 18:15:40 +0100
-
-kernel-patch-2.4.17-apus (2.4.17-1) unstable; urgency=low
-
- * Linux/APUS CVS as of 2002-01-10 (after 2.4.17 import from bk)
- * Upstream changes include new support for RBM IOBlix Zorro2 serial cards
-
- -- Michel Daenzer <daenzer@debian.org> Fri, 11 Jan 2002 00:10:59 +0100
-
-kernel-patch-2.4.16-apus (2.4.16-2) unstable; urgency=low
-
- * Rename patch directory from apus to powerpc, so (un)applying works out of
- the box (Closes a bug which doesn't exist but should have ;)
- * While we're at it, clean up debian/rules a bit wrt powerpc/apus
-
- -- Michel Daenzer <daenzer@debian.org> Wed, 19 Dec 2001 18:04:00 +0100
-
-kernel-patch-2.4.16-apus (2.4.16-1) unstable; urgency=low
-
- * Linux/APUS CVS as of 2001-12-01 (after 2.4.16 import from bk)
-
- -- Michel Daenzer <daenzer@debian.org> Sat, 1 Dec 2001 18:17:11 +0100
-
-kernel-patch-2.4.14-apus (2.4.14-1) unstable; urgency=low
-
- * Linux/APUS CVS as of 2001-11-13 (after 2.4.14 import from bk)
- * Upstream changes highlights include IRQ, memory and general cleanups for
- better integration into the bitkeeper and eventually Linus (yay!) tree
-
- -- Michel Daenzer <daenzer@debian.org> Tue, 13 Nov 2001 01:53:00 +0100
-
-kernel-patch-2.4.13-apus (2.4.13-1) unstable; urgency=low
-
- * The Halloween-but-no-kandy-so-far upload
- * Linux/APUS CVS as of 2001-11-01 (after 2.4.13 import from bk)
- * Resurrect kernel-headers package (ideas for a better long description for
- these are appreciated :)
-
- -- Michel Daenzer <daenzer@debian.org> Sat, 27 Oct 2001 17:57:27 +0200
-
-kernel-patch-2.4.12-apus (2.4.12-1) unstable; urgency=low
-
- * Linux/APUS CVS as of 2001-10-20 (after 2.4.12 import from bk)
- * New virtual package kernel-image-apus which depends on the latest real
- Linux/APUS kernel-image
- * debian/rules: cleanup
-
- -- Michel Daenzer <daenzer@debian.org> Sat, 20 Oct 2001 14:22:15 +0200
-
-kernel-patch-2.4.9-apus (2.4.9-2) unstable; urgency=low
-
- * Linux/APUS 2.4.9 final (CVS tag apus-2_4_9)
- * add X-Surf support
-
- -- Michel Daenzer <daenzer@debian.org> Sat, 20 Oct 2001 01:44:11 +0200
-
-kernel-patch-2.4.9-apus (2.4.9-1) unstable; urgency=low
-
- * Linux/APUS CVS as of 2001-08-22
- * There have been reorganizations in the bitkeeper tree so there might be
- problems. Please do report bugs.
-
- -- Michel Daenzer <daenzer@debian.org> Wed, 22 Aug 2001 02:09:48 +0200
-
-kernel-patch-2.4.8-apus (2.4.8-2) unstable; urgency=low
-
- * Linux/APUS CVS as of 2001-08-20
- * Fixes an AFFS bug which caused apps to hang uninterruptibly
-
- -- Michel Daenzer <daenzer@debian.org> Mon, 20 Aug 2001 22:46:41 +0200
-
-kernel-patch-2.4.8-apus (2.4.8-1) unstable; urgency=low
-
- * Linux/APUS CVS as of 2001-08-17
- * minor update to the patch package description about the BK tree
-
- -- Michel Daenzer <daenzer@debian.org> Fri, 17 Aug 2001 22:51:00 +0200
-
-kernel-patch-2.4.7-apus (2.4.7-1) unstable; urgency=low
-
- * Linux/APUS CVS as of 2001-08-03
- * minor enhancements to the package descriptions
- * kernel-package uses the correct image on its own, and the annoying lilo
- questions are gone. Thanks to Manoj Srivastava and Colin Walters!
-
- -- Michel Daenzer <daenzer@debian.org> Sat, 4 Aug 2001 00:12:56 +0200
-
-kernel-patch-2.4.6-apus (2.4.6-1) unstable; urgency=low
-
- * New upstream version (Linux/APUS CVS as of 2001-07-10), should fix a lot
- of VM problems including the nasty crashes on A4000
- * Only use a single patch against kernel-source anymore
- * I didn't look close enough before asking Manoj to change kernel-package
- for us, so I still need to hack the image path a bit. Oh well.
-
- -- Michel Daenzer <daenzer@debian.org> Wed, 11 Jul 2001 12:37:19 +0200
-
-kernel-patch-2.4.4-apus (2.4.4-1) unstable; urgency=low
-
- * New upstream version (first 2.4 APUS kernel package)
- * Now based on kernel-patch-x.x.x-powerpc, use kernel-package
- * Config changes with boot-floppies in mind, feedback welcome
-
- -- Michel Daenzer <daenzer@debian.org> Sun, 27 May 2001 18:40:08 +0100
-
-kernel-image-2.2.10-powerpc-apus (2.2.10-13) unstable; urgency=low
-
- * New maintainer
- * update to the latest APUS CVS (upstream)
- * use only a single patch (changes in the APUS CVS relative to the
- native tree) anymore
- * remove bzip2 from Build-Depends
- * fix lintian errors; update standards version to 3.2.1.0
-
- -- Michel Daenzer <daenzer@debian.org> Wed, 24 Jan 2001 00:40:24 +0100
-
-kernel-image-2.2.10-powerpc-apus (2.2.10-12) potato unstable; urgency=low
-
- * new built for potato release 2.
- * upgraded to the latest apus patch.
-
- -- Sven LUTHER <luther@debian.org> Thu, 23 Nov 2000 16:28:34 +0100
-
-kernel-image-2.2.10-powerpc-apus (2.2.10-11) frozen unstable; urgency=low
-
- * added the affs patch from Ken Tyler. Fixes the affs corruption bug.
- * now build loop in the kernel, as without that, boot floppies will not
- work.
-
- -- Sven LUTHER <luther@debian.org> Tue, 2 May 2000 15:42:09 +0200
-
-kernel-image-2.2.10-powerpc-apus (2.2.10-10) frozen unstable; urgency=low
-
- * changed config file to solve module dependency problems.
-
- -- Sven LUTHER <luther@debian.org> Fri, 10 Mar 2000 13:12:03 +0100
-
-kernel-image-2.2.10-powerpc-apus (2.2.10-9) frozen unstable; urgency=low
-
- * The bootstrap patch did not work, fixed it.
- * Checked config options to be able to build boot-floppies.
-
- -- Sven LUTHER <luther@debian.org> Sun, 20 Feb 2000 14:05:51 +0100
-
-kernel-image-2.2.10-powerpc-apus (2.2.10-8) frozen unstable; urgency=low
-
- * Fixed the latest bootstrap patch (at least i hope so).
-
- -- Sven LUTHER <luther@debian.org> Sat, 19 Feb 2000 17:40:38 +0100
-
-kernel-image-2.2.10-powerpc-apus (2.2.10-7) frozen unstable; urgency=low
-
- * applied the latest bootstrap patch.
-
- -- Sven LUTHER <luther@debian.org> Fri, 4 Feb 2000 20:29:51 +0100
-
-kernel-image-2.2.10-powerpc-apus (2.2.10-6) frozen unstable; urgency=low
-
- * Some clean up done.
-
- -- Sven LUTHER <luther@debian.org> Tue, 25 Jan 2000 01:12:25 +0100
-
-kernel-image-2.2.10-powerpc-apus (2.2.10-5) frozen unstable; urgency=low
-
- * Initial kernel-image release for powerpc apus (the package, not the image)
-
- -- Sven LUTHER <luther@debian.org> Mon, 24 Jan 2000 22:49:39 +0100
-
-
-
Modified: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/control
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/control 2004-12-19 12:17:09 UTC (rev 2008)
+++ trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/control 2004-12-19 12:43:53 UTC (rev 2009)
@@ -1,4 +1,4 @@
-Source: kernel-patch-2.4.27-apus
+Source: kernel-patch-2.4.27-nubus
Section: devel
Priority: optional
Maintainer: Sven Luther <luther@debian.org>
@@ -6,47 +6,47 @@
Build-Depends: kernel-tree-2.4.27-5, kernel-package (>= 7.48), debhelper
Standards-Version: 3.5.4
-Package: kernel-patch-2.4.27-apus
+Package: kernel-patch-2.4.27-nubus
Architecture: powerpc
Depends: kernel-source-2.4.27
Provides: kernel-patch-powerpc
Conflicts: kernel-patch-powerpc, kernel-patch-2.2.14-powerpc (<< 20000418-2.2.15pre16-1)
Replaces: kernel-patch-powerpc, kernel-patch-2.2.14-powerpc (<< 20000418-2.2.15pre16-1)
-Description: Diffs to the kernel source for APUS
+Description: Diffs to the kernel source for nubus
The PowerPC kernel is maintained in a multitude of source trees
separate from Linus Torvalds' official copy. This patch is based on
- the Linux/APUS tree from http://linux-apus.sourceforge.net, which in turn
+ the Linux/nubus tree from http://linux-nubus.sourceforge.net, which in turn
is based on the BitKeeper tree used by most active PowerPC developers (See
http://penguinppc.org/dev/kernel.shtml for info).
-Package: kernel-image-2.4.27-apus
+Package: kernel-image-2.4.27-nubus
Section: base
Architecture: powerpc
-Recommends: kernel-headers-2.4.27-apus
+Recommends: kernel-headers-2.4.27-nubus
Suggests: kernel-doc-2.4.27
Provides: kernel-image
-Description: Linux/APUS kernel binary image.
- This package contains the Linux/APUS kernel image, the
+Description: Linux/nubus kernel binary image.
+ This package contains the Linux/nubus kernel image, the
System.map file, and the modules built by the package.
.
- This version is for Amiga PowerUP System (APUS) computers.
+ This version is for Amiga PowerUP System (nubus) computers.
.
Kernel image packages are generally produced using kernel-package,
and it is suggested that you install that package if you wish to
create a custom kernel from the sources. You will also need
- kernel-patch-2.4.27-apus.
+ kernel-patch-2.4.27-nubus.
-Package: kernel-headers-2.4.27-apus
+Package: kernel-headers-2.4.27-nubus
Section: devel
Architecture: powerpc
Provides: kernel-headers, kernel-headers-2.4
-Description: Linux/APUS kernel headers.
- Read /usr/share/doc/kernel-headers-2.4.27-apus/debian.README.gz for details.
+Description: Linux/nubus kernel headers.
+ Read /usr/share/doc/kernel-headers-2.4.27-nubus/debian.README.gz for details.
-Package: kernel-image-apus
+Package: kernel-image-nubus
Section: base
Architecture: powerpc
-Depends: kernel-image-2.4.27-apus
-Description: Latest Linux/APUS kernel binary image.
- This is a virtual package which ensures that you have the latest Linux/APUS
+Depends: kernel-image-2.4.27-nubus
+Description: Latest Linux/nubus kernel binary image.
+ This is a virtual package which ensures that you have the latest Linux/nubus
kernel image installed.
Modified: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/dirs
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/dirs 2004-12-19 12:17:09 UTC (rev 2008)
+++ trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/dirs 2004-12-19 12:43:53 UTC (rev 2009)
@@ -1,2 +1,2 @@
usr/src/kernel-patches
-usr/share/doc/kernel-patch-2.4.20-apus
+usr/share/doc/kernel-patch-2.4.20-nubus
Modified: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/rules 2004-12-19 12:17:09 UTC (rev 2008)
+++ trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/debian/rules 2004-12-19 12:43:53 UTC (rev 2009)
@@ -20,8 +20,8 @@
debver := $(realver)-$(minorver)
# The names of the kernel image and headers packages
-imgname := kernel-image-$(basever)-apus_$(debver)_$(arch).deb
-hdrname := kernel-headers-$(basever)-apus_$(debver)_$(arch).deb
+imgname := kernel-image-$(basever)-nubus_$(debver)_$(arch).deb
+hdrname := kernel-headers-$(basever)-nubus_$(debver)_$(arch).deb
ifneq ($(epoch),0)
packver := $(epoch):$(debver)
@@ -29,7 +29,7 @@
packver := $(debver)
endif
-p_patch := kernel-patch-$(basever)-apus
+p_patch := kernel-patch-$(basever)-nubus
v_patch := $(realver)-$(minorver)
kdir := build-tmp/kernel-source-$(basever)
@@ -54,19 +54,19 @@
binary-indep:
dh_testdir
-binary-image-apus-stamp:
+binary-image-nubus-stamp:
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs -pkernel-image-apus
- dh_installdocs -pkernel-image-apus
- dh_installchangelogs -pkernel-image-apus
- dh_compress -pkernel-image-apus
- dh_installdeb -pkernel-image-apus
- dh_fixperms -pkernel-image-apus
- dh_gencontrol -pkernel-image-apus
- dh_md5sums -pkernel-image-apus
- dh_builddeb -pkernel-image-apus
+ dh_installdirs -pkernel-image-nubus
+ dh_installdocs -pkernel-image-nubus
+ dh_installchangelogs -pkernel-image-nubus
+ dh_compress -pkernel-image-nubus
+ dh_installdeb -pkernel-image-nubus
+ dh_fixperms -pkernel-image-nubus
+ dh_gencontrol -pkernel-image-nubus
+ dh_md5sums -pkernel-image-nubus
+ dh_builddeb -pkernel-image-nubus
touch $@
@@ -77,7 +77,7 @@
dh_installdirs -p$(p_patch)
cp -a $(arch) debian/tmp/usr/src/kernel-patches/$(arch)
- cp config/apus debian/tmp/usr/src/kernel-patches/$(arch)/config.apus;
+ cp config/nubus debian/tmp/usr/src/kernel-patches/$(arch)/config.nubus;
dh_installdocs -p$(p_patch)
dh_installchangelogs -p$(p_patch)
@@ -98,15 +98,15 @@
# Messes up version detection with kernel-package - but that's good
export PATCH_THE_KERNEL=YES; \
export PATCH_DIR=$(shell pwd)/$(arch); \
- cp config/apus $(kdir)/.config; \
+ cp config/nubus $(kdir)/.config; \
mkdir $(kdir)/debian; \
cp debian/changelog debian/control $(kdir)/debian/; \
echo official > $(kdir)/debian/official; \
- (cd $(kdir) && make-kpkg --append-to-version -apus \
- --subarch apus kernel_{image,headers}); \
+ (cd $(kdir) && make-kpkg --append-to-version -nubus \
+ --subarch nubus kernel_{image,headers}); \
cp build-tmp/{$(imgname),$(hdrname)} ..;
-binary-arch: binary-image-apus-stamp binary-patch-stamp binary-image
+binary-arch: binary-image-nubus-stamp binary-patch-stamp binary-image
dpkg-distaddfile $(imgname) base optional
dpkg-distaddfile $(hdrname) devel optional
Deleted: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/apply/0apus
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/apply/0apus 2004-12-19 12:17:09 UTC (rev 2008)
+++ trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/apply/0apus 2004-12-19 12:43:53 UTC (rev 2009)
@@ -1,42 +0,0 @@
-#! /bin/sh
-#
-# (C) 1998 Manoj Srivastava & Eric Delaunay.
-# Minor modifications for APUS by Michel Dänzer
-
-set -e
-
-ARCHITECTURE=`dpkg --print-installation-architecture`
-PATCHNAME=debian-apus
-PATCHFILE=debian-apus.diff.gz
-if [ -n "$PATCH_DIR" -a -f "$PATCH_DIR/$PATCHFILE" ]; then
- PATCHDIR="$PATCH_DIR"
-else
- PATCHDIR=/usr/src/kernel-patches/$ARCHITECTURE
-fi
-
-if ! test -d kernel -a -d Documentation ; then
- echo "Not in kernel top level directory. Exiting" >&2
- exit 1
-fi
-
-if test -f debian/APPLIED_${ARCHITECTURE}_$PATCHNAME ; then
- exit 0 # patch already applied
-fi
-
-VERSION=$(grep ^VERSION Makefile 2>/dev/null | \
- sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-PATCHLEVEL=$(grep ^PATCHLEVEL Makefile 2>/dev/null | \
- sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-SUBLEVEL=$(grep ^SUBLEVEL Makefile 2>/dev/null | \
- sed -e 's/[^0-9]*\([0-9B]*\)/\1/')
-
-PATCH_VERSION=$(patch -v | head -1 | sed -e 's/[^0-9\.]//g')
-PATCH_OPTIONS="-l -s -p1"
-
-rm -f include/asm
-zcat $PATCHDIR/$PATCHFILE | patch $PATCH_OPTIONS
-
-echo "Removing empty files after patching" >&2
-find . -type f -size 0 -exec rm {} \; -print
-mkdir -p debian && echo done > debian/APPLIED_${ARCHITECTURE}_$PATCHNAME
-exit 0
Copied: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/apply/0nubus (from rev 2008, trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/apply/0apus)
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/apply/0apus 2004-12-19 12:17:09 UTC (rev 2008)
+++ trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/apply/0nubus 2004-12-19 12:43:53 UTC (rev 2009)
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# (C) 1998 Manoj Srivastava & Eric Delaunay.
+# Minor modifications for nubus powermacs by Sven Luther.
+
+set -e
+
+ARCHITECTURE=`dpkg --print-installation-architecture`
+PATCHNAME=debian-nubus
+PATCHFILE=debian-nubus.diff.gz
+if [ -n "$PATCH_DIR" -a -f "$PATCH_DIR/$PATCHFILE" ]; then
+ PATCHDIR="$PATCH_DIR"
+else
+ PATCHDIR=/usr/src/kernel-patches/$ARCHITECTURE
+fi
+
+if ! test -d kernel -a -d Documentation ; then
+ echo "Not in kernel top level directory. Exiting" >&2
+ exit 1
+fi
+
+if test -f debian/APPLIED_${ARCHITECTURE}_$PATCHNAME ; then
+ exit 0 # patch already applied
+fi
+
+VERSION=$(grep ^VERSION Makefile 2>/dev/null | \
+ sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+PATCHLEVEL=$(grep ^PATCHLEVEL Makefile 2>/dev/null | \
+ sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+SUBLEVEL=$(grep ^SUBLEVEL Makefile 2>/dev/null | \
+ sed -e 's/[^0-9]*\([0-9B]*\)/\1/')
+
+PATCH_VERSION=$(patch -v | head -1 | sed -e 's/[^0-9\.]//g')
+PATCH_OPTIONS="-l -s -p1"
+
+rm -f include/asm
+zcat $PATCHDIR/$PATCHFILE | patch $PATCH_OPTIONS
+
+echo "Removing empty files after patching" >&2
+find . -type f -size 0 -exec rm {} \; -print
+mkdir -p debian && echo done > debian/APPLIED_${ARCHITECTURE}_$PATCHNAME
+exit 0
Added: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/debian-nubus.diff.gz
===================================================================
(Binary files differ)
Property changes on: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/debian-nubus.diff.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/unpatch/0apus
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/unpatch/0apus 2004-12-19 12:17:09 UTC (rev 2008)
+++ trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/unpatch/0apus 2004-12-19 12:43:53 UTC (rev 2009)
@@ -1,43 +0,0 @@
-#! /bin/sh
-#
-# (C) 1998 Manoj Srivastava & Eric Delaunay.
-# Minor modifications for APUS by Michel Dänzer
-
-set -e
-
-ARCHITECTURE=`dpkg --print-installation-architecture`
-PATCHNAME=debian-apus
-PATCHFILE=debian-apus.diff.gz
-if [ -n "$PATCH_DIR" -a -f "$PATCH_DIR/$PATCHFILE" ]; then
- PATCHDIR="$PATCH_DIR"
-else
- PATCHDIR=/usr/src/kernel-patches/$ARCHITECTURE
-fi
-
-if ! test -d kernel -a -d Documentation ; then
- echo "Not in kernel top level directory. Exiting" >&2
- exit 1
-fi
-
-if ! test -f debian/APPLIED_${ARCHITECTURE}_$PATCHNAME ; then
- echo "Patch doesn't seem to be applied. Exiting" >&2
- exit 1
-fi
-
-VERSION=$(grep ^VERSION Makefile 2>/dev/null | \
- sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-PATCHLEVEL=$(grep ^PATCHLEVEL Makefile 2>/dev/null | \
- sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-SUBLEVEL=$(grep ^SUBLEVEL Makefile 2>/dev/null | \
- sed -e 's/[^0-9]*\([0-9]*\)/\1/')
-
-PATCH_VERSION=$(patch -v | head -1 | sed -e 's/[^0-9\.]//g')
-
-PATCH_OPTIONS="-l -s -p1"
-
-zcat $PATCHDIR/$PATCHFILE | patch -R $PATCH_OPTIONS
-
-echo "Removing empty files after unpatching" >&2
-find . -type f -size 0 -exec rm {} \; -print
-rm -f debian/APPLIED_${ARCHITECTURE}_$PATCHNAME
-exit 0
Copied: trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/unpatch/0nubus (from rev 2008, trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/unpatch/0apus)
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/unpatch/0apus 2004-12-19 12:17:09 UTC (rev 2008)
+++ trunk/kernel-2.4/powerpc/kernel-patch-2.4.27-nubus-2.4.27/powerpc/unpatch/0nubus 2004-12-19 12:43:53 UTC (rev 2009)
@@ -0,0 +1,43 @@
+#! /bin/sh
+#
+# (C) 1998 Manoj Srivastava & Eric Delaunay.
+# Minor modifications for nubus powermacs by Sven Luther.
+
+set -e
+
+ARCHITECTURE=`dpkg --print-installation-architecture`
+PATCHNAME=debian-nubus
+PATCHFILE=debian-nubus.diff.gz
+if [ -n "$PATCH_DIR" -a -f "$PATCH_DIR/$PATCHFILE" ]; then
+ PATCHDIR="$PATCH_DIR"
+else
+ PATCHDIR=/usr/src/kernel-patches/$ARCHITECTURE
+fi
+
+if ! test -d kernel -a -d Documentation ; then
+ echo "Not in kernel top level directory. Exiting" >&2
+ exit 1
+fi
+
+if ! test -f debian/APPLIED_${ARCHITECTURE}_$PATCHNAME ; then
+ echo "Patch doesn't seem to be applied. Exiting" >&2
+ exit 1
+fi
+
+VERSION=$(grep ^VERSION Makefile 2>/dev/null | \
+ sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+PATCHLEVEL=$(grep ^PATCHLEVEL Makefile 2>/dev/null | \
+ sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+SUBLEVEL=$(grep ^SUBLEVEL Makefile 2>/dev/null | \
+ sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+
+PATCH_VERSION=$(patch -v | head -1 | sed -e 's/[^0-9\.]//g')
+
+PATCH_OPTIONS="-l -s -p1"
+
+zcat $PATCHDIR/$PATCHFILE | patch -R $PATCH_OPTIONS
+
+echo "Removing empty files after unpatching" >&2
+find . -type f -size 0 -exec rm {} \; -print
+rm -f debian/APPLIED_${ARCHITECTURE}_$PATCHNAME
+exit 0