r2367 - trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian
Sven Luther
luther@costa.debian.org
Sun, 23 Jan 2005 17:52:10 +0100
Author: luther
Date: 2005-01-23 17:52:08 +0100 (Sun, 23 Jan 2005)
New Revision: 2367
Modified:
trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/changelog
trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/control
trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/control.stub
trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/rules
Log:
Reverting the patch removal stuff, since we still need that for 2.4.27.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/changelog
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/changelog 2005-01-23 16:46:34 UTC (rev 2366)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/changelog 2005-01-23 16:52:08 UTC (rev 2367)
@@ -1,47 +1,12 @@
-kernel-patch-powerpc-2.6.8 (2.6.8-9) unstable; urgency=high
+kernel-patch-powerpc-2.6.8 (2.6.8-8) UNRELEASED; urgency=low
- * Built against kernel-source 2.6.8-12 :
- - [powerpc - prep] Fix bad irq assignement for pci devices on motorola
- powerstack boxes. (Closes: #287933) (Sven Luther)
- - add dh_fixperms to the build targets to kernel-patch-debian-2.6.8
- to ensure that the permissions of the files in this package are
- sensible. (See: Bug#288279) (Simon Horman)
- - [SECURITY] Fix vulnerability in the ELF loader code allowing
- local attacker to execute code as root, CAN-2004-1235.
- (Maximilian Attems)
- - Added backport of qla1280 driver from 2.6.10. (Norbert Tretkowski)
- - [SECURITY] 028-do_brk_security_fixes.dpatch
- Drop Marcelo's fix for this; use Linus' instead.
- Fix local root vulnerability for various do_brk() calls;
- ensure an exclusive lock on memory while modifying it; CAN-2004-1235
- (Andres Salomon) (Bug: #289155).
- - [SECURITY] 029-random_poolsize_overflow.dpatch
- drivers/char/random allows you to set the poolsize; its sanity checking
- on that input isn's very good. We fix that here.
- See http://seclists.org/lists/fulldisclosure/2005/Jan/0270.html for
- more details. This fixes #3 on that list (Andres Salomon).
- - [SECURITY] 030-moxa_user_copy_checking.dpatch
- The moxa driver does some ugly things w/ signed integers. This fixes
- #4 on Brad Spengler's advisory (Andres Salomon).
- - [SECURITY] 031-sg_scsi_ioctl_int_overflows.dpatch
- SG ioctl stuff doesn't actually check whether the scsi command length
- is positive. #5 on the above advisory (Andres Salomon).
-
- -- Sven Luther <luther@debian.org> Sat, 8 Jan 2005 14:47:16 +0100
-
-kernel-patch-powerpc-2.6.8 (2.6.8-8) unstable; urgency=high
-
* Moved remaining powerpc patches (pegasos-via-ide and legacy-serial)
to the common kernel-source package. (Sven Luther)
* Rebuilt against kernel-source-2.6.8-11. (Sven Luther)
- * Removed kernel-patch-powerpc package, since all the powerpc patches are
- now part of kernel-source. Next version of kernel-source-2.6.8 should have
- a conflict/replace/provides, but for now please remove it by hand.
+ -- Sven Luther <luther@debian.org> Sun, 26 Dec 2004 13:02:57 +0100
- -- Sven Luther <luther@debian.org> Wed, 29 Dec 2004 11:42:34 +0100
-
kernel-patch-powerpc-2.6.8 (2.6.8-7) unstable; urgency=high
* Rebuilt against kernel-source 2.6.8-10.
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/control
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/control 2005-01-23 16:46:34 UTC (rev 2366)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/control 2005-01-23 16:52:08 UTC (rev 2367)
@@ -6,6 +6,16 @@
Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
Standards-Version: 3.6.1
+Package: kernel-patch-powerpc-2.6.8
+Architecture: all
+Suggests: kernel-tree-2.6.8
+Description: improved PowerPC support for the Linux kernel
+ .
+ This package collects a number of patches that improve the Linux
+ kernel's support for the PowerPC architecture in general. It is
+ mainly used to build the official Debian kernel packages, but you
+ can also use it as a starting point for custom-built kernels.
+
Package: kernel-headers-2.6.8
Architecture: powerpc
Description: header files for the Linux kernel version 2.6.8
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/control.stub
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/control.stub 2005-01-23 16:46:34 UTC (rev 2366)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/control.stub 2005-01-23 16:52:08 UTC (rev 2367)
@@ -6,6 +6,16 @@
Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
Standards-Version: 3.6.1
+Package: kernel-patch-powerpc-M4KERNEL
+Architecture: all
+Suggests: kernel-tree-M4KERNEL
+Description: improved PowerPC support for the Linux kernel
+ .
+ This package collects a number of patches that improve the Linux
+ kernel's support for the PowerPC architecture in general. It is
+ mainly used to build the official Debian kernel packages, but you
+ can also use it as a starting point for custom-built kernels.
+
Package: kernel-headers-M4KERNEL
Architecture: powerpc
Description: header files for the Linux kernel version M4KERNEL
Modified: trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/rules
===================================================================
--- trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/rules 2005-01-23 16:46:34 UTC (rev 2366)
+++ trunk/kernel-2.4/powerpc/branch/kernel-patch-2.4.27-powerpc/debian/rules 2005-01-23 16:52:08 UTC (rev 2367)
@@ -38,6 +38,7 @@
KHEADERS = $(TMP)/kernel-headers-$(kernel)_$(version)_powerpc.deb
# install locations
+KPATCH = $(CURDIR)/debian/kernel-patch-powerpc-$(kernel)/usr/src/kernel-patches/powerpc/$(kernel)
KBUILD = $(CURDIR)/debian/kernel-build-$(kernel)-$(flavour)
KBUILDDOC = $(KBUILD)/usr/share/doc/kernel-build-$(kernel)-$(flavour)
KSRC = $(KBUILD)/usr/src/kernel-build-$(kernel)-$(flavour)
@@ -53,8 +54,8 @@
export KPKG_SUBARCH=pmac
# the configure target is responsible for setting up the build arena,
-# i.e. unpacking the Debian kernel source and preparing a separate
-# build tree for each flavour.
+# i.e. unpacking the Debian kernel source, applying the PowerPC patch,
+# and preparing a separate build tree for each flavour.
configure: stamp-configure
@@ -74,15 +75,15 @@
touch $@
-# unpack the Debian kernel source, add a default .config file and the
-# necessary Debian files (changelog, control, copyright, post-install,
-# and official)
+# 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:
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
+ 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
@@ -167,14 +168,15 @@
# and modules to the right kernel-image and kernel-modules packages.
# The main work is done through the kernel-image target of make-kpkg.
# The resulting intermediate package is immediately unpacked again and
-# its contents re-arranged slightly. The whole process results in one
-# kernel-image directory per flavour. Also, the install target puts
-# together the build infrastructure for modules.
+# its contents re-arranged slightly. The whole process results in one
+# kernel-image directory per flavour. Also, the install target puts
+# together the patch package itself and the build infrastructure for
+# modules.
install: stamp-install
stamp-install: \
-stamp-build
+stamp-build stamp-install-patch
$(MAKE) -f debian/rules $(PARALLEL_BUILD) $(foreach flavour,$(flavours),stamp-install-flavour-$(flavour))
touch $@
@@ -186,6 +188,18 @@
touch $@
+# install the patch itself and the accompanying scripts
+stamp-install-patch: stamp-install-prepare debian/dirs debian/apply
+ dh_installdirs
+
+ $(INSTALL_EXEC) debian/apply $(KPATCH)/apply/powerpc
+ $(INSTALL_EXEC) debian/unpatch $(KPATCH)/unpatch/powerpc
+ $(INSTALL_EXEC) debian/list $(KPATCH)/patches
+ $(INSTALL_DATA) patches/* $(KPATCH)/patches
+ bzip2 $(KPATCH)/patches/*.diff
+
+ touch $@
+
ifeq (0,$(MAKELEVEL))
stamp-install-flavour-%:
@@ -241,12 +255,14 @@
ifeq ($(DEB_HOST_ARCH),powerpc)
binary: \
+binary-kernel-patch-powerpc-$(kernel) \
binary-kernel-headers-$(kernel) \
$(foreach flavour,$(flavours),binary-flavour-$(flavour))
else
binary: binary-arch binary-indep
binary-arch:
-binary-indep:
+binary-indep: \
+binary-kernel-patch-powerpc-$(kernel)
endif
ifeq (0,$(MAKELEVEL))
@@ -276,7 +292,7 @@
# The kernel-headers package is special since it can be created with a
# simple call to make-kpkg.
-binary-kernel-headers-$(kernel): stamp-install-prepare
+binary-kernel-headers-$(kernel):
cd $(KSOURCE); APPEND_TO_VERSION='' make-kpkg kernel-headers
mv $(KHEADERS) ..
dpkg-distaddfile $(notdir $(KHEADERS)) devel optional
@@ -308,6 +324,8 @@
dh_md5sums
dh_builddeb
+binary-kernel-patch-%: stamp-install-patch
+ $(MAKE) -f debian/rules binary-package DH_OPTIONS=-pkernel-patch-$*
binary-kernel-%: stamp-install-flavour-$(flavour)
$(MAKE) -f debian/rules binary-package DH_OPTIONS=-pkernel-$*
binary-package: binary-common-package