Merge /dists/sid/linux-2.6 (2.6.32-11).

svn path=/dists/trunk/linux-2.6/; revision=15575
This commit is contained in:
Bastian Blank 2010-04-27 17:48:06 +00:00
commit eef8e0abf6
37 changed files with 1183 additions and 237 deletions

12
debian/NEWS vendored
View File

@ -1,3 +1,15 @@
linux-2.6 (2.6.32-11) unstable; urgency=low
* This release replaces the old IDE (PATA) drivers with new drivers
using 'libata' on all architectures. This change was previously made
for the i386 and amd64 architectures.
The automatic upgrade code does not support the configuration files
of many of the boot loaders used on other architectures, so you may
be prompted to make changes manually.
-- Ben Hutchings <ben@decadent.org.uk> Sat, 20 Mar 2010 05:48:31 +0000
linux-2.6 (2.6.32-10) unstable; urgency=low
* The old IDE (PATA) drivers are no longer developed. Most PATA

11
debian/README.source vendored
View File

@ -11,10 +11,15 @@ Updating the upstream source
This will produce ../orig/linux-2.6_<version>.orig.tar.gz
(e.g. linux-2.6_2.6.26~rc3.orig.tar.gz).
(genorig.py requires the python and unifdef packages to be
installed)
3) Unpack linux-2.6-<version>.orig.tar.gz, cd into the new directory,
and do a 'svn export' to get the debian/ subdirectory.
Alternatively unpack using "make -f debian/rules orig".
(the orig target of the Makefiles requires rsync)
Applying patches to the Debian kernel tree
==========================================
@ -55,6 +60,12 @@ of 2.6.26-12:
The same syntax applies for specifing the patches, but an additional
argument is needed which specifies the featureset the patch applies to.
If you want to generate a source tree with all patches applied, run
make -f debian/rules source-all
The resulting source can be found below debian/build.
Kernel config files
===================
Configuration files are constructed dynamically from a number of config

View File

@ -13,33 +13,22 @@ from debian_linux.debian import *
class CheckAbi(object):
class SymbolInfo(object):
def __init__(self, symbol):
def __init__(self, symbol, symbol_ref=None):
self.symbol = symbol
self.symbol_ref = symbol_ref or symbol
def write(self, out, ignored):
info = []
if ignored:
info.append("ignored")
for i in ('module', 'version', 'export'):
info.append("%s: %s" % (i, getattr(self.symbol, i)))
out.write("%-48s %s\n" % (self.symbol.name, ", ".join(info)))
class SymbolChangeInfo(object):
def __init__(self, symbol_ref, symbol_new):
self.symbol_ref, self.symbol_new = symbol_ref, symbol_new
def write(self, out, ignored):
info = []
if ignored:
info.append("ignored")
for i in ('module', 'version', 'export'):
d_ref = getattr(self.symbol_ref, i)
d_new = getattr(self.symbol_new, i)
if d_ref != d_new:
info.append("%s: %s -> %s" % (i, d_ref, d_new))
for name in ('module', 'version', 'export'):
data = getattr(self.symbol, name)
data_ref = getattr(self.symbol_ref, name)
if data != data_ref:
info.append("%s: %s -> %s" % (name, data_ref, data))
else:
info.append("%s: %s" % (i, d_new))
out.write("%-48s %s\n" % (self.symbol_new.name, ", ".join(info)))
info.append("%s: %s" % (name, data))
out.write("%-48s %s\n" % (self.symbol.name, ", ".join(info)))
def __init__(self, config, dir, arch, featureset, flavour):
self.config = config
@ -64,7 +53,7 @@ class CheckAbi(object):
symbols, add, change, remove = self._cmp(ref, new)
ignore = self._ignore(symbols.keys())
ignore = self._ignore(symbols)
add_effective = add - ignore
change_effective = change - ignore
@ -84,23 +73,17 @@ class CheckAbi(object):
if add:
out.write("\nAdded symbols:\n")
t = list(add)
t.sort()
for name in t:
for name in sorted(add):
symbols[name].write(out, name in ignore)
if change:
out.write("\nChanged symbols:\n")
t = list(change)
t.sort()
for name in t:
for name in sorted(change):
symbols[name].write(out, name in ignore)
if remove:
out.write("\nRemoved symbols:\n")
t = list(remove)
t.sort()
for name in t:
for name in sorted(remove):
symbols[name].write(out, name in ignore)
return ret
@ -125,7 +108,7 @@ class CheckAbi(object):
if s_ref != s_new:
change.add(name)
symbols[name] = self.SymbolChangeInfo(s_ref, s_new)
symbols[name] = self.SymbolInfo(s_new, s_ref)
for name in ref_names - new_names:
remove.add(name)
@ -133,20 +116,34 @@ class CheckAbi(object):
return symbols, add, change, remove
def _ignore(self, all):
def _ignore(self, symbols):
# TODO: let config merge this lists
configs = []
configs.append(self.config.get(('abi', self.arch, self.featureset, self.flavour), {}))
configs.append(self.config.get(('abi', self.arch, None, self.flavour), {}))
configs.append(self.config.get(('abi', self.arch, self.featureset), {}))
configs.append(self.config.get(('abi', self.arch), {}))
configs.append(self.config.get(('abi', None, self.featureset), {}))
configs.append(self.config.get(('abi',), {}))
ignores = set()
for config in configs:
ignores.update(config.get('ignore-changes', []))
filtered = set()
for m in ignores:
filtered.update(fnmatch.filter(all, m))
for ignore in ignores:
type = 'symbolmatch'
if ':' in ignore:
type, ignore = ignore.split(':')
if type == 'symbolmatch':
filtered.update(fnmatch.filter(symbols.iterkeys(), ignore))
elif type == 'module':
for symbol in symbols.itervalues():
symbol = symbol.symbol
if symbol.module == ignore:
filtered.add(symbol.name)
else:
raise NotImplementedError
return filtered

View File

@ -143,8 +143,11 @@ class Gencontrol(Base):
desc_parts = self.config.get_merge('description', arch, featureset, flavour, 'parts')
if desc_parts:
# XXX: Workaround, we need to support multiple entries of the same name
parts = list(set(desc_parts))
parts.sort()
desc = image_fields['Description']
for part in desc_parts[::-1]:
for part in parts:
desc.append(config_entry_description['part-long-' + part])
desc.append_short(config_entry_description.get('part-short-' + part, ''))
@ -155,6 +158,7 @@ class Gencontrol(Base):
image = self.templates["control.image.type-standalone"]
build_modules = False
elif config_entry_image['type'] == 'plain-xen':
raise RuntimeError
image = self.templates["control.image.type-modulesextra"]
build_modules = True
config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
@ -174,6 +178,15 @@ class Gencontrol(Base):
image = self.templates["control.image.type-%s" % config_entry_image['type']]
#image = self.templates["control.image.type-modulesinline"]
config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
if config_entry_xen.get('dom0-support', False):
p = self.process_packages(self.templates['control.xen-linux-system'], vars)
l = PackageRelationGroup()
for xen_flavour in config_entry_xen['flavours']:
l.append("xen-hypervisor-%s" % xen_flavour)
p[0]['Depends'].append(l)
packages_dummy.extend(p)
vars.setdefault('desc', None)
packages_own.append(self.process_real_image(image[0], image_fields, vars))

View File

@ -8,7 +8,7 @@ arch="$(dpkg --print-architecture)"
kernelabi="$(uname -r)"
ff="${kernelabi#+([^-])-@(trunk|+([0-9]))-}"
if [ "x$ff" != "x$kernelabi" ]; then
flavour="${ff#@(vserver|xen)-}"
flavour="${ff#@(openvz|vserver|xen)-}"
if [ "x$flavour" != "x$ff" ]; then
featureset="${ff%-$flavour}"
else

151
debian/changelog vendored
View File

