Author: waldi
Date: Thu Sep 21 16:11:51 2006
New Revision: 7472
Modified:
dists/trunk/linux-2.6/debian/arch/amd64/xen/defines
dists/trunk/linux-2.6/debian/arch/defines
dists/trunk/linux-2.6/debian/arch/i386/xen/defines
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
dists/trunk/linux-2.6/debian/rules.real
Log:
Merge /dists/sid/linux-2.6.
Modified: dists/trunk/linux-2.6/debian/arch/amd64/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/xen/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen/defines Thu Sep 21 16:11:51 2006
@@ -5,6 +5,7 @@
[image]
configs: amd64/xen/config _xen/config
initramfs-generators: initramfs-tools
+suggests: grub (>= 0.97-16)
type: plain-xen
[xen]
Modified: dists/trunk/linux-2.6/debian/arch/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/defines Thu Sep 21 16:11:51 2006
@@ -23,7 +23,8 @@
type: kernel-package
[xen]
-version: 3.0-unstable-1
+versions:
+ 3.0-unstable-1
[commands-image-initramfs-generators]
initramfs-tools: mkinitramfs-kpkg
Modified: dists/trunk/linux-2.6/debian/arch/i386/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/xen/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/xen/defines Thu Sep 21 16:11:51 2006
@@ -7,6 +7,7 @@
configs: i386/xen/config _xen/config
initramfs-generators: initramfs-tools
recommends: libc6-xen
+suggests: grub (>= 0.97-16)
type: plain-xen
[xen]
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Thu Sep 21 16:11:51 2006
@@ -131,9 +131,13 @@
elif vars['type'] == 'plain-xen':
image = image_type_modulesextra
config_entry_xen = self.config.merge('xen', arch, subarch, flavour)
- for i, j in config_entry_xen.iteritems():
- vars['xen-%s' % i] = j
-
packages_dummy.extend(self.process_packages(self.templates['control.xen-linux-system'],
vars))
+ p =
self.process_packages(self.templates['control.xen-linux-system'], vars)
+ l = package_relation_group()
+ for version in config_entry_xen['versions']:
+ l.append("xen-hypervisor-%s-%s" % (version,
config_entry_xen['flavour']))
+ makeflags['XEN_VERSIONS'] = ' '.join(config_entry_xen['versions'])
+ p[0]['Depends'].append(l)
+ packages_dummy.extend(p)
else:
image = image_type_modulesinline
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Thu Sep 21 16:11:51 2006
@@ -40,7 +40,60 @@
-- Sven Luther <[EMAIL PROTECTED]> Wed, 20 Sep 2006 19:00:51 +0200
-linux-2.6 (2.6.17-8) UNRELEASED; urgency=low
+linux-2.6 (2.6.17-9) unstable; urgency=medium
+
+ [ Bastian Blank ]
+ * Update vserver patch to 2.0.2.
+ - Fix possible priviledge escalation in remount code. (CVE-2006-4243)
+
+ [ Frederik Schüler ]
+ * Add stable release 2.5.17.12:
+ - sky2: version 1.6.1
+ - sky2: fix fiber support
+ - sky2: MSI test timing
+ - sky2: use dev_alloc_skb for receive buffers
+ - sky2: clear status IRQ after empty
+ - sky2: accept flow control
+ - dm: Fix deadlock under high i/o load in raid1 setup.
+ - Remove redundant up() in stop_machine()
+ - Missing PCI id update for VIA IDE
+ - PKTGEN: Fix oops when used with balance-tlb bonding
+ - PKTGEN: Make sure skb->{nh,h} are initialized in fill_packet_ipv6() too.
+ - Silent data corruption caused by XPC
+ - uhci-hcd: fix list access bug
+ - binfmt_elf: fix checks for bad address
+ - [s390] bug in futex unqueue_me
+ - fcntl(F_SETSIG) fix
+ - IPV6 OOPS'er triggerable by any user
+ - SCTP: Fix sctp_primitive_ABORT() call in sctp_close().
+ - SPARC64: Fix X server crashes on sparc64
+ - TG3: Disable TSO by default
+ - dm: mirror sector offset fix
+ - dm: fix block device initialisation
+ - dm: add module ref counting
+ - dm: fix mapped device ref counting
+ - dm: add DMF_FREEING
+ - dm: change minor_lock to spinlock
+ - dm: move idr_pre_get
+ - dm: fix idr minor allocation
+ - dm snapshot: unify chunk_size
+ - Have ext2 reject file handles with bad inode numbers early.
+ - Allow per-route window scale limiting
+ - bridge-netfilter: don't overwrite memory outside of skb
+ - fix compilation error on IA64
+ - Fix output framentation of paged-skbs
+ - spectrum_cs: Fix firmware uploading errors
+ - TEXTSEARCH: Fix Boyer Moore initialization bug
+ * Add stable release 2.6.17.13:
+ - lib: add idr_replace
+ - pci_ids.h: add some VIA IDE identifiers
+ * Remove patches merged upstream:
+ - s390-kernel-futex-barrier.patch
+ * Unpatch ia64-mman.h-fix.patch
+
+ -- Bastian Blank <[EMAIL PROTECTED]> Wed, 13 Sep 2006 14:54:14 +0200
+
+linux-2.6 (2.6.17-8) unstable; urgency=low
[ Martin Michlmayr ]
* arm/ixp4xx: Enable CONFIG_W1.
@@ -51,7 +104,22 @@
Updates to patch_sigmatel.c to add x86 mac-mini sound support
Thanks to Matt Kraai. (closes: #384972)
- -- dann frazier <[EMAIL PROTECTED]> Tue, 29 Aug 2006 00:06:48 -0600
+ [ Kyle McMartin ]
+ * hppa: Re-enable pa8800 fixing patches from James Bottomley.
+ Pulled fresh from parisc-linux git tree.
+ * ia64: Pull in compile-failure fix from Christian Cotte-Barrot.
+ Pulled from linux-ia64 mailing list. Fix is correct.
+ * hppa/alpha/mips: Fix compile-failure due to missing arch_mmap_check. Patch
sent
+ upstream to [EMAIL PROTECTED]
+
+ [ dann frazier ]
+ * sym2: only claim "Storage" class devices - the cpqarray driver should be
+ used for 5c1510 devices in RAID mode. (closes: #380272)
+
+ [ Bastian Blank ]
+ * Backport change to allow all hypercalls for xen.
+
+ -- Bastian Blank <[EMAIL PROTECTED]> Thu, 31 Aug 2006 12:12:51 +0200
linux-2.6 (2.6.17-7) unstable; urgency=low
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py Thu Sep
21 16:11:51 2006
@@ -71,6 +71,7 @@
'initramfs-generators': schema_item_list(),
'modules': schema_item_boolean(),
'subarches': schema_item_list(),
+ 'versions': schema_item_list(),
}
def __init__(self, dirs = []):
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Thu Sep 21 16:11:51 2006
@@ -366,7 +366,7 @@
dh_testdir
dh_testroot
dh_clean -d -k
- DH_OPTIONS= dh_installdirs -p$(PACKAGE_NAME) 'boot'
+ DH_OPTIONS= dh_installdirs -p$(PACKAGE_NAME) 'boot'
'var/lib/$(PACKAGE_NAME)'
DH_OPTIONS= dh_installdirs -p$(MODULES_PACKAGE_NAME) 'boot'
cp $(DIR)/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
cd $(DIR); $(setup_env) make modules_install
INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
@@ -374,6 +374,9 @@
cp $(DIR)/System.map
$(MODULES_PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
rm $(MODULES_PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source}
DH_OPTIONS= dh_installmodules -p$(MODULES_PACKAGE_NAME)
+ for i in $(XEN_VERSIONS); do echo $$i >>
$(PACKAGE_DIR)/var/lib/$(PACKAGE_NAME)/xen-versions; done
+ install -d $(PACKAGE_DIR)/DEBIAN
+ echo /var/lib/$(PACKAGE_NAME)/xen-versions >>
$(PACKAGE_DIR)/DEBIAN/conffiles
$(MAKE) -f debian/rules.real install-base
install-patch: PACKAGE = linux-patch-debian-$(VERSION)
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
