Author: horms
Date: Thu Feb 9 07:15:18 2006
New Revision: 5767
Modified:
dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/changelog
dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/rules
dists/trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog
dists/trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/rules
dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules
dists/trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog
dists/trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control
Log:
Build against kernel-source-2.4.27-13
Use --stem kernel, as the default is now kernel
(Not all changes apply to all arches, as some were already done)
Modified: dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/changelog
==============================================================================
--- dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/changelog
(original)
+++ dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/changelog
Thu Feb 9 07:15:18 2006
@@ -6,8 +6,9 @@
*** and CAN-2005-0449 ***
* Build against kernel-tree-2.4.27-13
+ * Call make-kpkg with --stem kernel, as the default is now linux
- -- Simon Horman <[EMAIL PROTECTED]> Wed, 8 Feb 2006 20:35:31 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Thu, 9 Feb 2006 16:09:40 +0900
kernel-patch-powerpc-2.4.27 (2.4.27-12) unstable; urgency=low
Modified: dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/rules
==============================================================================
--- dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/rules
(original)
+++ dists/trunk/arch/powerpc/kernel-patch-powerpc-2.4.27/debian/rules Thu Feb
9 07:15:18 2006
@@ -69,7 +69,7 @@
export CONCURRENCY_LEVEL=8
# Don't know why i have to force this here, apparently make-kpkg doesn't
# get passed the -r command of the dpkg-buildpackage invocation :/
-MAKEKPKG=make-kpkg --rootcmd fakeroot
+MAKEKPKG=make-kpkg --stem kernel --rootcmd fakeroot
# the configure target is responsible for setting up the build arena,
# i.e. unpacking the Debian kernel source, applying the PowerPC patch,
Modified:
dists/trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog
==============================================================================
---
dists/trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog
(original)
+++
dists/trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog
Thu Feb 9 07:15:18 2006
@@ -5,8 +5,9 @@
* Build against kernel-tree-2.4.27-13
* Increment ABI to -3
+ * Call make-kpkg with --stem kernel, as the default is now linux
- -- Simon Horman <[EMAIL PROTECTED]> Wed, 8 Feb 2006 19:29:29 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Thu, 9 Feb 2006 16:02:47 +0900
kernel-image-2.4.27-i386 (2.4.27-12) unstable; urgency=low
Modified:
dists/trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/rules
==============================================================================
--- dists/trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/rules
(original)
+++ dists/trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/rules
Thu Feb 9 07:15:18 2006
@@ -26,6 +26,8 @@
appvan := --append_to_version $(debnum)
endif
+make-kpkg := make-kpkg --stem kernel
+
flavours := $(shell \
find config -maxdepth 1 -type f ! -name default -printf '%f\n' \
)
@@ -71,7 +73,7 @@
PATH=$$PWD/bin:$$PATH; \
for i in $(flavours); do \
cd build-$$i; \
- make-kpkg --append_to_version $(debnum)-$$i build; \
+ $(make-kpkg) --append_to_version $(debnum)-$$i build; \
cd ..; \
done
@@ -100,13 +102,13 @@
cd kernel-source-$(version); \
HEADER_CLEAN_HOOK=$(CURDIR)/header-install.out \
- make-kpkg $(appvan) kernel-headers
+ $(make-kpkg) $(appvan) kernel-headers
mv kernel-source-$(version)/debian/files debian
for i in $(flavours); do \
cp -a build-$$i install-$$i; \
cd install-$$i; \
- make-kpkg --append_to_version $(debnum)-$$i \
+ $(make-kpkg) --append_to_version $(debnum)-$$i \
--initrd kernel-image; \
cd ..; \
cat install-$$i/debian/files >> debian/files; \
Modified:
dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
==============================================================================
---
dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
(original)
+++
dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
Thu Feb 9 07:15:18 2006
@@ -1,3 +1,12 @@
+kernel-patch-2.4.27-mips (2.4.27-13.040815-1) UNRELEASED; urgency=low
+
+ * Call make-kpkg with --stem kernel, as the default is now linux
+ * Uptade to ebian kernel source 2.4.27-13
+ * Build dependancy on kernel-tree-2.4.27-N instead of
+ a versioned build dependancy on kernel-source-2.4.27
+
+ -- Simon Horman <[EMAIL PROTECTED]> Thu, 9 Feb 2006 15:52:30 +0900
+
kernel-patch-2.4.27-mips (2.4.27-11.040815-3) unstable; urgency=medium
* Update to debian kernel source 2.4.27-12 for security fixes.
Modified:
dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
==============================================================================
--- dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
(original)
+++ dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
Thu Feb 9 07:15:18 2006
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian kernel team <[email protected]>
Uploaders: Guido Guenther <[EMAIL PROTECTED]>, Karsten Merker <[EMAIL
PROTECTED]>, Thiemo Seufer <[EMAIL PROTECTED]>
-Build-Depends: kernel-source-2.4.27 (>= 2.4.27-12), kernel-package, debhelper
(>=4.1.0), modutils, console-tools, dpatch, bzip2, gcc-3.3
+Build-Depends: kernel-tree-2.4.27-13, kernel-package, debhelper (>=4.1.0),
modutils, console-tools, dpatch, bzip2, gcc-3.3
Standards-Version: 3.6.1
Package: kernel-headers-2.4.27
Modified:
dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules
==============================================================================
--- dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules
(original)
+++ dists/trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules
Thu Feb 9 07:15:18 2006
@@ -52,6 +52,8 @@
NUM_CPUS := $(shell grep '^processor[:space:]*' /proc/cpuinfo | wc -l)
+make-kpkg := make-kpkg --stem kernel
+
source-unpack-stamp:
rm -rf build-tmp
mkdir build-tmp
@@ -81,7 +83,7 @@
dh_testdir
# build the mips-tools
- cd $(kdir) && make-kpkg clean && make-kpkg debian
+ cd $(kdir) && $(make-kpkg) clean && $(make-kpkg) debian
cd $(kdir)/arch/mips/boot \
&& $(CC) $(MT_CFLAGS) -o elf2ecoff elf2ecoff.c
@@ -98,10 +100,10 @@
dh_testdir
dh_testroot
ifneq ($(subarches),)
- cd $(kdir) && make-kpkg clean && make-kpkg debian
+ cd $(kdir) && $(make-kpkg) clean && $(make-kpkg) debian
cp debian/changelog debian/control $(kdir)/debian/
echo official > $(kdir)/debian/official
- cd $(kdir) && MAKEFLAGS="CC=$(CC)" make-kpkg kernel_headers
+ cd $(kdir) && MAKEFLAGS="CC=$(CC)" $(make-kpkg) kernel_headers
cp build-tmp/kernel-headers-$(basever)_$(debver)_$(arch).deb ..
endif
@@ -114,11 +116,11 @@
# Messes up version detection with kernel-package - but that's good
$(foreach sub,$(subarches), \
echo "Building subarch $(sub)" && \
- ( cd $(kdir) && make-kpkg clean && make-kpkg debian ) && \
+ ( cd $(kdir) && $(make-kpkg) clean && $(make-kpkg) debian ) && \
cp debian/changelog debian/control $(kdir)/debian/ && \
echo official > $(kdir)/debian/official && \
cp config/$(arch)/$(sub) $(kdir)/.config && \
- ( cd $(kdir) && CONCURRENCY_LEVEL=$(NUM_CPUS)
MAKEFLAGS="CC=$(CC)" make-kpkg \
+ ( cd $(kdir) && CONCURRENCY_LEVEL=$(NUM_CPUS)
MAKEFLAGS="CC=$(CC)" $(make-kpkg) \
--subarch $(sub) --append-to-version=-$(sub) kernel_image )
&& \
cp
build-tmp/kernel-image-$(basever)-$(sub)_$(debver)_$(arch).deb .. && ) :
endif
Modified:
dists/trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog
==============================================================================
---
dists/trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog
(original)
+++
dists/trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog
Thu Feb 9 07:15:18 2006
@@ -1,3 +1,9 @@
+kernel-image-2.4.27-sparc (2.4.27-13) UNRELEASED; urgency=low
+
+ * Call make-kpkg with --stem kernel, as the default is now linux
+
+ -- Simon Horman <[EMAIL PROTECTED]> Thu, 9 Feb 2006 16:12:13 +0900
+
kernel-image-2.4.27-sparc (2.4.27-12) unstable; urgency=low
* [ Simon Horman ]
Modified:
dists/trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control
==============================================================================
---
dists/trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control
(original)
+++
dists/trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control
Thu Feb 9 07:15:18 2006
@@ -4,7 +4,7 @@
Maintainer: Debian Kernel Team <[email protected]>
Uploaders: Rob Radez <[EMAIL PROTECTED]>, Joshua Kwan <[EMAIL PROTECTED]>,
Andres Salomon <[EMAIL PROTECTED]>
Standards-Version: 3.6.1.0
-Build-Depends: gcc-3.3 (>= 1:3.3), kernel-tree-2.4.27-12, debhelper (>= 4),
kernel-package, sparc-utils, modutils
+Build-Depends: gcc-3.3 (>= 1:3.3), kernel-tree-2.4.27-13, debhelper (>= 4),
kernel-package, sparc-utils, modutils
Package: kernel-build-2.4.27-2
Architecture: sparc
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
