[kernel] r5672 -
dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian
Dann Frazier
dannf at costa.debian.org
Wed Feb 1 07:34:51 UTC 2006
Author: dannf
Date: Wed Feb 1 07:34:47 2006
New Revision: 5672
Added:
dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/abiname
Modified:
dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-dummy.m4
dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4
dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-official.m4
dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub
dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
Log:
* Build against kernel-tree-2.6.8-16sarge1
* Add an ABI string to the package name
Added: dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/abiname
==============================================================================
--- (empty file)
+++ dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/abiname Wed Feb 1 07:34:47 2006
@@ -0,0 +1 @@
+1
Modified: dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
==============================================================================
--- dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog (original)
+++ dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog Wed Feb 1 07:34:47 2006
@@ -1,3 +1,10 @@
+kernel-patch-powerpc-2.6.8 (2.6.8-12sarge2) stable-security; urgency=high
+
+ * Build against kernel-tree-2.6.8-16sarge1
+ * Add an ABI string to the package name
+
+ -- dann frazier <dannf at debian.org> Wed, 1 Feb 2006 00:07:01 -0700
+
kernel-patch-powerpc-2.6.8 (2.6.8-12sarge1) stable-security; urgency=low
* Build against kernel-tree-2.6.8-16sarge1
Modified: dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
==============================================================================
--- dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control (original)
+++ dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control Wed Feb 1 07:34:47 2006
@@ -1,135 +1,135 @@
Source: kernel-patch-powerpc-2.6.8
Section: devel
Priority: optional
-Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.8-16sarge1, m4
+Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.8-16sarge2, m4
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
Uploaders: Sven Luther <luther at debian.org>
Standards-Version: 3.6.1
-Package: kernel-headers-2.6.8
+Package: kernel-headers-2.6.8-1
Architecture: powerpc
-Description: header files for the Linux kernel version 2.6.8
+Description: header files for the Linux kernel version 2.6.8-1
.
- This package provides kernel headers files for 2.6.8.
+ This package provides kernel headers files for 2.6.8-1.
-Package: kernel-build-2.6.8-power3
+Package: kernel-build-2.6.8-1-power3
Architecture: powerpc
-Depends: kernel-headers-2.6.8
-Description: build infrastructure for kernel version 2.6.8-power3
+Depends: kernel-headers-2.6.8-1
+Description: build infrastructure for kernel version 2.6.8-1-power3
.
- Together with kernel-headers-2.6.8, this package provides the
- infrastructure for building additional modules for 2.6.8-power3.
+ Together with kernel-headers-2.6.8-1, this package provides the
+ infrastructure for building additional modules for 2.6.8-1-power3.
-Package: kernel-image-2.6.8-power3
+Package: kernel-image-2.6.8-1-power3
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.8-power3
+Description: Linux kernel image for 2.6.8-1-power3
.
- This package contains the Linux kernel for version 2.6.8-power3.
+ This package contains the Linux kernel for version 2.6.8-1-power3.
It is intended to be run on PowerPC machines with a single Power3
processor.
-Package: kernel-build-2.6.8-power3-smp
+Package: kernel-build-2.6.8-1-power3-smp
Architecture: powerpc
-Depends: kernel-headers-2.6.8
-Description: build infrastructure for kernel version 2.6.8-power3-smp
+Depends: kernel-headers-2.6.8-1
+Description: build infrastructure for kernel version 2.6.8-1-power3-smp
.
- Together with kernel-headers-2.6.8, this package provides the
- infrastructure for building additional modules for 2.6.8-power3-smp.
+ Together with kernel-headers-2.6.8-1, this package provides the
+ infrastructure for building additional modules for 2.6.8-1-power3-smp.
-Package: kernel-image-2.6.8-power3-smp
+Package: kernel-image-2.6.8-1-power3-smp
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.8-power3-smp
+Description: Linux kernel image for 2.6.8-1-power3-smp
.
- This package contains the Linux kernel for version 2.6.8-power3-smp.
+ This package contains the Linux kernel for version 2.6.8-1-power3-smp.
It is intended to be run on PowerPC machines with two or more
Power3 processors, like some IBM RS/6000 boxen.
-Package: kernel-build-2.6.8-power4
+Package: kernel-build-2.6.8-1-power4
Architecture: powerpc
-Depends: kernel-headers-2.6.8
-Description: build infrastructure for kernel version 2.6.8-power4
+Depends: kernel-headers-2.6.8-1
+Description: build infrastructure for kernel version 2.6.8-1-power4
.
- Together with kernel-headers-2.6.8, this package provides the
- infrastructure for building additional modules for 2.6.8-power4.
+ Together with kernel-headers-2.6.8-1, this package provides the
+ infrastructure for building additional modules for 2.6.8-1-power4.
-Package: kernel-image-2.6.8-power4
+Package: kernel-image-2.6.8-1-power4
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.8-power4
+Description: Linux kernel image for 2.6.8-1-power4
.
- This package contains the Linux kernel for version 2.6.8-power4.
+ This package contains the Linux kernel for version 2.6.8-1-power4.
It is intended to be run on PowerPC machines with a single Power4
processor, the most prominent example being the G5 PowerMac by Apple.
-Package: kernel-build-2.6.8-power4-smp
+Package: kernel-build-2.6.8-1-power4-smp
Architecture: powerpc
-Depends: kernel-headers-2.6.8
-Description: build infrastructure for kernel version 2.6.8-power4-smp
+Depends: kernel-headers-2.6.8-1
+Description: build infrastructure for kernel version 2.6.8-1-power4-smp
.
- Together with kernel-headers-2.6.8, this package provides the
- infrastructure for building additional modules for 2.6.8-power4-smp.
+ Together with kernel-headers-2.6.8-1, this package provides the
+ infrastructure for building additional modules for 2.6.8-1-power4-smp.
-Package: kernel-image-2.6.8-power4-smp
+Package: kernel-image-2.6.8-1-power4-smp
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.8-power4-smp
+Description: Linux kernel image for 2.6.8-1-power4-smp
.
- This package contains the Linux kernel for version 2.6.8-power4-smp.
+ This package contains the Linux kernel for version 2.6.8-1-power4-smp.
It is intended to be run on PowerPC machines with two or more Power4
processors. This setup can be found in Apple's dual G5 PowerMacs, as
well as in a number of IBM RS/6000 boxen, such as the iSeries and
pSeries machines.
-Package: kernel-build-2.6.8-powerpc
+Package: kernel-build-2.6.8-1-powerpc
Architecture: powerpc
-Depends: kernel-headers-2.6.8
-Description: build infrastructure for kernel version 2.6.8-powerpc
+Depends: kernel-headers-2.6.8-1
+Description: build infrastructure for kernel version 2.6.8-1-powerpc
.
- Together with kernel-headers-2.6.8, this package provides the
- infrastructure for building additional modules for 2.6.8-powerpc.
+ Together with kernel-headers-2.6.8-1, this package provides the
+ infrastructure for building additional modules for 2.6.8-1-powerpc.
-Package: kernel-image-2.6.8-powerpc
+Package: kernel-image-2.6.8-1-powerpc
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.8-powerpc
+Description: Linux kernel image for 2.6.8-1-powerpc
.
- This package contains the Linux kernel for version 2.6.8-powerpc.
+ This package contains the Linux kernel for version 2.6.8-1-powerpc.
It is intended to be run on single-processor PowerPC machines,
including all G3 and G4 models by Apple, as well as older PowerMacs.
-Package: kernel-build-2.6.8-powerpc-smp
+Package: kernel-build-2.6.8-1-powerpc-smp
Architecture: powerpc
-Depends: kernel-headers-2.6.8
-Description: build infrastructure for kernel version 2.6.8-powerpc-smp
+Depends: kernel-headers-2.6.8-1
+Description: build infrastructure for kernel version 2.6.8-1-powerpc-smp
.
- Together with kernel-headers-2.6.8, this package provides the
- infrastructure for building additional modules for 2.6.8-powerpc-smp.
+ Together with kernel-headers-2.6.8-1, this package provides the
+ infrastructure for building additional modules for 2.6.8-1-powerpc-smp.
-Package: kernel-image-2.6.8-powerpc-smp
+Package: kernel-image-2.6.8-1-powerpc-smp
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for 2.6.8-powerpc-smp
+Description: Linux kernel image for 2.6.8-1-powerpc-smp
.
- This package contains the Linux kernel for version 2.6.8-powerpc-smp.
+ This package contains the Linux kernel for version 2.6.8-1-powerpc-smp.
It is intended to be run on most dual-processor PowerPC machines,
most notably the Dual G4 PowerMacs by Apple.
Modified: dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-dummy.m4
==============================================================================
--- dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-dummy.m4 (original)
+++ dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-dummy.m4 Wed Feb 1 07:34:47 2006
@@ -5,14 +5,14 @@
Uploaders: Sven Luther <luther at debian.org>
Standards-Version: 3.6.1
-Package: kernel-image-M4KERNEL-M4FLAVOUR
+Package: kernel-image-M4KERNEL-M4ABINAME-M4FLAVOUR
Architecture: powerpc
Section: base
Provides: kernel-image, kernel-image-2.6
Depends: initrd-tools, coreutils | fileutils (>=4.0), mkvmlinuz
-Description: intermediate Linux kernel binary image for M4KERNEL-M4FLAVOUR
+Description: intermediate Linux kernel binary image for M4KERNEL-M4ABINAME-M4FLAVOUR
.
- This package contains the Linux kernel for version M4KERNEL-M4FLAVOUR,
+ This package contains the Linux kernel for version M4KERNEL-M4ABINAME-M4FLAVOUR,
the corresponding System.map file, and the modules built by the packager.
.
It is created during the build of other PowerPC kernel-image packages
Modified: dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4
==============================================================================
--- dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4 (original)
+++ dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4 Wed Feb 1 07:34:47 2006
@@ -1,18 +1,18 @@
-Package: kernel-build-M4KERNEL-M4FLAVOUR
+Package: kernel-build-M4KERNEL-M4ABINAME-M4FLAVOUR
Architecture: powerpc
-Depends: kernel-headers-M4KERNEL
-Description: build infrastructure for kernel version M4KERNEL-M4FLAVOUR
+Depends: kernel-headers-M4KERNEL-M4ABINAME
+Description: build infrastructure for kernel version M4KERNEL-M4ABINAME-M4FLAVOUR
.
- Together with kernel-headers-M4KERNEL, this package provides the
- infrastructure for building additional modules for M4KERNEL-M4FLAVOUR.
+ Together with kernel-headers-M4KERNEL-M4ABINAME, this package provides the
+ infrastructure for building additional modules for M4KERNEL-M4ABINAME-M4FLAVOUR.
-Package: kernel-image-M4KERNEL-M4FLAVOUR
+Package: kernel-image-M4KERNEL-M4ABINAME-M4FLAVOUR
Section: base
Architecture: powerpc
Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
Recommends: hotplug
Provides: kernel-image, kernel-image-2.6
-Description: Linux kernel image for M4KERNEL-M4FLAVOUR
+Description: Linux kernel image for M4KERNEL-M4ABINAME-M4FLAVOUR
.
- This package contains the Linux kernel for version M4KERNEL-M4FLAVOUR.
+ This package contains the Linux kernel for version M4KERNEL-M4ABINAME-M4FLAVOUR.
Modified: dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-official.m4
==============================================================================
--- dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-official.m4 (original)
+++ dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-official.m4 Wed Feb 1 07:34:47 2006
@@ -2,7 +2,7 @@
Package: kernel-image-M4FLAVOUR
Section: base
Architecture: powerpc
-Depends: kernel-image-M4KERNEL-M4FLAVOUR
+Depends: kernel-image-M4KERNEL-M4ABINAME-M4FLAVOUR
Description: Linux kernel image for M4FLAVOUR
.
This is a dummy package that will always depend on the latest release
Modified: dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub
==============================================================================
--- dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub (original)
+++ dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub Wed Feb 1 07:34:47 2006
@@ -6,8 +6,8 @@
Uploaders: Sven Luther <luther at debian.org>
Standards-Version: 3.6.1
-Package: kernel-headers-M4KERNEL
+Package: kernel-headers-M4KERNEL-M4ABINAME
Architecture: powerpc
-Description: header files for the Linux kernel version M4KERNEL
+Description: header files for the Linux kernel version M4KERNEL-M4ABINAME
.
- This package provides kernel headers files for M4KERNEL.
+ This package provides kernel headers files for M4KERNEL-M4ABINAME.
Modified: dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
==============================================================================
--- dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules (original)
+++ dists/sarge-security/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules Wed Feb 1 07:34:47 2006
@@ -11,7 +11,7 @@
OFFICIAL_VERSION = No
# This is the kernel-tree version we build against
-ktver = 13
+ktver = 16sarge2
# set the build architecture if necessary
DEB_HOST_ARCH ?= $(shell dpkg --print-architecture)
@@ -23,9 +23,10 @@
kernel := $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)-.*).*$$/\1/')
debian := $(shell head -1 debian/changelog | sed 's/^.*(.*-\(.*\)).*$$/\1/')
version := $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)).*$$/\1/')
+abiname := $(shell cat debian/abiname)
# some files in debian/ get version numbers and stuff updated on the fly
-M4 = m4 -DM4VERSION="$(version)" -DM4KERNEL="$(kernel)" -DM4FLAVOUR="$(flavour)" -DM4TREE="$(kernel)-$(ktver)"
+M4 = m4 -DM4VERSION="$(version)" -DM4KERNEL="$(kernel)" -DM4FLAVOUR="$(flavour)" -DM4TREE="$(kernel)-$(ktver)" -DM4ABINAME="$(abiname)"
#M4 = sed -e 's%M4VERSION%$(version)%g' -e 's%M4KERNEL%$(kernel)%g' -e 's%M4FLAVOUR%$(flavour)%g' -e 's%M4TREE%$(kernel)-$(ktver)'
debian/%: debian/%.m4
$(M4) $< > $@
@@ -38,19 +39,19 @@
TMP ?= $(CURDIR)/tmp
KSOURCE = $(TMP)/kernel-source-$(kernel)
KFLAVOUR = $(TMP)/kernel-source-$(kernel)-$(flavour)
-KDUMMY = $(TMP)/kernel-image-$(kernel)-$(flavour)_$(version)_powerpc.deb
-KHEADERS = $(TMP)/kernel-headers-$(kernel)_$(version)_powerpc.deb
+KDUMMY = $(TMP)/kernel-image-$(kernel)-$(abiname)-$(flavour)_$(version)_powerpc.deb
+KHEADERS = $(TMP)/kernel-headers-$(kernel)-$(abiname)_$(version)_powerpc.deb
# install locations
-KBUILD = $(CURDIR)/debian/kernel-build-$(kernel)-$(flavour)
-KBUILDDOC = $(KBUILD)/usr/share/doc/kernel-build-$(kernel)-$(flavour)
-KSRC = $(KBUILD)/usr/src/kernel-build-$(kernel)-$(flavour)
-KIMAGE = $(CURDIR)/debian/kernel-image-$(kernel)-$(flavour)
-KIMAGEDOC = $(KIMAGE)/usr/share/doc/kernel-image-$(kernel)-$(flavour)
-KLIB = $(KIMAGE)/usr/lib/kernel-image-$(kernel)-$(flavour)
+KBUILD = $(CURDIR)/debian/kernel-build-$(kernel)-$(abiname)-$(flavour)
+KBUILDDOC = $(KBUILD)/usr/share/doc/kernel-build-$(kernel)-$(abiname)-$(flavour)
+KSRC = $(KBUILD)/usr/src/kernel-build-$(kernel)-$(abiname)-$(flavour)
+KIMAGE = $(CURDIR)/debian/kernel-image-$(kernel)-$(abiname)-$(flavour)
+KIMAGEDOC = $(KIMAGE)/usr/share/doc/kernel-image-$(kernel)-$(abiname)-$(flavour)
+KLIB = $(KIMAGE)/usr/lib/kernel-image-$(kernel)-$(abiname)-$(flavour)
# environment for make-kpkg
-export APPEND_TO_VERSION=-$(flavour)
+export APPEND_TO_VERSION=-$(abiname)-$(flavour)
export PARALLEL_BUILD=-j2
export INITRD=Yes
export INITRD_OK=WeKnowWhatWeAreDoing
@@ -359,11 +360,11 @@
# change.
# slightly different m4 call, using a shell variable for the flavour
-M4CONTROL = m4 -DM4KERNEL=$(kernel) -DM4FLAVOUR=$$flavour -DM4TREE=$(kernel)-$(ktver)
+M4CONTROL = m4 -DM4KERNEL=$(kernel) -DM4FLAVOUR=$$flavour -DM4TREE=$(kernel)-$(ktver) -DM4ABINAME=$(abiname)
#M4CONTROL = sed -e 's%M4KERNEL%$(kernel)%g' -e 's%M4FLAVOUR%$$flavour%g' -e 's%M4TREE%$(kernel)-$(ktver)%g'
debian/control: \
-debian/changelog debian/flavours \
+debian/changelog debian/flavours debian/abiname \
$(foreach flavour,$(flavours), debian/flavour-$(flavour)) \
debian/control.stub debian/control-image.m4 debian/control-official.m4
More information about the Kernel-svn-changes
mailing list