r2703 - in trunk/kernel/s390: . kernel-image-2.6.11-s390 kernel-image-2.6.11-s390/config kernel-image-2.6.11-s390/debian
Bastian Blank
waldi@costa.debian.org
Mon, 14 Mar 2005 11:02:17 +0100
Author: waldi
Date: 2005-03-14 11:02:12 +0100 (Mon, 14 Mar 2005)
New Revision: 2703
Added:
trunk/kernel/s390/kernel-image-2.6.11-s390/
Removed:
trunk/kernel/s390/kernel-image-2.6.11-s390/diffs/
Modified:
trunk/kernel/s390/kernel-image-2.6.11-s390/config/s390
trunk/kernel/s390/kernel-image-2.6.11-s390/config/s390x
trunk/kernel/s390/kernel-image-2.6.11-s390/debian/changelog
trunk/kernel/s390/kernel-image-2.6.11-s390/debian/control
trunk/kernel/s390/kernel-image-2.6.11-s390/debian/rules
Log:
* .: Copy from 2.6.10.
* config/s390, config/s390x: Update.
* debian/changelog: Update.
* debian/control: Update, remove patch package.
* debian/rules: Remove patch support.
* diffs: Remove.
Copied: trunk/kernel/s390/kernel-image-2.6.11-s390 (from rev 2662, trunk/kernel/s390/kernel-image-2.6.10-s390)
Modified: trunk/kernel/s390/kernel-image-2.6.11-s390/config/s390
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.10-s390/config/s390 2005-03-09 16:48:45 UTC (rev 2662)
+++ trunk/kernel/s390/kernel-image-2.6.11-s390/config/s390 2005-03-14 10:02:12 UTC (rev 2703)
@@ -1,10 +1,11 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10-1-s390
-# Sat Jan 15 14:10:02 2005
+# Linux kernel version: 2.6.11-1-s390
+# Thu Mar 10 00:22:22 2005
#
CONFIG_MMU=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_S390=y
CONFIG_UID16=y
@@ -103,6 +104,7 @@
CONFIG_CMM=y
CONFIG_CMM_PROC=y
CONFIG_VIRT_TIMER=y
+# CONFIG_VIRT_CPU_ACCOUNTING is not set
CONFIG_APPLDATA_BASE=y
CONFIG_APPLDATA_MEM=m
CONFIG_APPLDATA_OS=m
@@ -147,6 +149,7 @@
#
# CONFIG_SCSI_SPI_ATTRS is not set
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
#
# SCSI low-level drivers
@@ -159,6 +162,7 @@
#
# Block devices
#
+# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
@@ -189,6 +193,7 @@
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
#
# Multi-device support (RAID and LVM)
@@ -374,7 +379,6 @@
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_TARGET_NETMAP is not set
# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_MANGLE=m
@@ -385,8 +389,6 @@
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
# CONFIG_IP_NF_RAW is not set
# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
#
# IPv6: Netfilter Configuration
@@ -449,7 +451,6 @@
# CONFIG_NET_PKTGEN is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_X_NET_DEVICE_SPECIFIC_EUI64=y
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
@@ -525,7 +526,12 @@
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
+
+#
+# XFS support
+#
CONFIG_XFS_FS=m
+CONFIG_XFS_EXPORT=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_QUOTA=y
# CONFIG_XFS_SECURITY is not set
@@ -727,10 +733,14 @@
# CONFIG_CRYPTO_TEST is not set
#
+# Hardware crypto devices
+#
+
+#
# Library routines
#
# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=m
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
Modified: trunk/kernel/s390/kernel-image-2.6.11-s390/config/s390x
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.10-s390/config/s390x 2005-03-09 16:48:45 UTC (rev 2662)
+++ trunk/kernel/s390/kernel-image-2.6.11-s390/config/s390x 2005-03-14 10:02:12 UTC (rev 2703)
@@ -1,10 +1,11 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10-1-s390x
-# Sat Jan 15 14:13:58 2005
+# Linux kernel version: 2.6.11-1-s390x
+# Thu Mar 10 00:23:20 2005
#
CONFIG_MMU=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_S390=y
#
@@ -104,6 +105,7 @@
CONFIG_CMM=y
CONFIG_CMM_PROC=y
CONFIG_VIRT_TIMER=y
+# CONFIG_VIRT_CPU_ACCOUNTING is not set
CONFIG_APPLDATA_BASE=y
CONFIG_APPLDATA_MEM=m
CONFIG_APPLDATA_OS=m
@@ -148,6 +150,7 @@
#
# CONFIG_SCSI_SPI_ATTRS is not set
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
#
# SCSI low-level drivers
@@ -160,6 +163,7 @@
#
# Block devices
#
+# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
@@ -188,6 +192,7 @@
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
#
# Multi-device support (RAID and LVM)
@@ -373,7 +378,6 @@
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_TARGET_NETMAP is not set
# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_MANGLE=m
@@ -384,8 +388,6 @@
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
# CONFIG_IP_NF_RAW is not set
# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
#
# IPv6: Netfilter Configuration
@@ -448,7 +450,6 @@
# CONFIG_NET_PKTGEN is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_X_NET_DEVICE_SPECIFIC_EUI64=y
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
@@ -524,7 +525,12 @@
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
+
+#
+# XFS support
+#
CONFIG_XFS_FS=m
+CONFIG_XFS_EXPORT=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_QUOTA=y
# CONFIG_XFS_SECURITY is not set
@@ -726,10 +732,14 @@
# CONFIG_CRYPTO_TEST is not set
#
+# Hardware crypto devices
+#
+
+#
# Library routines
#
# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=m
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
Modified: trunk/kernel/s390/kernel-image-2.6.11-s390/debian/changelog
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.10-s390/debian/changelog 2005-03-09 16:48:45 UTC (rev 2662)
+++ trunk/kernel/s390/kernel-image-2.6.11-s390/debian/changelog 2005-03-14 10:02:12 UTC (rev 2703)
@@ -1,3 +1,11 @@
+kernel-image-2.6.11-s390 (2.6.11-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Use kernel-tree-2.6.11-1.
+ - Remove patches.
+
+ -- Bastian Blank <waldi@debian.org> Thu, 10 Mar 2005 00:08:39 +0100
+
kernel-image-2.6.10-s390 (2.6.10-2) unstable; urgency=low
* diffs:
Modified: trunk/kernel/s390/kernel-image-2.6.11-s390/debian/control
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.10-s390/debian/control 2005-03-09 16:48:45 UTC (rev 2662)
+++ trunk/kernel/s390/kernel-image-2.6.11-s390/debian/control 2005-03-14 10:02:12 UTC (rev 2703)
@@ -1,44 +1,36 @@
-Source: kernel-image-2.6.10-s390
+Source: kernel-image-2.6.11-s390
Section: devel
Priority: optional
Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
-Uploaders: Bastian Blank <waldi@debian.org>, Jochen Röhrig <jr@debian.org>
-Standards-Version: 3.5.6
-Build-Depends: debhelper (>> 4.0.0), module-init-tools, kernel-tree-2.6.10-4, kernel-package (>= 8.084)
+Uploaders: Bastian Blank <waldi@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 4.0.0), module-init-tools, kernel-tree-2.6.11-1, kernel-package (>= 8.084)
-Package: kernel-patch-2.6.10-s390
-Architecture: all
-Depends: ${kpatch:Depends}
-Recommends: kernel-source-2.6.10, kernel-package
-Description: Diffs to the Linux kernel source 2.6.10 for IBM S/390 and zSeries
- Patches for the Linux kernel for the S/390 and zSeries architecture.
- This package includes the patch for the Linux kernel version 2.6.10.
-
-Package: kernel-headers-2.6.10-1-s390
+Package: kernel-headers-2.6.11-1-s390
Architecture: s390
Section: devel
Priority: optional
-Provides: kernel-headers, kernel-headers-2.6, kernel-headers-2.6.10, kernel-headers-2.6.10-1
-Description: Header files related to Linux kernel version 2.6.10 on IBM S/390
- This package provides kernel header files for version 2.6.10 on IBM S/390.
+Provides: kernel-headers, kernel-headers-2.6, kernel-headers-2.6.11, kernel-headers-2.6.11-1
+Description: Header files related to Linux kernel version 2.6.11 on IBM S/390
+ This package provides kernel header files for version 2.6.11 on IBM S/390.
-Package: kernel-headers-2.6.10-1-s390x
+Package: kernel-headers-2.6.11-1-s390x
Architecture: s390
Section: devel
Priority: optional
-Provides: kernel-headers, kernel-headers-2.6, kernel-headers-2.6.10, kernel-headers-2.6.10-1
-Description: Header files related to Linux kernel version 2.6.10 on IBM zSeries
- This package provides kernel header files for version 2.6.10 on IBM zSeries.
+Provides: kernel-headers, kernel-headers-2.6, kernel-headers-2.6.11, kernel-headers-2.6.11-1
+Description: Header files related to Linux kernel version 2.6.11 on IBM zSeries
+ This package provides kernel header files for version 2.6.11 on IBM zSeries.
-Package: kernel-image-2.6.10-1-s390
+Package: kernel-image-2.6.11-1-s390
Architecture: s390
Section: base
Priority: optional
Provides: kernel-image, kernel-image-2.6
Depends: module-init-tools, initrd-tools (>= 0.1.73)
-Suggests: s390-tools (>= 1.3.0), kernel-doc-2.6.10
-Description: Linux kernel image for kernel version 2.6.10 on IBM S/390
- This package contains the Linux kernel image for kernel version 2.6.10
+Suggests: s390-tools (>= 1.3.0), kernel-doc-2.6.11
+Description: Linux kernel image for kernel version 2.6.11 on IBM S/390
+ This package contains the Linux kernel image for kernel version 2.6.11
on IBM S/390 and zSeries, the corresponding System.map file, and the
modules built by the packager. It also contains scripts that try to
ensure that the system is not left in an unbootable state after an
@@ -50,26 +42,26 @@
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
-Package: kernel-image-2.6.10-1-s390-tape
+Package: kernel-image-2.6.11-1-s390-tape
Architecture: s390
Section: base
Priority: extra
-Depends: kernel-image-2.6.10-1-s390 (= ${Source-Version})
-Description: Linux kernel image for kernel version 2.6.10 on IBM S/390
- This package contains the Linux kernel image for kernel version 2.6.10
+Depends: kernel-image-2.6.11-1-s390 (= ${Source-Version})
+Description: Linux kernel image for kernel version 2.6.11 on IBM S/390
+ This package contains the Linux kernel image for kernel version 2.6.11
on IBM S/390 and zSeries.
.
This kernel has support to IPL (boot) from a tape.
-Package: kernel-image-2.6.10-1-s390x
+Package: kernel-image-2.6.11-1-s390x
Architecture: s390
Section: base
Priority: optional
Provides: kernel-image, kernel-image-2.6
Depends: module-init-tools, initrd-tools (>= 0.1.73)
-Suggests: s390-tools (>= 1.3.0), kernel-doc-2.6.10
-Description: Linux kernel image for kernel version 2.6.10 on IBM zSeries.
- This package contains the Linux kernel image for kernel version 2.6.10
+Suggests: s390-tools (>= 1.3.0), kernel-doc-2.6.11
+Description: Linux kernel image for kernel version 2.6.11 on IBM zSeries.
+ This package contains the Linux kernel image for kernel version 2.6.11
on IBM zSeries, the corresponding System.map file, and the modules
built by the packager. It also contains scripts that try to ensure that
the system is not left in a unbootable state after an update.
Modified: trunk/kernel/s390/kernel-image-2.6.11-s390/debian/rules
===================================================================
--- trunk/kernel/s390/kernel-image-2.6.10-s390/debian/rules 2005-03-09 16:48:45 UTC (rev 2662)
+++ trunk/kernel/s390/kernel-image-2.6.11-s390/debian/rules 2005-03-14 10:02:12 UTC (rev 2703)
@@ -9,7 +9,6 @@
version := $(word 1,$(debian_version_temp))
debian_version_number := $(word 2,$(debian_version_temp))
debian_version := $(version)$(debian_version_number)
-patch := s390-$(shell echo $(version) | sed -e 's,\.,_,g')
kernel_tree_version := $(shell sed -n 's/.*kernel-tree-\([^,]*\).*/\1/p; t e; b; :e q' debian/control )
@@ -25,30 +24,11 @@
touch $@
-patch: patch-stamp
-patch-stamp: unpack-stamp
- dh_testdir
-
- @-rm -rf patch*
- mkdir patch
- cp -al kernel-source-$(version) patch/kernel-source-$(version)
- cp -al kernel-source-$(version) patch/kernel-source-$(version).orig
-
- @cd patch/kernel-source-$(version); \
- for patch in $(wildcard diffs/*.diff); do \
- echo "Applying patch $$patch ..."; \
- patch --no-backup-if-mismatch -p0 < ../../$$patch || exit 1; \
- done
-
- -cd patch; diff -urN kernel-source-$(version).orig kernel-source-$(version) > ../linux-$(version)-s390.debian.diff
-
- touch $@
-
tree: tree-stamp
-tree-stamp: patch-stamp
+tree-stamp: unpack-stamp
@-rm -rf build
- cp -al patch/kernel-source-$(version) build
+ cp -al kernel-source-$(version) build
mkdir build/debian
cp debian/changelog debian/control debian/copyright build/debian
echo "official" > build/debian/official
@@ -100,8 +80,7 @@
dh_testroot
rm -f *-stamp
- rm -rf kernel* build* install* patch*
- rm -f *.diff
+ rm -rf kernel* build* install*
dh_clean
@@ -112,19 +91,7 @@
# Build architecture-independent files here.
binary-indep: install
- dh_testdir
- dh_testroot
- dh_installkpatches -i
- dh_installchangelogs -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
# Build architecture-dependent files here.
binary-arch: install
dh_testdir