@ -105,6 +105,157 @@ linux-2.6 (2.6.33-1~experimental.1) experimental; urgency=low
-- maximilian attems <maks@debian.org> Thu, 25 Feb 2010 15:21:38 +0100
linux-2.6 (2.6.32-11) unstable; urgency=low
[ Ben Hutchings ]
* [sparc] Provide io{read,write}{16,32}be() (Closes: #574421)
* Use libata-based drivers for most PATA controllers on all architectures
(previously applied only to x86)
* linux-base: Fix bugs and improve libata transition code:
- Handle duplicates in /etc/udev/rules.d/70-persistent-cd.rules
(Closes: #574630)
- Always attempt conversion if $DEBCONF_RECONFIGURE is set
- Never attempt conversion during a fresh installation (Closes: #576243)
- Convert disk IDs in crypttab (Closes: #575056)
- Redirect stdin and stdout of child processes to avoid interfering with
debconf (Closes: #574987)
- Report when hdparm.conf or mdadm.conf may need to be updated
(Closes: #576442)
- Where a device has both a UUID and a label, prefer to identify it by
UUID, consistent with fresh installations
- Do not use device labels including certain unsafe characters
(Closes: #576537)
* iwlwifi: Fix repeated warnings about tfds_in_queue (Closes: #574526)
* eeepc-laptop: Disable CPU speed control on 701 and 702 since it can
cause the system to hang (Closes: #559578)
* eeepc-laptop: Disable wireless hotplug on 1005HA, 1201N and 1005PE
since it disconnects the wrong device (Closes: #573607)
* linux-headers-*: Support postinst hooks in /etc/kernel/header_postinst.d,
thanks to Michael Gilbert (Closes: #569724)
* rt2860sta: Fix argument to linux_pci_unmap_single() (Closes: #575726)
* nouveau: nv50: Implement ctxprog/state generation
* phylib: Support PHY module autoloading (Closes: #553024)
* [x86] Add ramzswap driver (Closes: #573912)
[ maximilian attems]
* [alpha, hppa] Disable oprofile as tracing code is unsupported here.
(closes: #574368)
* Update openvz patch to 14a9729fab67. (closes: #574598, #575189)
* [x86]: Disable FB_INTEL. (closes: #447575, #503766, #574401)
* ssb: do not read SPROM if it does not exist.
* ssb: Avoid null pointer dereference by aboves.
* Add stable 2.6.32.11.
- MIPS: Cleanup forgotten label_module_alloc in tlbex.c (Closes: #571305)
- ath5k: fix setup for CAB queue (closes: #576213)
- NFS: Prevent another deadlock in nfs_release_page() (Closes: #574348)
* Revert to keep ABI:
- hrtimer: Tune hrtimer_interrupt hang logic
[ Moritz Muehlenhoff ]
* Add support for sh4 architecture, patch by Nobuhiro Iwamatsu
(Closes: #569034)
[ Bastian Blank ]
* Update Xen patch.
- Fix free interrupt problem on uni-processor machines.
[ Ian Campbell ]
* Include Xen hypervisor in reportbug "related to" list.
-- maximilian attems <maks@debian.org> Mon, 05 Apr 2010 20:31:15 +0200
linux-2.6 (2.6.32-10) unstable; urgency=low
* The "Big Bang" release
[ maximilian attems]
* tcp: fix ICMP-RTO war.
* Add stable 2.6.32.10.
- net/via-rhine: Fix scheduling while atomic bugs (closes: #549606)
- HID: remove TENX iBuddy from blacklist (Closes: #551312)
- USB: SIS USB2VGA DRIVER: support KAIREN's USB VGA adaptor
USB20SVGA-MB-PLUS (Closes: #565857)
* Bump ABI to 4.
* [x86] Add openvz flavour.
- adds ppp support (closes: #550975)
* Prevent nouveau from autoloading until xserver-xorg-video-nouveau lands.
[ Moritz Muehlenhoff ]
* Enable CONFIG_KEYS_DEBUG_PROC_KEYS (Closes: #400932)
* Amend README.source with documentation on how to generate a
source tree with all patches applied (Closes: #509156)
* Document needed packages for preparatory packaging
steps (Closes: #548028)
[ Aurelien Jarno ]
* Fix signal stack alignement on sparc64 (Closes: #569797)
[ Bastian Blank ]
* Add support for Xen dom0 into its featureset.
(Closes: #499745, #503857, #504805, #505545, #506118, #507785, #509085,
#509733, #511963, #513835, #514511, #516223, #516374, #516635, #517048,
#519586, #520702, #522452, #524571, #524596, #526695, #533132, #533432,
#534880, #534978, #541227, #542299, #542614, #543489, #544525, #548345,
#554564, #554621, #559175, #559634)
* [alpha, amd64, i386, amd64, powerpc] Make all AGP driver built-in to
workaround race-condition between DRM and AGP.
[ Ben Hutchings ]
* drm: Apply all changes from 2.6.33 and 2.6.33.1:
- Add nouveau driver
- i915: Fix disappearing mouse pointer (Closes: #551330)
- i915: Restore video overlay support (Closes: #560033)
- i915: Fix DDC on some systems by clearing BIOS GMBUS (Closes: #567747)
- radeon: Enable KMS support
* qla2xxx: Disable MSI/MSI-X on some chips or as selected by module parameter
(Closes: #572322)
- MSI is disabled on QLA24xx chips other than QLA2432 (MSI-X already was)
- MSI-X is disabled if qlx2enablemsix=2
- MSI and MSI-X are disabled if qlx2enablemsix=0
* [sparc64] Make prom entry spinlock NMI safe (Closes: #572442)
* firmware: Correct copyright information and add source for CIS files
* Fix first line of kernel-doc for a few functions so that they get valid
manual pages
* Remove /usr/include/drm from linux-libc-dev; let libdrm-dev provide it
again
* [x86] Enable rtl8192su driver using external firmware
* [x86] Use libata-based drivers for most PATA controllers (Closes: #444182):
- pata_triflex replaces triflex
- pata_atiixp replaces atiixp
- pata_ns87415 replaces ns87415
- pata_sc1200 replaces sc1200
- pata_cs5536 replaces cs5536
- pata_amd replaces amd74xx
- pata_sis replaces sis5513
- pata_rz1000 replaces rz1000
- pata_efar replaces slc90e66
- pata_pdc202xx_old replaces pdc202xx_old
- pata_pdc2027x replaces pdc202xx_new
- pata_cs5520 replaces cs5520
- pata_cs5530 replaces cs5530
- pata_cmd64x replaces cmd64x
- pata_sil680 replaces siimage
- pata_ali replaces alim15x3
- pata_via replaces via82cxxx
- pata_serverworks replaces serverworks
- pata_artop replaces aec62xx
- pata_it821x replaces it821x
- ata_piix, pata_oldpiix, pata_mpiix mostly replace piix
- ata_generic, pata_ns87410, pata_netcell replace ide-pci-generic
* linux-base: Add libata transition script
* Hide sensitive information when including network configuration in bug
reports and running a different kernel version
[ Martin Michlmayr ]
* Add some ARM patches from git:
- Update mach types
- eSATA SheevaPlug: basic board support
- eSATA SheevaPlug: configure SoC SATA interface
- eSATA SheevaPlug: correlate MPP to SD CD and SD WP
* [armel/kirkwood] Enable MACH_ESATA_SHEEVAPLUG.
-- maximilian attems <maks@debian.org> Tue, 16 Mar 2010 23:39:05 +0100
linux-2.6 (2.6.32-9) unstable; urgency=high
[ Ben Hutchings ]

View File

@ -1,7 +1,7 @@
##
## file: arch/Kconfig
##
CONFIG_OPROFILE=m
# CONFIG_OPROFILE is not set
##
## file: arch/alpha/Kconfig
@ -167,10 +167,10 @@ CONFIG_MAX_RAW_DEVS=256
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=m
CONFIG_AGP_SIS=m
CONFIG_AGP_VIA=m
CONFIG_AGP_ALPHA_CORE=m
#. Workaround
CONFIG_AGP=y
#. Workaround
CONFIG_AGP_ALPHA_CORE=y
##
## file: drivers/char/ipmi/Kconfig
@ -199,6 +199,14 @@ CONFIG_DRM_RADEON=m
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
##
## file: drivers/gpu/drm/nouveau/Kconfig
##
CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
# CONFIG_DRM_NOUVEAU_DEBUG is not set
CONFIG_DRM_I2C_CH7006=m
##
## file: drivers/hid/usbhid/Kconfig
##

View File

@ -1,5 +1,6 @@
[base]
featuresets:
openvz
vserver
xen
flavours:

View File

@ -5,7 +5,6 @@ flavours:
[image]
initramfs-generators: initramfs-tools
suggests: grub
type: plain-xen
[xen]
flavours: amd64

View File

@ -73,7 +73,23 @@ CONFIG_SATA_SIS=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
# CONFIG_PATA_ARTOP is not set
CONFIG_PATA_ALI=m
CONFIG_PATA_CMD64X=m
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_VIA=m
##
## file: drivers/block/Kconfig
@ -216,29 +232,29 @@ CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_OFFBOARD=y
CONFIG_BLK_DEV_GENERIC=m
# CONFIG_BLK_DEV_GENERIC is not set
CONFIG_BLK_DEV_OPTI621=m
CONFIG_BLK_DEV_AEC62XX=m
CONFIG_BLK_DEV_ALI15X3=m
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
CONFIG_BLK_DEV_CMD64X=m
CONFIG_BLK_DEV_TRIFLEX=m
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
CONFIG_BLK_DEV_CY82C693=m
CONFIG_BLK_DEV_CS5520=m
CONFIG_BLK_DEV_CS5530=m
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
CONFIG_BLK_DEV_HPT366=m
CONFIG_BLK_DEV_SC1200=m
# CONFIG_BLK_DEV_SC1200 is not set
CONFIG_BLK_DEV_PIIX=m
CONFIG_BLK_DEV_IT821X=m
CONFIG_BLK_DEV_NS87415=m
CONFIG_BLK_DEV_PDC202XX_OLD=m
CONFIG_BLK_DEV_PDC202XX_NEW=m
CONFIG_BLK_DEV_SVWKS=m
CONFIG_BLK_DEV_SIIMAGE=m
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
CONFIG_BLK_DEV_SL82C105=m
CONFIG_BLK_DEV_SLC90E66=m
# CONFIG_BLK_DEV_SLC90E66 is not set
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_BLK_DEV_VIA82CXXX is not set
##
## file: drivers/input/gameport/Kconfig

View File

@ -58,6 +58,7 @@ CONFIG_MACH_DB88F6281_BP=y
CONFIG_MACH_RD88F6192_NAS=y
CONFIG_MACH_RD88F6281=y
CONFIG_MACH_SHEEVAPLUG=y
CONFIG_MACH_ESATA_SHEEVAPLUG=y
CONFIG_MACH_TS219=y
CONFIG_MACH_TS41X=y
CONFIG_MACH_OPENRD=y

22
debian/config/config vendored
View File

@ -125,7 +125,7 @@ CONFIG_ATA_GENERIC=m
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
# CONFIG_PATA_ISAPNP is not set
# CONFIG_PATA_IT821X is not set
CONFIG_PATA_IT821X=m
# CONFIG_PATA_IT8213 is not set
CONFIG_PATA_JMICRON=m
# CONFIG_PATA_LEGACY is not set
@ -330,15 +330,15 @@ CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
##
## file: drivers/gpu/drm/radeon/Kconfig
## file: drivers/gpu/drm/nouveau/Kconfig
##
# CONFIG_DRM_RADEON_KMS is not set
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
##
## file: drivers/gpu/drm/radeon/Kconfig
##
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
# CONFIG_DRM_RADEON_KMS is not set
##
## file: drivers/gpu/drm/vmwgfx/Kconfig
@ -459,7 +459,7 @@ CONFIG_IDE_PROC_FS=y
# CONFIG_BLK_DEV_JMICRON is not set
CONFIG_BLK_DEV_IT8172=m
CONFIG_BLK_DEV_IT8213=m
CONFIG_BLK_DEV_IT821X=m
# CONFIG_BLK_DEV_IT821X is not set
CONFIG_BLK_DEV_TC86C001=m
##
@ -2254,11 +2254,6 @@ CONFIG_STAGING=y
##
# CONFIG_LINE6_USB is not set
##
## file: drivers/staging/mimio/Kconfig
##
# CONFIG_INPUT_MIMIO is not set
##
## file: drivers/staging/otus/Kconfig
##
@ -2586,7 +2581,7 @@ CONFIG_FB_ARC=m
# CONFIG_FB_UVESA is not set
# CONFIG_FB_NVIDIA_DEBUG is not set
# CONFIG_FB_INTEL_DEBUG is not set
CONFIG_FB_INTEL_I2C=y
# CONFIG_FB_INTEL_I2C is not set
CONFIG_FB_S3=m
CONFIG_FB_VIA=m
CONFIG_FB_3DFX=m
@ -3951,7 +3946,7 @@ CONFIG_NET_KEY_MIGRATE=y
## file: security/Kconfig
##
CONFIG_KEYS=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
@ -4111,5 +4106,6 @@ CONFIG_INITRAMFS_SOURCE=""
##
## file: unknown
##
# CONFIG_INPUT_MIMIO is not set
CONFIG_LBD=y

View File

@ -20,9 +20,13 @@ arches:
compiler: gcc-4.3
featuresets:
none
openvz
vserver
xen
[featureset-openvz_base]
enabled: false
[featureset-vserver_base]
enabled: false
@ -37,10 +41,6 @@ part-long-xen: This kernel also runs on a Xen hypervisor.
initramfs-generators: initramfs-tools initramfs-fallback
type: plain
[xen]
versions:
3.2-1
[commands-image-initramfs-generators]
initramfs-tools: update-initramfs

29
debian/config/featureset-openvz/config vendored Normal file
View File

@ -0,0 +1,29 @@
CONFIG_VZ_FAIRSCHED=y
CONFIG_VE=y
CONFIG_VE_CALLS=m
CONFIG_VE_NETDEV=m
CONFIG_VE_ETHDEV=m
CONFIG_VZ_DEV=m
CONFIG_VE_IPTABLES=y
CONFIG_VZ_WDOG=m
CONFIG_VZ_CHECKPOINT=m
CONFIG_SIM_FS=m
CONFIG_VZ_QUOTA=m
# CONFIG_VZ_QUOTA_UNLOAD is not set
CONFIG_VZ_QUOTA_UGID=y
CONFIG_SYSRQ_DEBUG=y
CONFIG_BEANCOUNTERS=y
CONFIG_BC_RSS_ACCOUNTING=y
CONFIG_BC_IO_ACCOUNTING=y
CONFIG_BC_IO_SCHED=y
CONFIG_BC_SWAP_ACCOUNTING=y
CONFIG_BC_PROC=y
# CONFIG_BC_DEBUG is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_SYSFS_DEPRECATED_DYN is not set
# buggy
# CONFIG_NF_CONNTRACK_IPV6 is not set

10
debian/config/featureset-openvz/defines vendored Normal file
View File

@ -0,0 +1,10 @@
[abi]
ignore-changes: *
[description]
part-long-openvz: This kernel includes support for OpenVZ container-based virtualization.
part-short-openvz: OpenVZ support
parts: openvz
[image]
depends: vzctl

View File

@ -1,20 +1,11 @@
CONFIG_XEN=y
CONFIG_XEN_PRIVILEGED_GUEST=y
CONFIG_XEN_DOM0=y
CONFIG_XEN_BACKEND=y
CONFIG_XEN_BLKDEV_BACKEND=y
CONFIG_XEN_BLKDEV_TAP=m
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_HVC_XEN=y
CONFIG_XEN_NETDEV_BACKEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
CONFIG_XEN_NETDEV_LOOPBACK=m
CONFIG_XEN_PCIDEV_BACKEND=y
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
CONFIG_XEN_PCIDEV_FRONTEND=y
# CONFIG_XEN_DISABLE_SERIAL is not set
CONFIG_XEN_SCSI_BACKEND=m
CONFIG_XEN_SCSI_FRONTEND=m
# CONFIG_XEN_COMPAT_030002_AND_LATER is not set
# CONCIF_XEN_COMPAT_030004_AND_LATER is not set
CONFIG_XEN_COMPAT_030100_AND_LATER=y
# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
# CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set
# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
CONFIG_XEN_GNTDEV=y

View File

@ -1,5 +1,8 @@
[description]
part-long-xenold: This kernel only runs on a Xen hypervisor.
parts: xen
part-long-xen: This kernel also runs on a Xen hypervisor.
It supports both privileged (dom0) and unprivileged (domU) operation.
part-short-xenold: oldstyle Xen support
parts: xenold
part-short-xen: Xen dom0 support
[xen]
dom0-support: true

View File

@ -1,7 +1,7 @@
##
## file: arch/Kconfig
##
CONFIG_OPROFILE=m
# CONFIG_OPROFILE is not set
##
## file: arch/parisc/Kconfig

View File

@ -1,5 +1,6 @@
[base]
featuresets:
openvz
vserver
xen
flavours:

View File

@ -5,7 +5,6 @@ flavours:
[image]
initramfs-generators: initramfs-tools
suggests: grub
type: plain-xen
[xen]
flavours:

View File

@ -52,6 +52,23 @@ CONFIG_ACPI_CONTAINER=y
## file: drivers/ata/Kconfig
##
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
CONFIG_PATA_CMD64X=m
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_VIA=m
##
## file: drivers/block/Kconfig
@ -102,12 +119,14 @@ CONFIG_MMTIMER=m
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=m
CONFIG_AGP_SIS=m
CONFIG_AGP_VIA=m
CONFIG_AGP_I460=m
CONFIG_AGP_HP_ZX1=m
CONFIG_AGP_SGI_TIOCA=m
#. Workaround
CONFIG_AGP=y
#. Workaround
CONFIG_AGP_I460=y
#. Workaround
CONFIG_AGP_HP_ZX1=y
#. Workaround
CONFIG_AGP_SGI_TIOCA=y
##
## file: drivers/char/ipmi/Kconfig
@ -135,6 +154,14 @@ CONFIG_DRM_RADEON=m
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
##
## file: drivers/gpu/drm/nouveau/Kconfig
##
CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
# CONFIG_DRM_NOUVEAU_DEBUG is not set
CONFIG_DRM_I2C_CH7006=m
##
## file: drivers/hid/usbhid/Kconfig
##
@ -221,28 +248,28 @@ CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_IDE_GENERIC=m
# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_BLK_DEV_GENERIC=m
# CONFIG_BLK_DEV_GENERIC is not set
CONFIG_BLK_DEV_OPTI621=m
CONFIG_BLK_DEV_AEC62XX=m
CONFIG_BLK_DEV_ALI15X3=m
CONFIG_BLK_DEV_AMD74XX=m
CONFIG_BLK_DEV_CMD64X=m
CONFIG_BLK_DEV_TRIFLEX=m
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
CONFIG_BLK_DEV_CY82C693=m
CONFIG_BLK_DEV_CS5520=m
CONFIG_BLK_DEV_CS5530=m
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
CONFIG_BLK_DEV_HPT366=m
CONFIG_BLK_DEV_SC1200=m
# CONFIG_BLK_DEV_SC1200 is not set
CONFIG_BLK_DEV_PIIX=m
CONFIG_BLK_DEV_NS87415=m
CONFIG_BLK_DEV_PDC202XX_OLD=m
CONFIG_BLK_DEV_PDC202XX_NEW=m
CONFIG_BLK_DEV_SVWKS=m
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
CONFIG_BLK_DEV_SGIIOC4=m
CONFIG_BLK_DEV_SIIMAGE=m
CONFIG_BLK_DEV_SLC90E66=m
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_BLK_DEV_VIA82CXXX is not set
##
## file: drivers/ieee1394/Kconfig

View File

@ -34,7 +34,6 @@ CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
# CONFIG_X86_CPU_DEBUG is not set
CONFIG_NODES_SHIFT=6
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_RESERVE_LOW_64K=y
@ -285,11 +284,16 @@ CONFIG_HPET_MMAP=y
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=m
CONFIG_AGP_AMD64=m
CONFIG_AGP_INTEL=m
CONFIG_AGP_SIS=m
CONFIG_AGP_VIA=m
#. Workaround
CONFIG_AGP=y
#. Workaround
CONFIG_AGP_AMD64=y
#. Workaround
CONFIG_AGP_INTEL=y
#. Workaround
CONFIG_AGP_SIS=y
#. Workaround
CONFIG_AGP_VIA=y
##
## file: drivers/char/hw_random/Kconfig
@ -387,6 +391,14 @@ CONFIG_DRM_I915=m
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
##
## file: drivers/gpu/drm/nouveau/Kconfig
##
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
# CONFIG_DRM_NOUVEAU_DEBUG is not set
CONFIG_DRM_I2C_CH7006=m
##
## file: drivers/hid/usbhid/Kconfig
##
@ -480,11 +492,30 @@ CONFIG_IDE_GENERIC=m
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
CONFIG_BLK_DEV_IDEPNP=y
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_GENERIC is not set
CONFIG_BLK_DEV_OPTI621=m
# CONFIG_BLK_DEV_RZ1000 is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_ATIIXP is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
CONFIG_BLK_DEV_CY82C693=m
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
CONFIG_BLK_DEV_HPT366=m
# CONFIG_BLK_DEV_SC1200 is not set
CONFIG_BLK_DEV_PIIX=m
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SIS5513 is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
CONFIG_BLK_DEV_TRM290=m
# CONFIG_BLK_DEV_VIA82CXXX is not set
##
## file: drivers/input/Kconfig
@ -1209,7 +1240,7 @@ CONFIG_FB_NVIDIA_BACKLIGHT=y
# CONFIG_FB_RIVA_DEBUG is not set
CONFIG_FB_LE80578=m
CONFIG_FB_CARILLO_RANCH=m
CONFIG_FB_INTEL=m
# CONFIG_FB_INTEL is not set
CONFIG_FB_MATROX=m
CONFIG_FB_MATROX_MILLENIUM=y
CONFIG_FB_MATROX_MYSTIQUE=y
@ -1498,4 +1529,5 @@ CONFIG_SND_HDA_INTEL=m
##
# CONFIG_KVM_TRACE is not set
CONFIG_NUMA_MIGRATE_IRQ_DESC=y
# CONFIG_X86_CPU_DEBUG is not set

View File

@ -83,7 +83,7 @@ CONFIG_CRYPTO_TWOFISH_586=m
## file: drivers/ata/Kconfig
##
# CONFIG_PATA_CS5535 is not set
# CONFIG_PATA_CS5536 is not set
CONFIG_PATA_CS5536=m
##
## file: drivers/atm/Kconfig
@ -125,12 +125,18 @@ CONFIG_CS5535_GPIO=m
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP_ALI=m
CONFIG_AGP_ATI=m
CONFIG_AGP_AMD=m
CONFIG_AGP_NVIDIA=m
CONFIG_AGP_SWORKS=m
CONFIG_AGP_EFFICEON=m
#. Workaround
CONFIG_AGP_ALI=y
#. Workaround
CONFIG_AGP_ATI=y
#. Workaround
CONFIG_AGP_AMD=y
#. Workaround
CONFIG_AGP_NVIDIA=y
#. Workaround
CONFIG_AGP_SWORKS=y
#. Workaround
CONFIG_AGP_EFFICEON=y
##
## file: drivers/crypto/Kconfig
@ -148,7 +154,7 @@ CONFIG_SCx200_I2C_SDA=13
## file: drivers/ide/Kconfig
##
CONFIG_BLK_DEV_CS5535=m
CONFIG_BLK_DEV_CS5536=m
# CONFIG_BLK_DEV_CS5536 is not set
# CONFIG_BLK_DEV_4DRIVES is not set
# CONFIG_BLK_DEV_ALI14XX is not set
# CONFIG_BLK_DEV_DTC2278 is not set

View File

@ -120,7 +120,7 @@ CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_SIL24=y
# CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set
CONFIG_ATA_PIIX=y
CONFIG_SATA_MV=y
# CONFIG_SATA_NV is not set
# CONFIG_PDC_ADMA is not set
@ -132,7 +132,15 @@ CONFIG_SATA_SIL=y
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
# CONFIG_ATA_GENERIC is not set
CONFIG_PATA_CMD64X=y
CONFIG_ATA_GENERIC=y
CONFIG_PATA_MPIIX=y
CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_NETCELL=y
CONFIG_PATA_NS87410=y
CONFIG_PATA_PDC_OLD=y
CONFIG_PATA_PDC2027X=y
CONFIG_PATA_SIL680=y
##
## file: drivers/atm/Kconfig
@ -259,6 +267,14 @@ CONFIG_DRM_MGA=m
CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
##
## file: drivers/gpu/drm/nouveau/Kconfig
##
CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
# CONFIG_DRM_NOUVEAU_DEBUG is not set
CONFIG_DRM_I2C_CH7006=m
##
## file: drivers/hwmon/Kconfig
##
@ -352,12 +368,12 @@ CONFIG_BLK_DEV_IDETAPE=m
# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_IDE_GENERIC=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=y
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
CONFIG_BLK_DEV_CMD64X=y
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
@ -368,10 +384,10 @@ CONFIG_BLK_DEV_HPT366=y
CONFIG_BLK_DEV_PIIX=y
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
CONFIG_BLK_DEV_PDC202XX_OLD=y
CONFIG_BLK_DEV_PDC202XX_NEW=y
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
CONFIG_BLK_DEV_SIIMAGE=y
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set

View File

@ -105,7 +105,7 @@ CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_SIL24=y
# CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set
CONFIG_ATA_PIIX=y
CONFIG_SATA_MV=y
# CONFIG_SATA_NV is not set
# CONFIG_PDC_ADMA is not set
@ -118,7 +118,15 @@ CONFIG_SATA_SIL=y
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
CONFIG_SATA_INIC162X=m
# CONFIG_ATA_GENERIC is not set
CONFIG_PATA_CMD64X=y
CONFIG_ATA_GENERIC=y
CONFIG_PATA_MPIIX=y
CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_NETCELL=y
CONFIG_PATA_NS87410=y
CONFIG_PATA_PDC_OLD=y
CONFIG_PATA_PDC2027X=y
CONFIG_PATA_SIL680=y
##
## file: drivers/atm/Kconfig
@ -244,6 +252,14 @@ CONFIG_DRM_MGA=m
CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
##
## file: drivers/gpu/drm/nouveau/Kconfig
##
CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
# CONFIG_DRM_NOUVEAU_DEBUG is not set
CONFIG_DRM_I2C_CH7006=m
##
## file: drivers/hwmon/Kconfig
##
@ -343,12 +359,12 @@ CONFIG_IDE_PROC_FS=y
CONFIG_IDE_GENERIC=y
CONFIG_IDEPCI_PCIBUS_ORDER=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=y
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
CONFIG_BLK_DEV_CMD64X=y
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
@ -359,10 +375,10 @@ CONFIG_BLK_DEV_HPT366=y
CONFIG_BLK_DEV_PIIX=y
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
CONFIG_BLK_DEV_PDC202XX_OLD=y
CONFIG_BLK_DEV_PDC202XX_NEW=y
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
CONFIG_BLK_DEV_SIIMAGE=y
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set

View File

@ -136,6 +136,21 @@ CONFIG_SATA_SIS=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
CONFIG_PATA_CMD64X=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_VIA=m
##
## file: drivers/block/Kconfig
@ -283,26 +298,26 @@ CONFIG_IDE_GENERIC=y
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
CONFIG_BLK_DEV_AEC62XX=m
CONFIG_BLK_DEV_ALI15X3=m
CONFIG_BLK_DEV_AMD74XX=m
CONFIG_BLK_DEV_CMD64X=m
CONFIG_BLK_DEV_TRIFLEX=m
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
CONFIG_BLK_DEV_CY82C693=m
# CONFIG_BLK_DEV_CS5520 is not set
CONFIG_BLK_DEV_CS5530=m
# CONFIG_BLK_DEV_CS5530 is not set
CONFIG_BLK_DEV_HPT366=m
CONFIG_BLK_DEV_SC1200=m
# CONFIG_BLK_DEV_SC1200 is not set
CONFIG_BLK_DEV_PIIX=m
CONFIG_BLK_DEV_IT821X=m
CONFIG_BLK_DEV_NS87415=m
CONFIG_BLK_DEV_PDC202XX_OLD=m
CONFIG_BLK_DEV_PDC202XX_NEW=m
CONFIG_BLK_DEV_SVWKS=m
CONFIG_BLK_DEV_SIIMAGE=m
CONFIG_BLK_DEV_SLC90E66=m
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_BLK_DEV_VIA82CXXX is not set
##
## file: drivers/infiniband/Kconfig

View File

@ -152,10 +152,10 @@ CONFIG_APPLICOM=m
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=m
CONFIG_AGP_SIS=m
CONFIG_AGP_VIA=m
CONFIG_AGP_UNINORTH=m
#. Workaround
CONFIG_AGP=y
#. Workaround
CONFIG_AGP_UNINORTH=y
##
## file: drivers/char/ipmi/Kconfig
@ -177,6 +177,14 @@ CONFIG_DRM_RADEON=m
CONFIG_DRM_MGA=m
# CONFIG_DRM_SIS is not set
##
## file: drivers/gpu/drm/nouveau/Kconfig
##
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
# CONFIG_DRM_NOUVEAU_DEBUG is not set
CONFIG_DRM_I2C_CH7006=m
##
## file: drivers/hid/usbhid/Kconfig
##

View File

@ -56,6 +56,14 @@ CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_MGA=m
##
## file: drivers/gpu/drm/nouveau/Kconfig
##
CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
# CONFIG_DRM_NOUVEAU_DEBUG is not set
CONFIG_DRM_I2C_CH7006=m
##
## file: drivers/hid/usbhid/Kconfig
##

View File

@ -24,6 +24,31 @@ use FileHandle;
use POSIX ();
use UUID;
# Since debconf clients get their standard input and output redirected
# to the debconf front-end, we need to redirect them again before
# running any other program.
sub _system {
my $pid = fork();
die "$!" unless defined($pid);
if ($pid == 0) {
# </dev/null
POSIX::close(0);
POSIX::open('/dev/null', POSIX::O_RDONLY) or die "$!";
# >&2
POSIX::dup2(2, 1) or die "$!";
exec(@_);
exit(255); # usual exit code for failed exec
} else {
waitpid($pid, 0);
# The built-in system() function does this substitution
if (POSIX::WIFEXITED($?) && POSIX::WEXITSTATUS($?) == 255) {
return -1;
} else {
return $?;
}
}
}
package DebianKernel::DiskId;
### utility
@ -319,7 +344,7 @@ sub grub1_update {
}
sub grub1_post {
system('update-grub');
_system('update-grub');
}
### GRUB 2 config
@ -356,7 +381,7 @@ sub grub2_update {
}
sub grub2_post {
system('grub-mkconfig', '-o', '/boot/grub/grub.cfg');
_system('grub-mkconfig', '-o', '/boot/grub/grub.cfg');
}
### LILO
@ -519,13 +544,19 @@ sub lilo_update {
}
sub lilo_post {
system('lilo');
_system('lilo');
}
### SILO
sub silo_post {
_system('silo');
}
### ELILO
sub elilo_post {
system('elilo');
_system('elilo');
}
### extlinux
@ -588,7 +619,7 @@ sub extlinux_new_update {
}
sub extlinux_post {
system('update-extlinux');
_system('update-extlinux');
}
# udev persistent-cd
@ -662,7 +693,8 @@ sub udev_cd_find_unmatched_ide_rules {
}
} elsif ($path =~ /-scsi-\d+:\d+:\d+:\d+$/) {
my $rule_key = $path . ' ' . $symlink;
if (defined(my $j = $wanted_rule{$rule_key})) {
my $j = $wanted_rule{$rule_key};
if (defined($j) && $j >= 0) {
$unmatched[$j] = undef;
}
$wanted_rule{$rule_key} = -1;
@ -808,6 +840,70 @@ sub uswsusp_resume_update {
}
}
# cryptsetup
sub cryptsetup_next {
my ($file) = @_;
my $text = <$file>;
unless (defined($text)) {
return ();
}
my $line = $text;
if ($line =~ /^\s*(#|$)/) {
return ($text);
} else {
$line =~ s/\s*$//;
$line =~ s/^\s*//;
return ($text, split(/\s+/, $line, 4));
}
}
sub cryptsetup_list {
my ($file) = @_;
my (@results) = ();
while (1) {
my ($text, undef, $src) = cryptsetup_next($file);
last unless defined($text);
if (defined($src)) {
push @results, $src;
}
}
return @results;
}
sub cryptsetup_update {
my ($old, $new, $map) = @_;
while (1) {
my ($text, $dst, $src, $key, $opts) = cryptsetup_next($old);
last unless defined($text);
if (defined($src) && defined($map->{$src})) {
$text = "# $text" . join(' ', $dst, $map->{$src}, $key, $opts);
}
$new->print($text);
}
}
# hdparm
sub hdparm_list {
my ($file) = @_;
my (@results) = ();
# I really can't be bothered to parse this mess. Just see if
# there's anything like a device name on a non-comment line.
while (<$file>) {
if (!/^\s*#/) {
push @results, grep({m|^/dev/|} split(/\s+/));
}
}
return @results;
}
### list of all configuration files and functions
my @config_files = ({packages => 'mount',
@ -818,32 +914,54 @@ my @config_files = ({packages => 'mount',
path => '/boot/grub/menu.lst',
list => \&grub1_list,
update => \&grub1_update,
post_update => \&grub1_post},
post_update => \&grub1_post,
is_boot_loader => 1},
{packages => 'grub-common',
path => '/etc/default/grub',
list => \&grub2_list,
update => \&grub2_update,
post_update => \&grub2_post},
post_update => \&grub2_post,
is_boot_loader => 1},
{packages => 'lilo',
path => '/etc/lilo.conf',
list => \&lilo_list,
update => \&lilo_update,
post_update => \&lilo_post},
post_update => \&lilo_post,
is_boot_loader => 1},
{packages => 'silo',
path => '/etc/silo.conf',
list => \&lilo_list,
update => \&lilo_update,
post_update => \&silo_post,
is_boot_loader => 1},
{packages => 'quik',
path => '/etc/quik.conf',
list => \&lilo_list,
update => \&lilo_update,
is_boot_loader => 1},
{packages => 'yaboot',
path => '/etc/yaboot.conf',
list => \&lilo_list,
update => \&lilo_update,
is_boot_loader => 1},
{packages => 'elilo',
path => '/etc/elilo.conf',
list => \&lilo_list,
update => \&lilo_update,
post_update => \&elilo_post},
post_update => \&elilo_post,
is_boot_loader => 1},
{packages => 'extlinux',
path => extlinux_old_path(),
list => \&extlinux_old_list,
update => \&extlinux_old_update,
post_update => \&extlinux_post},
post_update => \&extlinux_post,
is_boot_loader => 1},
{packages => 'extlinux',
path => '/etc/default/extlinux',
list => \&extlinux_new_list,
update => \&extlinux_new_update,
post_update => \&extlinux_post},
post_update => \&extlinux_post,
is_boot_loader => 1},
{packages => 'udev',
path => '/etc/udev/rules.d/70-persistent-cd.rules',
needs_update => \&udev_cd_needs_update,
@ -858,46 +976,61 @@ my @config_files = ({packages => 'mount',
{packages => 'uswsusp',
path => '/etc/uswsusp.conf',
list => \&uswsusp_resume_list,
update => \&uswsusp_resume_update});
update => \&uswsusp_resume_update},
{packages => 'cryptsetup',
path => '/etc/crypttab',
list => \&cryptsetup_list,
update => \&cryptsetup_update},
# mdadm.conf requires manual update because it may
# contain wildcards.
{packages => 'mdadm',
path => '/etc/mdadm/mdadm.conf'},
# hdparm.conf requires manual update because it
# (1) refers to whole disks (2) might not work
# properly with the new drivers (3) is in a very
# special format.
{packages => 'hdparm',
path => '/etc/hdparm.conf',
list => \&hdparm_list});
### Filesystem labels and UUIDs
sub ext2_set_label {
my ($bdev, $label) = @_;
system('tune2fs', '-L', $label, $bdev) == 0 or die "tune2fs failed: $?";
_system('tune2fs', '-L', $label, $bdev) == 0 or die "tune2fs failed: $?";
}
sub ext2_set_uuid {
my ($bdev, $uuid) = @_;
system('tune2fs', '-U', $uuid, $bdev) == 0 or die "tune2fs failed: $?";
_system('tune2fs', '-U', $uuid, $bdev) == 0 or die "tune2fs failed: $?";
}
sub jfs_set_label {
my ($bdev, $label) = @_;
system('jfs_tune', '-L', $label, $bdev) == 0 or die "jfs_tune failed: $?";
_system('jfs_tune', '-L', $label, $bdev) == 0 or die "jfs_tune failed: $?";
}
sub jfs_set_uuid {
my ($bdev, $uuid) = @_;
system('jfs_tune', '-U', $uuid, $bdev) == 0 or die "jfs_tune failed: $?";
_system('jfs_tune', '-U', $uuid, $bdev) == 0 or die "jfs_tune failed: $?";
}
sub fat_set_label {
my ($bdev, $label) = @_;
system('dosfslabel', $bdev, $label) == 0 or die "dosfslabel failed: $?";
_system('dosfslabel', $bdev, $label) == 0 or die "dosfslabel failed: $?";
}
sub ntfs_set_label {
my ($bdev, $label) = @_;
system('ntfslabel', $bdev, $label) == 0 or die "ntfslabel failed: $?";
_system('ntfslabel', $bdev, $label) == 0 or die "ntfslabel failed: $?";
}
sub reiserfs_set_label {
my ($bdev, $label) = @_;
system('reiserfstune', '--label', $label, $bdev)
_system('reiserfstune', '--label', $label, $bdev)
or die "reiserfstune failed: $?";
}
sub reiserfs_set_uuid {
my ($bdev, $uuid) = @_;
system('reiserfstune', '--uuid', $uuid, $bdev)
_system('reiserfstune', '--uuid', $uuid, $bdev)
or die "reiserfstune failed: $?";
}
@ -961,16 +1094,16 @@ sub swap_set_uuid {
sub ufs_set_label {
my ($bdev, $label) = @_;
system('tunefs.ufs', '-L', $label, $bdev) or die "tunefs.ufs failed: $?";
_system('tunefs.ufs', '-L', $label, $bdev) or die "tunefs.ufs failed: $?";
}
sub xfs_set_label {
my ($bdev, $label) = @_;
system('xfs_admin', '-L', $label, $bdev) or die "xfs_admin failed: $?";
_system('xfs_admin', '-L', $label, $bdev) or die "xfs_admin failed: $?";
}
sub xfs_set_uuid {
my ($bdev, $uuid) = @_;
system('xfs_admin', '-U', $uuid, $bdev) or die "xfs_admin failed: $?";
_system('xfs_admin', '-U', $uuid, $bdev) or die "xfs_admin failed: $?";
}
my %filesystem_types = (
@ -995,10 +1128,11 @@ my %filesystem_types = (
);
my %bdev_map;
my @matched_configs;
my %id_map;
sub scan_config_files {
my @configs;
# Find all IDE/SCSI disks mentioned in configurations
for my $config (@config_files) {
# Is the file present?
@ -1011,7 +1145,7 @@ sub scan_config_files {
if ($! == POSIX::ENOENT) {
next;
}
die $!;
die "$!";
}
# Are any of the related packages wanted or installed?
@ -1029,10 +1163,12 @@ sub scan_config_files {
my @matched_bdevs = ();
my $id_map_text;
my $needs_update;
if (exists($config->{needs_update})) {
$id_map_text = &{$config->{needs_update}}($file);
} else {
$needs_update = defined($id_map_text) && $id_map_text ne '';
} elsif (exists($config->{list})) {
for my $bdev (&{$config->{list}}($file)) {
if ($bdev =~ m{^/dev/(?:[hs]d[a-z]\d*|s(?:cd|r)\d+)$} &&
-b $bdev) {
@ -1040,17 +1176,20 @@ sub scan_config_files {
push @matched_bdevs, $bdev;
}
}
$needs_update = @matched_bdevs > 0;
} else {
# Needs manual update
$needs_update = 1;
}
if (@matched_bdevs || $id_map_text) {
push @matched_configs, {config => $config,
devices => \@matched_bdevs,
id_map_text => $id_map_text,
installed => $installed};
}
push @configs, {config => $config,
devices => \@matched_bdevs,
id_map_text => $id_map_text,
installed => $installed,
needs_update => $needs_update};
}
my $fstab = new FileHandle('/etc/fstab', 'r');
my $fstab = new FileHandle('/etc/fstab', 'r') or die "$!";
while (1) {
my ($text, $bdev, $path, $type) = fstab_next($fstab);
last unless defined($text);
@ -1060,6 +1199,8 @@ sub scan_config_files {
}
}
$fstab->close();
return @configs;
}
sub add_tag {
@ -1089,9 +1230,15 @@ sub scan_devices {
}
# Discard all labels and UUIDs(!) that are ambiguous.
# Discard all labels with 'unsafe' characters (escaped by blkid using
# backslashes) as they will not be usable in all configuration files.
# Sort each device's IDs in reverse lexical order so that UUIDs are
# preferred.
for my $bdev (keys(%bdev_map)) {
@{$bdev_map{$bdev}->{ids}} = grep({ $#{$id_map{$_}} == 0 }
@{$bdev_map{$bdev}->{ids}});
@{$bdev_map{$bdev}->{ids}} =
sort({$b cmp $a}
grep({ @{$id_map{$_}} == 1 && $_ !~ /\\/ }
@{$bdev_map{$bdev}->{ids}}));
}
# Add persistent aliases for CD/DVD/BD drives
@ -1199,7 +1346,7 @@ sub update_config {
$map{$bdev} = $bdev_map{$bdev}->{ids}->[0];
}
for my $match (@matched_configs) {
for my $match (@_) {
# Generate a new config
my $path = $match->{config}->{path};
my $old = new FileHandle($path, 'r') or die "$!";
@ -1232,12 +1379,18 @@ sub transition {
use Debconf::Client::ConfModule ':all';
%bdev_map = ();
@matched_configs = ();
%id_map = ();
scan_config_files();
my @found_configs = scan_config_files();
my @matched_configs = grep({$_->{needs_update}} @found_configs);
my @auto_configs = grep({defined($_->{config}->{update})} @matched_configs);
my $found_boot_loader =
grep({$_->{config}->{is_boot_loader} && $_->{installed}} @found_configs);
if ($#matched_configs < 0) {
# We can skip all of this if we didn't find any configuration
# files that need conversion and we found the configuration file
# for an installed boot loader.
if (!@matched_configs && $found_boot_loader) {
return;
}
@ -1255,7 +1408,7 @@ sub transition {
($ret, $answer) = get($question);
die "Error retrieving answer for $question: $answer" if $ret;
if ($answer eq 'true') {
if (@auto_configs && $answer eq 'true') {
scan_devices();
assign_new_ids();
@ -1277,11 +1430,11 @@ sub transition {
grep({@{$bdev_map{$_}->{ids}}}
keys(%bdev_map))),
grep({defined}
map({$_->{id_map_text}} @matched_configs))));
map({$_->{id_map_text}} @auto_configs))));
die "Error setting debconf substitutions in $question: $seen" if $ret;
($ret, $seen) = subst($question, 'files',
join(', ',
map({$_->{config}->{path}} @matched_configs)));
map({$_->{config}->{path}} @auto_configs)));
die "Error setting debconf substitutions in $question: $seen" if $ret;
($ret, $seen) = input('high', $question);
if ($ret && $ret != 30) {
@ -1296,18 +1449,22 @@ sub transition {
if ($answer eq 'true') {
set_new_ids();
update_config();
update_config(@auto_configs);
}
}
my @unconv_files = ();
for my $match (@matched_configs) {
my @unconv_bdevs = grep({!exists($bdev_map{$_}->{ids}) ||
@{$bdev_map{$_}->{ids}} == 0}
@{$match->{devices}});
if (@unconv_bdevs) {
push @unconv_files, sprintf('%s: %s', $match->{config}->{path},
join(', ',@unconv_bdevs));
if (!defined($match->{config}->{update})) {
push @unconv_files, $match->{config}->{path};
} else {
my @unconv_bdevs = grep({!exists($bdev_map{$_}->{ids}) ||
@{$bdev_map{$_}->{ids}} == 0}
@{$match->{devices}});
if (@unconv_bdevs) {
push @unconv_files, sprintf('%s: %s', $match->{config}->{path},
join(', ',@unconv_bdevs));
}
}
}
if (@unconv_files) {
@ -1324,6 +1481,20 @@ sub transition {
die "Error showing debconf note $question: $seen";
}
}
# Also note whether some (unknown) boot loader configuration file
# must be manually converted.
if (!$found_boot_loader) {
$question = 'linux-base/disk-id-manual-boot-loader';
($ret, $seen) = input('high', $question);
if ($ret && $ret != 30) {
die "Error setting debconf note $question: $seen";
}
($ret, $seen) = go();
if ($ret && $ret != 30) {
die "Error showing debconf note $question: $seen";
}
}
}
package main;
@ -1334,12 +1505,33 @@ sub compare_versions {
return $AptPkg::Config::_config->system->versioning->compare(@_);
}
# No upgrade work is necessary during a fresh system installation.
# But since linux-base is a new dependency of linux-image-* and did
# not exist until needed for the libata transition, we cannot simply
# test whether this is a fresh installation of linux-base. Instead,
# we test:
# - does /etc/fstab exist yet (this won't even work without it), and
# - are any linux-image-* packages installed yet?
sub is_fresh_installation {
if (-f '/etc/fstab') {
for (`dpkg-query 2>/dev/null --showformat '\${status}\\n' -W 'linux-image-*'`) {
return 0 if / installed\n$/;
}
}
return 1;
}
my $deb_arch = `dpkg --print-architecture`;
chomp $deb_arch;
if (($deb_arch eq 'i386' || $deb_arch eq 'amd64') &&
($ARGV[0] eq 'reconfigure' || compare_versions($ARGV[1], '2.6.32-10') < 0)) {
DebianKernel::DiskId::transition();
if ($deb_arch ne 's390') {
my $libata_transition_ver =
($deb_arch eq 'i386' || $deb_arch eq 'amd64') ? '2.6.32-10' : '2.6.32-11';
if ($ARGV[0] eq 'reconfigure' || defined($ENV{DEBCONF_RECONFIGURE}) ||
(!is_fresh_installation() &&
compare_versions($ARGV[1], $libata_transition_ver) < 0)) {
DebianKernel::DiskId::transition();
}
}
exec("set -e\nset -- @ARGV\n" . << 'EOF');

View File

@ -1,7 +1,7 @@
Template: linux-base/disk-id-convert-auto
Type: boolean
Default: true
Description: Update disk device ids in system configuration?
_Description: Update disk device ids in system configuration?
The new Linux kernel version provides different drivers for some
PATA (IDE) controllers. The names of some hard disk, CD-ROM and
tape devices may change.
@ -14,7 +14,7 @@ Description: Update disk device ids in system configuration?
Template: linux-base/disk-id-convert-plan
Type: boolean
Default: true
Description: Apply these configuration changes to disk device ids?
_Description: Apply these configuration changes to disk device ids?
These devices will be assigned UUIDs or labels:
.
${relabel}
@ -30,7 +30,7 @@ Description: Apply these configuration changes to disk device ids?
Template: linux-base/disk-id-convert-plan-no-relabel
Type: boolean
Default: true
Description: Apply these configuration changes to disk device ids?
_Description: Apply these configuration changes to disk device ids?
These configuration files will be updated:
.
${files}
@ -41,8 +41,20 @@ Description: Apply these configuration changes to disk device ids?
Template: linux-base/disk-id-manual
Type: note
Description: Please check these configuration files before rebooting
_Description: Please check these configuration files before rebooting
These configuration files still use some device names that may
change when using the new kernel:
.
${unconverted}
Template: linux-base/disk-id-manual-boot-loader
Type: note
_Description: Check the boot loader configuration before rebooting
The boot loader configuration for this system was not recognised. These
settings in the configuration may need to be updated:
.
* The root device id passed as a kernel parameter
* The boot device id used to install and update the boot loader
.
We recommend that you identify these devices by UUID or label, except that
on MIPS systems this is not supported for the root device.

2
debian/po/POTFILES.in vendored Normal file
View File

@ -0,0 +1,2 @@
[type: gettext/rfc822deb] linux-base.templates
[type: gettext/rfc822deb] templates/temp.image.plain/templates

334
debian/po/templates.pot vendored Normal file
View File

@ -0,0 +1,334 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
"POT-Creation-Date: 2010-03-29 14:15+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
#. Description
#: ../linux-base.templates:1001
msgid "Update disk device ids in system configuration?"
msgstr ""
#. Type: boolean
#. Description
#: ../linux-base.templates:1001
msgid ""
"The new Linux kernel version provides different drivers for some PATA (IDE) "
"controllers. The names of some hard disk, CD-ROM and tape devices may "
"change."
msgstr ""
#. Type: boolean
#. Description
#: ../linux-base.templates:1001
msgid ""
"You are recommended to identify disk devices in configuration files by label "
"or UUID (unique identifier) rather than by device name, which will work with "
"both old and new kernel versions. Your system configuration can be updated "
"automatically in most cases."
msgstr ""
#. Type: boolean
#. Description
#. Type: boolean
#. Description
#: ../linux-base.templates:2001 ../linux-base.templates:3001
msgid "Apply these configuration changes to disk device ids?"
msgstr ""
#. Type: boolean
#. Description
#: ../linux-base.templates:2001
msgid "These devices will be assigned UUIDs or labels:"
msgstr ""
#. Type: boolean
#. Description
#: ../linux-base.templates:2001
msgid "${relabel}"
msgstr ""
#. Type: boolean
#. Description
#. Type: boolean
#. Description
#: ../linux-base.templates:2001 ../linux-base.templates:3001
msgid "These configuration files will be updated:"
msgstr ""
#. Type: boolean
#. Description
#. Type: boolean
#. Description
#: ../linux-base.templates:2001 ../linux-base.templates:3001
msgid "${files}"
msgstr ""
#. Type: boolean
#. Description
#. Type: boolean
#. Description
#: ../linux-base.templates:2001 ../linux-base.templates:3001
msgid "The device ids will be changed as follows:"
msgstr ""
#. Type: boolean
#. Description
#. Type: boolean
#. Description
#: ../linux-base.templates:2001 ../linux-base.templates:3001
msgid "${id_map}"
msgstr ""
#. Type: note
#. Description
#: ../linux-base.templates:4001
msgid "Please check these configuration files before rebooting"
msgstr ""
#. Type: note
#. Description
#: ../linux-base.templates:4001
msgid ""
"These configuration files still use some device names that may change when "
"using the new kernel:"
msgstr ""
#. Type: note
#. Description
#: ../linux-base.templates:4001
msgid "${unconverted}"
msgstr ""
#. Type: note
#. Description
#: ../linux-base.templates:5001
msgid "Check the boot loader configuration before rebooting"
msgstr ""
#. Type: note
#. Description
#: ../linux-base.templates:5001
msgid ""
"The boot loader configuration for this system was not recognised. These "
"settings in the configuration may need to be updated:"
msgstr ""
#. Type: note
#. Description
#: ../linux-base.templates:5001
msgid ""
" * The root device id passed as a kernel parameter\n"
" * The boot device id used to install and update the boot loader"
msgstr ""
#. Type: note
#. Description
#: ../linux-base.templates:5001
msgid ""
"We recommend that you identify these devices by UUID or label, except that "
"on MIPS systems this is not supported for the root device."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:1001
msgid "Abort installation after depmod error?"
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:1001
msgid ""
"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}"
"${CORE})."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:1001
msgid ""
"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
"not be deleted, even though it may be invalid."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:1001
msgid ""
"You should abort the installation and fix the errors in depmod, or "
"regenerate the initrd image with a known good modules.dep file. If you don't "
"abort the installation, there is a danger that the system will fail to boot."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
msgid "Run the default boot loader?"
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
msgid ""
"The default boot loader for this architecture is $loader, which is present."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
msgid ""
"However, there is no explicit request to run that boot loader in /etc/kernel-"
"img.conf while GRUB seems to be installed with a postinst hook set."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
msgid ""
"It thus seems that this system is using GRUB as boot loader instead of "
"$loader."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
msgid ""
"Please choose which should run: the default boot loader now, or the GRUB "
"update later."
msgstr ""
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates:3001
msgid "Error running the boot loader in test mode"
msgstr ""
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates:3001
msgid "An error occurred while running the ${loader} boot loader in test mode."
msgstr ""
#. Type: note
#. Description
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates:3001
#: ../templates/temp.image.plain/templates:4001
msgid ""
"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf "
"manually and re-run ${loader} to fix that issue and keep this system "
"bootable."
msgstr ""
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates:4001
msgid "Error running the boot loader"
msgstr ""
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates:4001
msgid "An error occurred while running the ${loader} boot loader."
msgstr ""
#. Type: boolean
#. Description
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:5001
#: ../templates/temp.image.plain/templates:6001
msgid "Abort kernel removal?"
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:5001
msgid ""
"You are running a kernel (version ${running}) and attempting to remove the "
"same version."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:5001
msgid ""
"This can make the system unbootable as it will remove /boot/vmlinuz-"
"${running} and all modules under the directory /lib/modules/${running}. This "
"can only be fixed with a copy of the kernel image and the corresponding "
"modules."
msgstr ""
#. Type: boolean
#. Description
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:5001
#: ../templates/temp.image.plain/templates:6001
msgid ""
"It is highly recommended to abort the kernel removal unless you are prepared "
"to fix the system after removal."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:6001
msgid ""
"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-"
"=V. Removing =ST-image-=V will invalidate that file."
msgstr ""
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:6001
msgid ""
"You will need to edit /etc/${loader}.conf or re-target symbolic links "
"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to "
"${kimage}-=V. Then, you will have to re-run ${loader}."
msgstr ""
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates:7001
msgid "Required firmware files may be missing"
msgstr ""
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates:7001
msgid ""
"This system is currently running Linux ${runningversion} and you are "
"installing Linux ${version}. In the new version some of the drivers used on "
"this system may require additional firmware files:"
msgstr ""
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates:7001
msgid "${missing}"
msgstr ""
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates:7001
msgid ""
"Most firmware files are not included in the Debian system because no source "
"code is available for them. You may need to reconfigure the package manager "
"to include the non-free section of the Debian archive before you can install "
"these firmware files."
msgstr ""

12
debian/rules.real vendored
View File

@ -154,6 +154,12 @@ install-base:
dh_md5sums
dh_builddeb -- $(BUILDDEB_ARGS)
install-dummy:
dh_testdir
dh_testroot
dh_prep
$(MAKE_SELF) install-base
install-doc: PACKAGE_NAME = linux-doc-$(VERSION)
install-doc: DIR = $(BUILD_DIR)/build-doc
install-doc: SOURCE_DIR = $(BUILD_DIR)/source
@ -263,6 +269,12 @@ endif
ln -s /usr/src/$(PACKAGE_NAME) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/build
ln -s /usr/src/$(PACKAGE_NAME_COMMON) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/source
install -d $(PACKAGE_DIR)/DEBIAN
sed -e 's/=V/$(REAL_VERSION)/g' \
debian/templates/temp.headers.plain/postinst \
> $(PACKAGE_DIR)/DEBIAN/postinst
chmod 755 $(PACKAGE_DIR)/DEBIAN/postinst
+$(MAKE_SELF) install-base
install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev

View File

@ -1,5 +1,5 @@
Package: xen-linux-system-@upstreamversion@@abiname@@localversion@
Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${binary:Version})
Description: XEN system with Linux @upstreamversion@ image on @class@
Description: Xen system with Linux @upstreamversion@ on @class@
This package depends on the binary Linux image and hypervisors.

View File

@ -1,7 +1,4 @@
add_network() {
yesno "Include network configuration and status from this computer? " nop
test $REPLY = yep || return 0
_add_etc_network_interfaces() {
echo '** Network interface configuration:' >&3
# Hide passwords/keys
awk '$1 ~ /key|pass|^wpa-(anonymous|identity|phase|pin|private|psk)/ { gsub(".", "*", $2); }
@ -9,6 +6,13 @@ add_network() {
!/^[[:space:]]*\#/ { print; }
' </etc/network/interfaces >&3
echo >&3
}
add_network() {
yesno "Include network configuration and status from this computer? " nop
test $REPLY = yep || return 0
_add_etc_network_interfaces
echo '** Network status:' >&3
if command -v ip >/dev/null; then
echo '*** IP interfaces and addresses:' >&3
@ -36,7 +40,5 @@ ask_network() {
yesno "Include network configuration from this computer? " nop
test $REPLY = yep || return 0
echo '** Network interface configuration:' >&3
cat /etc/network/interfaces >&3
echo >&3
_add_etc_network_interfaces
}

View File

@ -0,0 +1,26 @@
#!/usr/bin/perl
# Author: Michael Gilbert <michael.s.gilbert@gmail.com>
# Origin: Stripped down version of the linux-headers postinst from Ubuntu's
# 2.6.32-14-generic kernel, which was itself derived from a
# Debian linux-image postinst script.
$|=1;
my $version = "=V";
if (-d "/etc/kernel/header_postinst.d") {
print STDERR "Examining /etc/kernel/header_postinst.d.\n";
system ("run-parts --verbose --exit-on-error --arg=$version " .
"/etc/kernel/header_postinst.d") &&
die "Failed to process /etc/kernel/header_postinst.d";
}
if (-d "/etc/kernel/header_postinst.d/$version") {
print STDERR "Examining /etc/kernel/header_postinst.d/$version.\n";
system ("run-parts --verbose --exit-on-error --arg=$version " .
"/etc/kernel/header_postinst.d/$version") &&
die "Failed to process /etc/kernel/header_postinst.d/$version";
}
exit 0;
__END__

View File

@ -1,7 +1,7 @@
Template: =ST-image-=V/postinst/depmod-error-initrd-=V
Type: boolean
Default: false
Description: Abort installation after depmod error?
_Description: Abort installation after depmod error?
The 'depmod' command exited with the exit code ${exit_value}
(${SIGNAL}${CORE}).
.
@ -16,7 +16,7 @@ Description: Abort installation after depmod error?
Template: shared/kernel-image/really-run-bootloader
Type: boolean
Default: true
Description: Run the default boot loader?
_Description: Run the default boot loader?
The default boot loader for this architecture is $loader, which is
present.
.
@ -32,7 +32,7 @@ Description: Run the default boot loader?
Template: =ST-image-=V/postinst/bootloader-test-error-=V
Type: note
Description: Error running the boot loader in test mode
_Description: Error running the boot loader in test mode
An error occurred while running the ${loader} boot loader in test mode.
.
A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf
@ -41,7 +41,7 @@ Description: Error running the boot loader in test mode
Template: =ST-image-=V/postinst/bootloader-error-=V
Type: note
Description: Error running the boot loader
_Description: Error running the boot loader
An error occurred while running the ${loader} boot loader.
.
A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf
@ -51,7 +51,7 @@ Description: Error running the boot loader
Template: =ST-image-=V/prerm/removing-running-kernel-=V
Type: boolean
Default: true
Description: Abort kernel removal?
_Description: Abort kernel removal?
You are running a kernel (version ${running}) and attempting to remove
the same version.
.
@ -66,7 +66,7 @@ Description: Abort kernel removal?
Template: =ST-image-=V/prerm/would-invalidate-boot-loader-=V
Type: boolean
Default: true
Description: Abort kernel removal?
_Description: Abort kernel removal?
This system uses a valid /etc/${loader}.conf file that mentions
${kimage}-=V. Removing =ST-image-=V will invalidate
that file.
@ -80,7 +80,7 @@ Description: Abort kernel removal?
Template: =ST-image-=V/postinst/missing-firmware-=V
Type: note
Description: Required firmware files may be missing
_Description: Required firmware files may be missing
This system is currently running Linux ${runningversion} and you are
installing Linux ${version}. In the new version some of the drivers
used on this system may require additional firmware files: