[kernel] r10911 - in dists/etch/linux-2.6.24/debian: . patches/series
Author: waldi Date: Mon Mar 17 10:48:47 2008 New Revision: 10911 Log: * debian/changelog: Fix. * debian/patches/series/4: Move from debian/patches/series/4~etchnhalf.1. Added: dists/etch/linux-2.6.24/debian/patches/series/4 - copied unchanged from r10446, /dists/etch/linux-2.6.24/debian/patches/series/4~etchnhalf.1 Removed: dists/etch/linux-2.6.24/debian/patches/series/4~etchnhalf.1 Modified: dists/etch/linux-2.6.24/debian/changelog Modified: dists/etch/linux-2.6.24/debian/changelog == --- dists/etch/linux-2.6.24/debian/changelog(original) +++ dists/etch/linux-2.6.24/debian/changelogMon Mar 17 10:48:47 2008 @@ -1,9 +1,18 @@ -linux-2.6.24 (2.6.24-4~etchnhalf.1) UNRELEASED; urgency=low +linux-2.6 (2.6.24-4~etchnhalf.1) UNRELEASED; urgency=low - [ dann frazier ] - * Branch and rename source to linux-2.6.24 targeted for etchnhalf + * Branch and rename source to linux-2.6.24 targeted for etchnhalf. + + [ maximilian attems ] + * Enable IEEE1394 Firewire stack. + * topconfig: Turn off PATA_SIS. + * [amd64, i386]: Unset USB_SUSPEND. (closes: #419197) + * [amd64, i386]: Enable SONYPI_COMPAT. + * topconfig: Turn off PARPORT_PC_FIFO. + + -- Bastian Blank [EMAIL PROTECTED] Mon, 17 Mar 2008 11:46:39 +0100 + +linux-2.6 (2.6.24-4) UNRELEASED; urgency=low - [ Bastian Blank ] * Add stable release 2.6.24.1: - splice: missing user pointer access verification (CVE-2008-0009/10) - drm: the drm really should call pci_set_master.. @@ -51,14 +60,7 @@ - slab: fix bootstrap on memoryless node - DVB: cx23885: add missing subsystem ID for Hauppauge HVR1800 Retail - [ maximilian attems ] - * Enable IEEE1394 Firewire stack. - * topconfig: Turn off PATA_SIS. - * [amd64, i386]: Unset USB_SUSPEND. (closes: #419197) - * [amd64, i386]: Enable SONYPI_COMPAT. - * topconfig: Turn off PARPORT_PC_FIFO. - - -- dann frazier [EMAIL PROTECTED] Fri, 08 Feb 2008 16:46:20 -0700 + -- Bastian Blank [EMAIL PROTECTED] Fri, 08 Feb 2008 22:26:16 +0100 linux-2.6 (2.6.24-3) unstable; urgency=low ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10912 - dists/etch/linux-2.6.24/debian
Author: waldi Date: Mon Mar 17 10:53:01 2008 New Revision: 10912 Log: debian/changelog: Fix source name. Modified: dists/etch/linux-2.6.24/debian/changelog Modified: dists/etch/linux-2.6.24/debian/changelog == --- dists/etch/linux-2.6.24/debian/changelog(original) +++ dists/etch/linux-2.6.24/debian/changelogMon Mar 17 10:53:01 2008 @@ -1,4 +1,4 @@ -linux-2.6 (2.6.24-4~etchnhalf.1) UNRELEASED; urgency=low +linux-2.6.24 (2.6.24-4~etchnhalf.1) UNRELEASED; urgency=low * Branch and rename source to linux-2.6.24 targeted for etchnhalf. ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10913 - in dists/etch/linux-2.6.24: . debian debian/config/arm debian/patches/bugfix/all/stable debian/patches/series
Author: waldi Date: Mon Mar 17 10:55:29 2008 New Revision: 10913 Log: Merge /dists/sid/linux-2.6, 2.6.24-4. Added: dists/etch/linux-2.6.24/debian/patches/bugfix/all/stable/2.6.24.2.patch Modified: dists/etch/linux-2.6.24/ (props changed) dists/etch/linux-2.6.24/debian/changelog dists/etch/linux-2.6.24/debian/config/arm/config.iop32x dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx dists/etch/linux-2.6.24/debian/patches/series/4 Modified: dists/etch/linux-2.6.24/debian/changelog == --- dists/etch/linux-2.6.24/debian/changelog(original) +++ dists/etch/linux-2.6.24/debian/changelogMon Mar 17 10:55:29 2008 @@ -11,7 +11,7 @@ -- Bastian Blank [EMAIL PROTECTED] Mon, 17 Mar 2008 11:46:39 +0100 -linux-2.6 (2.6.24-4) UNRELEASED; urgency=low +linux-2.6 (2.6.24-4) unstable; urgency=low * Add stable release 2.6.24.1: - splice: missing user pointer access verification (CVE-2008-0009/10) @@ -60,7 +60,16 @@ - slab: fix bootstrap on memoryless node - DVB: cx23885: add missing subsystem ID for Hauppauge HVR1800 Retail - -- Bastian Blank [EMAIL PROTECTED] Fri, 08 Feb 2008 22:26:16 +0100 + [ Martin Michlmayr ] + * [arm/ixp4xx] Enble ATA_OVER_ETH, requested by Nicola Fankhauser. + * [arm/iop32x] Enble ATA_OVER_ETH. + + [ Bastian Blank ] + * Add stable release 2.6.24.2: +- splice: fix user pointer access in get_iovec_page_array() +(CVE-2008-0600, closes: #464945) + + -- Bastian Blank [EMAIL PROTECTED] Mon, 11 Feb 2008 12:29:23 +0100 linux-2.6 (2.6.24-3) unstable; urgency=low Modified: dists/etch/linux-2.6.24/debian/config/arm/config.iop32x == --- dists/etch/linux-2.6.24/debian/config/arm/config.iop32x (original) +++ dists/etch/linux-2.6.24/debian/config/arm/config.iop32x Mon Mar 17 10:55:29 2008 @@ -439,7 +439,7 @@ CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=8192 # CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set +CONFIG_ATA_OVER_ETH=m # # ATA/ATAPI/MFM/RLL support Modified: dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx == --- dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx (original) +++ dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx Mon Mar 17 10:55:29 2008 @@ -585,7 +585,7 @@ CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=8192 # CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set +CONFIG_ATA_OVER_ETH=m # # ATA/ATAPI/MFM/RLL support Added: dists/etch/linux-2.6.24/debian/patches/bugfix/all/stable/2.6.24.2.patch == --- (empty file) +++ dists/etch/linux-2.6.24/debian/patches/bugfix/all/stable/2.6.24.2.patch Mon Mar 17 10:55:29 2008 @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index e6a6eec..6f79564 100644 +diff --git a/fs/splice.c b/fs/splice.c +index 36fdc61..e313478 100644 +--- a/fs/splice.c b/fs/splice.c +@@ -1239,7 +1239,7 @@ static int get_iovec_page_array(const struct iovec __user *iov, + if (unlikely(!len)) + break; + error = -EFAULT; +- if (unlikely(!base)) ++ if (!access_ok(VERIFY_READ, base, len)) + break; + + /* Modified: dists/etch/linux-2.6.24/debian/patches/series/4 == --- dists/etch/linux-2.6.24/debian/patches/series/4 (original) +++ dists/etch/linux-2.6.24/debian/patches/series/4 Mon Mar 17 10:55:29 2008 @@ -1,2 +1,3 @@ - bugfix/all/slab-fix-bootstrap-on-memoryless-node.patch + bugfix/all/stable/2.6.24.1.patch ++ bugfix/all/stable/2.6.24.2.patch ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10914 - in dists/etch/linux-2.6.24/debian: . config
Author: waldi Date: Mon Mar 17 11:02:19 2008 New Revision: 10914 Log: * debian/changelog: Update. * debian/config/defines: Disable Xen featureset. Modified: dists/etch/linux-2.6.24/debian/changelog dists/etch/linux-2.6.24/debian/config/defines Modified: dists/etch/linux-2.6.24/debian/changelog == --- dists/etch/linux-2.6.24/debian/changelog(original) +++ dists/etch/linux-2.6.24/debian/changelogMon Mar 17 11:02:19 2008 @@ -9,6 +9,9 @@ * [amd64, i386]: Enable SONYPI_COMPAT. * topconfig: Turn off PARPORT_PC_FIFO. + [ Bastian Blank ] + * Disable Xen images. + -- Bastian Blank [EMAIL PROTECTED] Mon, 17 Mar 2008 11:46:39 +0100 linux-2.6 (2.6.24-4) unstable; urgency=low Modified: dists/etch/linux-2.6.24/debian/config/defines == --- dists/etch/linux-2.6.24/debian/config/defines (original) +++ dists/etch/linux-2.6.24/debian/config/defines Mon Mar 17 11:02:19 2008 @@ -26,6 +26,9 @@ [featureset-vserver_base] enabled: false +[featureset-xen_base] +enabled: false + [featureset-xen-vserver_base] enabled: false ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10915 - dists/etch/linux-2.6.24/debian
Author: waldi Date: Mon Mar 17 11:03:34 2008 New Revision: 10915 Log: * debian/changelog: Update. * debian/rules: Force source name to linux-2.6. Modified: dists/etch/linux-2.6.24/debian/changelog dists/etch/linux-2.6.24/debian/rules Modified: dists/etch/linux-2.6.24/debian/changelog == --- dists/etch/linux-2.6.24/debian/changelog(original) +++ dists/etch/linux-2.6.24/debian/changelogMon Mar 17 11:03:34 2008 @@ -11,6 +11,7 @@ [ Bastian Blank ] * Disable Xen images. + * Force orig name to linux-2.6. -- Bastian Blank [EMAIL PROTECTED] Mon, 17 Mar 2008 11:46:39 +0100 Modified: dists/etch/linux-2.6.24/debian/rules == --- dists/etch/linux-2.6.24/debian/rules(original) +++ dists/etch/linux-2.6.24/debian/rulesMon Mar 17 11:03:34 2008 @@ -5,7 +5,7 @@ SHELL:= sh -e DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) -SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p') +SOURCE := linux-2.6 VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p') VERSION := $(shell echo $(VERSION_DEBIAN) | sed -e 's,-[^-]*$$,,') VERSION_DEBIAN_BINNMU := $(shell echo $(VERSION_DEBIAN) | sed -ne 's,.*\+b\(.*\)$$,\1,p') ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10894 - dists/trunk/linux-2.6/debian/config/alpha
Author: waldi Date: Sat Mar 15 10:58:35 2008 New Revision: 10894 Log: debian/config/alpha: Remove silent options. Modified: dists/trunk/linux-2.6/debian/config/alpha/config dists/trunk/linux-2.6/debian/config/alpha/config.alpha-generic dists/trunk/linux-2.6/debian/config/alpha/config.alpha-legacy Modified: dists/trunk/linux-2.6/debian/config/alpha/config == --- dists/trunk/linux-2.6/debian/config/alpha/config(original) +++ dists/trunk/linux-2.6/debian/config/alpha/configSat Mar 15 10:58:35 2008 @@ -6,11 +6,6 @@ ## ## file: arch/alpha/Kconfig ## -CONFIG_ALPHA=y -CONFIG_64BIT=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_ISA_DMA=y -# CONFIG_GENERIC_IOMAP is not set ## choice: Alpha system type CONFIG_ALPHA_GENERIC=y # CONFIG_ALPHA_ALCOR is not set @@ -45,17 +40,9 @@ # CONFIG_ALPHA_TITAN is not set # CONFIG_ALPHA_WILDFIRE is not set ## end choice -CONFIG_ISA=y -CONFIG_ISA_DMA_API=y -CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y -CONFIG_ALPHA_CORE_AGP=y -CONFIG_ALPHA_BROKEN_IRQ_MASK=y -CONFIG_EISA=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set # CONFIG_VERBOSE_MCHECK is not set CONFIG_SRM_ENV=m -CONFIG_DUMMY_CONSOLE=y ## ## file: arch/alpha/Kconfig.debug @@ -77,7 +64,6 @@ CONFIG_ATM_IDT77252=m # CONFIG_ATM_IDT77252_DEBUG is not set # CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y CONFIG_ATM_AMBASSADOR=m # CONFIG_ATM_AMBASSADOR_DEBUG is not set CONFIG_ATM_HORIZON=m @@ -87,7 +73,6 @@ # CONFIG_ATM_FORE200E_USE_TASKLET is not set CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_FORE200E=m CONFIG_ATM_HE=m CONFIG_ATM_HE_USE_SUNI=y @@ -155,7 +140,6 @@ ## CONFIG_VT=y CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m @@ -335,11 +319,9 @@ CONFIG_BLK_DEV_IDEFLOPPY=m CONFIG_IDE_GENERIC=m CONFIG_BLK_DEV_IDEPNP=y -CONFIG_BLK_DEV_IDEPCI=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=m CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_AEC62XX=m CONFIG_BLK_DEV_ALI15X3=m # CONFIG_WDC_ALI15X3 is not set @@ -369,8 +351,6 @@ CONFIG_BLK_DEV_HT6560B=m CONFIG_BLK_DEV_QD65XX=m CONFIG_BLK_DEV_UMC8672=m -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_BLK_DEV_HD is not set ## ## file: drivers/input/Kconfig @@ -505,7 +485,6 @@ CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m CONFIG_ISDN_CAPI_CAPIDRV=m ## @@ -581,7 +560,6 @@ CONFIG_HISAX_HFCUSB=m CONFIG_HISAX_HFC4S8S=m CONFIG_HISAX_FRITZ_PCIPNP=m -CONFIG_HISAX_HDLC=y ## ## file: drivers/isdn/hysdn/Kconfig @@ -619,20 +597,6 @@ CONFIG_ISDN_DRV_SC=m ## -## file: drivers/media/Kconfig -## -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m - -## -## file: drivers/media/common/Kconfig -## -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m - -## ## file: drivers/media/dvb/dvb-core/Kconfig ## CONFIG_DVB_CORE=m @@ -727,7 +691,6 @@ ## CONFIG_MTD_CFI=m CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m CONFIG_MTD_CFI_ADV_OPTIONS=y ## choice: Flash cmd/query data swapping # CONFIG_MTD_CFI_NOSWAP is not set @@ -749,7 +712,6 @@ CONFIG_MTD_CFI_INTELEXT=m CONFIG_MTD_CFI_AMDSTD=m CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m CONFIG_MTD_RAM=m CONFIG_MTD_ROM=m CONFIG_MTD_ABSENT=m @@ -770,8 +732,6 @@ CONFIG_MTD_DOC2000=m CONFIG_MTD_DOC2001=m CONFIG_MTD_DOC2001PLUS=m -CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m CONFIG_MTD_DOCPROBE_ADVANCED=y CONFIG_MTD_DOCPROBE_ADDRESS=0x CONFIG_MTD_DOCPROBE_HIGH=y @@ -792,7 +752,6 @@ ## CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_VERIFY_WRITE is not set -CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_DISKONCHIP is not set CONFIG_MTD_NAND_NANDSIM=y @@ -900,9 +859,7 @@ # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m -CONFIG_NETPOLL=y CONFIG_NETPOLL_TRAP=y -CONFIG_NET_POLL_CONTROLLER=y ## ## file: drivers/net/appletalk/Kconfig @@ -1059,7 +1016,6 @@ CONFIG_I82092=m CONFIG_I82365=m CONFIG_TCIC=m -CONFIG_PCCARD_NONSTATIC=m ## ## file: drivers/pnp/Kconfig @@ -1153,8 +1109,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m ## @@ -1167,8 +1121,6 @@ ## ## file: drivers/usb/Kconfig ## -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB=m CONFIG_USB_USS720=m @@ -1197,7 +1149,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_OHCI_HCD=m -CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m @@ -1245,8 +1196,6 @@ ## file: drivers/video/Kconfig ## CONFIG_FB=y -CONFIG_FB_CFB_IMAGEBLIT=m -# CONFIG_FB_MACMODES is not set CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y CONFIG_FB_CIRRUS=m @@ -1390,11 +1339,6 @@ #
[kernel] r10895 - dists/trunk/linux-2.6/debian/config
Author: waldi Date: Sat Mar 15 11:07:25 2008 New Revision: 10895 Log: debian/config/config: Add missing choice values. Modified: dists/trunk/linux-2.6/debian/config/config Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Sat Mar 15 11:07:25 2008 @@ -1116,6 +1116,8 @@ CONFIG_B43LEGACY_DEBUG=y ## choice: Broadcom 43xx-legacy data transfer mode CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set ## end choice ## @@ -1790,6 +1792,7 @@ # CONFIG_RT_GROUP_SCHED is not set ## choice: Basis for grouping tasks CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set ## end choice CONFIG_CGROUP_CPUACCT=y # CONFIG_RESOURCE_COUNTERS is not set @@ -1836,6 +1839,7 @@ ## choice: Timer frequency # CONFIG_HZ_100 is not set CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set ## end choice @@ -2162,7 +2166,10 @@ CONFIG_MAC80211=m ## choice: Default rate control algorithm CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set +# CONFIG_MAC80211_RC_DEFAULT_NONE is not set ## end choice +CONFIG_MAC80211_RC_PID=m # CONFIG_MAC80211_RC_SIMPLE is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10835 - dists/trunk/linux-2.6/debian/config/powerpc
Author: waldi Date: Fri Mar 14 10:55:52 2008 New Revision: 10835 Log: debian/config/powerpc/config.powerpc: Disable PPC_LITE5200. Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc == --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Fri Mar 14 10:55:52 2008 @@ -20,7 +20,7 @@ CONFIG_PPC_MPC52xx=y # CONFIG_PPC_MPC5200_SIMPLE is not set CONFIG_PPC_EFIKA=y -CONFIG_PPC_LITE5200=y +# CONFIG_PPC_LITE5200 is not set CONFIG_PPC_MPC5200_BUGFIX=y # CONFIG_PPC_PREP is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10836 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package
Author: waldi
Date: Fri Mar 14 11:24:11 2008
New Revision: 10836
Log:
lib/kconfigeditor/kconfig/package/files.py: Don't ignore silent options by
default.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
---
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
(original)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Fri Mar 14 11:24:11 2008
@@ -126,11 +126,11 @@
if e is not None:
if i.name in processed:
pass
-elif i.prompt:
+elif not i.prompt and ignored is not None:
+ignored.add(i.name)
+else:
processed.add(i.name)
ret.append(e)
-else:
-ignored.add(i.name)
return ret
def _dump_file(self, processed, ignored, f):
@@ -145,7 +145,7 @@
ret.append('')
return ret
-def dump(self, root, menufiles):
+def dump(self, root, menufiles, ignore_silent = False):
filename = os.path.join(root, self.filename)
if not os.path.exists(os.path.dirname(filename)):
os.makedirs(os.path.dirname(filename))
@@ -165,7 +165,7 @@
processed = set()
ignored = set()
for f in menufiles:
-ret.extend(self._dump_file(processed, ignored, f))
+ret.extend(self._dump_file(processed, ignore_silent and ignored or
None, f))
s = set(self.keys())
unprocessed = s - processed - ignored
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10842 - dists/trunk/linux-2.6/debian/config
Author: waldi Date: Fri Mar 14 12:25:27 2008 New Revision: 10842 Log: debian/config/config: Remove one option too much. Modified: dists/trunk/linux-2.6/debian/config/config Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 12:25:27 2008 @@ -152,6 +152,7 @@ ## file: drivers/base/Kconfig ## CONFIG_UEVENT_HELPER_PATH=/sbin/hotplug +CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m # CONFIG_DEBUG_DRIVER is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10843 - dists/trunk/linux-2.6/debian/config/s390
Author: waldi Date: Fri Mar 14 12:26:13 2008 New Revision: 10843 Log: debian/config/s390/config: Remove unused options. Modified: dists/trunk/linux-2.6/debian/config/s390/config Modified: dists/trunk/linux-2.6/debian/config/s390/config == --- dists/trunk/linux-2.6/debian/config/s390/config (original) +++ dists/trunk/linux-2.6/debian/config/s390/config Fri Mar 14 12:26:13 2008 @@ -174,16 +174,6 @@ # CONFIG_ATM is not set ## -## file: net/ax25/Kconfig -## -# CONFIG_HAMRADIO is not set - -## -## file: net/bluetooth/Kconfig -## -# CONFIG_BT is not set - -## ## file: net/bridge/Kconfig ## # CONFIG_BRIDGE is not set @@ -209,11 +199,6 @@ # CONFIG_IPX is not set ## -## file: net/irda/Kconfig -## -# CONFIG_IRDA is not set - -## ## file: net/iucv/Kconfig ## CONFIG_IUCV=m ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10844 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu
Author: waldi
Date: Fri Mar 14 12:52:09 2008
New Revision: 10844
Log:
lib/kconfigeditor/kconfig/menu/all.py: Also see drivers/$ARCH as arch-specific.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
==
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
Fri Mar 14 12:52:09 2008
@@ -14,7 +14,8 @@
while work:
filename = work.pop(0)
-if filename.startswith('arch'):
+filename_list = filename.split('/')
+if filename_list[0] == 'arch' or filename_list[0] == 'drivers'
and filename_list[1] in arches:
self.filenames_arch[arch].append(filename)
else:
self.filenames_all.append(filename)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10845 - people/waldi/utils/kconfigeditor2/bin
Author: waldi Date: Fri Mar 14 12:53:37 2008 New Revision: 10845 Log: bin/process.py: Add option to ignore silent values. Modified: people/waldi/utils/kconfigeditor2/bin/process.py Modified: people/waldi/utils/kconfigeditor2/bin/process.py == --- people/waldi/utils/kconfigeditor2/bin/process.py(original) +++ people/waldi/utils/kconfigeditor2/bin/process.pyFri Mar 14 12:53:37 2008 @@ -2,7 +2,7 @@ import optparse, os, sys -def main(package, source, config_output): +def main(package, source, config_output, ignore_silent): from kconfigeditor.kconfig.menu.all import All from kconfigeditor.kconfig.package.files import Files @@ -25,7 +25,7 @@ menufiles = menu.files_all.values() else: menufiles = menu.files_arch[arch].values() -file.dump(config_output, menufiles) +file.dump(config_output, menufiles, ignore_silent) if __name__ == '__main__': try: @@ -42,6 +42,13 @@ help = output directory for config [default: PACKAGE/debian/config] ) options.add_option( +-i, --ignore_silent, +action = store_true, +default = False, +dest = ignore_silent, +help = Ignore silent options (options without any prompt) +) +options.add_option( -s, --source, dest = source, help = location of linux source [default: PACKAGE] @@ -56,9 +63,9 @@ package = args[0] source = opts.source or package -config_output = opts.config_output or os.path.join(package_root, 'debian/config') +config_output = opts.config_output or os.path.join(package, 'debian/config') sys.path.append(os.path.join(package, debian/lib/python)) -main(package, source, config_output) +main(package, source, config_output, opts.ignore_silent) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10846 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package
Author: waldi
Date: Fri Mar 14 13:07:55 2008
New Revision: 10846
Log:
lib/kconfigeditor/kconfig/package/files.py:
Only accept option with prompt if defined more than once.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
---
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
(original)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Fri Mar 14 13:07:55 2008
@@ -110,41 +110,59 @@
self.read(fd)
-def _dump_file_choice(self, processed, ignored, f):
+def _dump_file_choice(self, processed, ignored, have_prompt, f):
ret = []
for i in f:
if isinstance(i, FileConfig):
-ret.extend(self._dump_file_config(processed, ignored, i))
+ret.extend(self._dump_file_config(processed, ignored,
have_prompt, i))
if ret:
ret.insert(0, ## choice: %s % f.prompt)
ret.append('## end choice')
return ret
-def _dump_file_config(self, processed, ignored, i):
-ret = []
+def _dump_file_config(self, processed, ignored, have_prompt, i):
e = self.get(i.name, None)
-if e is not None:
-if i.name in processed:
-pass
-elif not i.prompt and ignored is not None:
+if e is None:
+return []
+
+if i.name in processed:
+return []
+if not i.prompt:
+if i.name in have_prompt:
+return []
+if ignored is not None:
ignored.add(i.name)
-else:
-processed.add(i.name)
-ret.append(e)
-return ret
+return []
+processed.add(i.name)
+return [e]
-def _dump_file(self, processed, ignored, f):
+def _dump_file(self, processed, ignored, have_prompt, f):
ret = []
for i in f:
if isinstance(i, FileConfig):
-ret.extend(self._dump_file_config(processed, ignored, i))
+ret.extend(self._dump_file_config(processed, ignored,
have_prompt, i))
elif isinstance(i, FileChoice):
-ret.extend(self._dump_file_choice(processed, ignored, i))
+ret.extend(self._dump_file_choice(processed, ignored,
have_prompt, i))
if ret:
ret[0:0] = [##, ## file: %s % f.filename, ##]
ret.append('')
return ret
+def _dump_prompt_file_config(self, have_prompt, i):
+e = self.get(i.name, None)
+if e is not None:
+if i.prompt:
+have_prompt.add(i.name)
+
+def _dump_prompt_file(self, have_prompt, f):
+for i in f:
+if isinstance(i, FileConfig):
+self._dump_prompt_file_config(have_prompt, i)
+elif isinstance(i, FileChoice):
+for i1 in i:
+if isinstance(i1, FileConfig):
+self._dump_prompt_file_config(have_prompt, i1)
+
def dump(self, root, menufiles, ignore_silent = False):
filename = os.path.join(root, self.filename)
if not os.path.exists(os.path.dirname(filename)):
@@ -161,13 +179,17 @@
menufiles.sort(key = menufiles_cmp_key)
+have_prompt = set()
+for f in menufiles:
+self._dump_prompt_file(have_prompt, f)
+
ret = []
processed = set()
ignored_sub = ignored = set()
if not ignore_silent:
ignored_sub = None
for f in menufiles:
-ret.extend(self._dump_file(processed, ignored_sub, f))
+ret.extend(self._dump_file(processed, ignored_sub, have_prompt, f))
s = set(self.keys())
unprocessed = s - processed - ignored
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10847 - in dists/trunk/linux-2.6/debian/config: alpha amd64 arm hppa i386 ia64 mips mipsel sparc
Author: waldi Date: Fri Mar 14 13:11:53 2008 New Revision: 10847 Log: debian/config: Fix some small problems. Modified: dists/trunk/linux-2.6/debian/config/alpha/config dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/arm/config.footbridge dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/hppa/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/ia64/config dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp Modified: dists/trunk/linux-2.6/debian/config/alpha/config == --- dists/trunk/linux-2.6/debian/config/alpha/config(original) +++ dists/trunk/linux-2.6/debian/config/alpha/configFri Mar 14 13:11:53 2008 @@ -1194,7 +1194,6 @@ # CONFIG_USB_DEBUG is not set CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set ## ## file: drivers/usb/gadget/Kconfig @@ -1207,6 +1206,7 @@ # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_OTG is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set ## end choice CONFIG_USB_GADGET_DUALSPEED=y Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 13:11:53 2008 @@ -1312,7 +1312,6 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set ## ## file: drivers/usb/gadget/Kconfig @@ -1325,6 +1324,7 @@ # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_OTG is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set ## end choice CONFIG_USB_GADGET_DUALSPEED=y Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge == --- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 13:11:53 2008 @@ -60,7 +60,6 @@ ## ## file: arch/arm/Kconfig.debug ## -CONFIG_FRAME_POINTER=y CONFIG_DEBUG_USER=y # CONFIG_DEBUG_ERRORS is not set # CONFIG_DEBUG_LL is not set @@ -1007,7 +1006,6 @@ CONFIG_USB_DEBUG=y CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set ## ## file: drivers/usb/gadget/Kconfig @@ -1355,6 +1353,7 @@ # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_INFO is not set +CONFIG_FRAME_POINTER=y # CONFIG_RCU_TORTURE_TEST is not set ## Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 13:11:53 2008 @@ -54,7 +54,6 @@ ## ## file: arch/arm/Kconfig.debug ## -CONFIG_FRAME_POINTER=y # CONFIG_DEBUG_USER is not set ## @@ -719,7 +718,6 @@ # CONFIG_USB_DEBUG is not set CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set ## ## file: drivers/usb/host/Kconfig @@ -837,6 +835,7 @@ # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_KERNEL is not set +CONFIG_FRAME_POINTER=y ## ## file: mm/Kconfig Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx == --- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 13:11:53 2008 @@ -59,7 +59,6 @@ ## ## file: arch/arm/Kconfig.debug ## -CONFIG_FRAME_POINTER=y # CONFIG_DEBUG_USER is not set ## @@ -680,7 +679,6 @@ # CONFIG_USB_DEBUG is not set CONFIG_USB_DEVICEFS=y # CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set ## ## file:
[kernel] r10848 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package
Author: waldi
Date: Fri Mar 14 13:19:14 2008
New Revision: 10848
Log:
lib/kconfigeditor/kconfig/package/files.py: Also accept CONFIG_*=n as unset.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
---
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
(original)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Fri Mar 14 13:19:14 2008
@@ -212,7 +212,7 @@
i = line.find('=')
option = line[7:i]
value = line[i+1:]
-if value in ('y', 'm'):
+if value in ('y', 'm', 'n'):
entry = FileEntryTristate(option, value)
else:
entry = FileEntryString(option, value)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10851 - dists/trunk/linux-2.6/debian/config/sparc
Author: waldi Date: Fri Mar 14 13:29:55 2008 New Revision: 10851 Log: debian/config/sparc: Remove silent options. Modified: dists/trunk/linux-2.6/debian/config/sparc/config dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp Modified: dists/trunk/linux-2.6/debian/config/sparc/config == --- dists/trunk/linux-2.6/debian/config/sparc/config(original) +++ dists/trunk/linux-2.6/debian/config/sparc/configFri Mar 14 13:29:55 2008 @@ -1,13 +1,6 @@ ## ## file: arch/sparc/Kconfig ## -CONFIG_GENERIC_ISA_DMA=y -CONFIG_SPARC=y -CONFIG_SBUS=y -CONFIG_SBUSCHAR=y -CONFIG_SUN_AUXIO=y -CONFIG_SUN_IO=y -CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_PCI=y CONFIG_SUN_OPENPROMFS=m @@ -26,7 +19,6 @@ ## CONFIG_VT=y CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set @@ -153,9 +145,7 @@ # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m -CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y ## ## file: drivers/net/appletalk/Kconfig @@ -206,11 +196,8 @@ ## ## file: drivers/serial/Kconfig ## -CONFIG_SERIAL_SUNCORE=y CONFIG_SERIAL_SUNZILOG=y CONFIG_SERIAL_SUNZILOG_CONSOLE=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m ## @@ -219,12 +206,6 @@ # CONFIG_PHONE is not set ## -## file: drivers/usb/Kconfig -## -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y - -## ## file: drivers/usb/gadget/Kconfig ## # CONFIG_USB_GADGET is not set @@ -233,8 +214,6 @@ ## file: drivers/video/Kconfig ## CONFIG_FB=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_MACMODES is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_ASILIANT is not set @@ -264,7 +243,6 @@ ## file: drivers/video/console/Kconfig ## CONFIG_PROM_CONSOLE=y -CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_SUN8x16=y @@ -291,9 +269,6 @@ ## file: fs/Kconfig ## CONFIG_EXT2_FS=y -CONFIG_JBD=m -CONFIG_FS_MBCACHE=y -CONFIG_SUNRPC_GSS=m ## ## file: fs/ncpfs/Kconfig @@ -335,7 +310,6 @@ ## choice: Memory model # CONFIG_DISCONTIGMEM_MANUAL is not set ## end choice -CONFIG_SPLIT_PTLOCK_CPUS=4 ## ## file: net/atm/Kconfig @@ -397,7 +371,6 @@ ## ## file: net/llc/Kconfig ## -CONFIG_LLC=m CONFIG_LLC2=m ## @@ -420,10 +393,6 @@ ## ## file: sound/core/Kconfig ## -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m # CONFIG_SND_VERBOSE_PRINTK is not set @@ -432,9 +401,6 @@ ## ## file: sound/drivers/Kconfig ## -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_AC97_CODEC=m # CONFIG_SND_DUMMY is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 == --- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64(original) +++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64Fri Mar 14 13:29:55 2008 @@ -6,23 +6,14 @@ ## ## file: arch/sparc64/Kconfig ## -CONFIG_SPARC64=y -CONFIG_64BIT=y ## choice: Kernel page size CONFIG_SPARC64_PAGE_SIZE_8KB=y # CONFIG_SPARC64_PAGE_SIZE_64KB is not set # CONFIG_SPARC64_PAGE_SIZE_512KB is not set # CONFIG_SPARC64_PAGE_SIZE_4MB is not set ## end choice -CONFIG_SYSVIPC_COMPAT=y # CONFIG_SMP is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_PCI_DOMAINS=y CONFIG_SPARC32_COMPAT=y -CONFIG_COMPAT=y # CONFIG_BINFMT_AOUT32 is not set CONFIG_SOLARIS_EMUL=m # CONFIG_CMDLINE_BOOL is not set @@ -160,11 +151,9 @@ CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_IDEPCI=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=m # CONFIG_BLK_DEV_OPTI621 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_AEC62XX is not set CONFIG_BLK_DEV_ALI15X3=m # CONFIG_WDC_ALI15X3 is not set @@ -187,8 +176,6 @@ CONFIG_BLK_DEV_TRM290=m CONFIG_BLK_DEV_VIA82CXXX=m # CONFIG_IDE_ARM is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_BLK_DEV_HD is not set ## ## file: drivers/input/mouse/Kconfig @@ -205,10 +192,6 @@ ## file: drivers/media/Kconfig ## CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m ## ## file: drivers/media/radio/Kconfig @@ -398,7 +381,6 @@ CONFIG_USB_EHCI_HCD=m # CONFIG_USB_EHCI_ROOT_HUB_TT is not set CONFIG_USB_OHCI_HCD=m -CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=m # CONFIG_USB_SL811_HCD is not set @@ -476,7 +458,6 @@ ## ## file: init/Kconfig ## -CONFIG_BROKEN_ON_SMP=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_PROFILING is not
[kernel] r10852 - dists/trunk/linux-2.6/debian/config/i386
Author: waldi Date: Fri Mar 14 13:31:10 2008 New Revision: 10852 Log: debian/config/i386: Remove silent options. Modified: dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/i386/config.486 dists/trunk/linux-2.6/debian/config/i386/config.686 dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 13:31:10 2008 @@ -7,20 +7,6 @@ ## ## file: arch/x86/Kconfig ## -CONFIG_X86_32=y -CONFIG_X86=y -CONFIG_GENERIC_TIME=y -CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_DMI=y -# CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_BIOS_REBOOT=y -CONFIG_KTIME_SCALAR=y ## choice: Subarchitecture Type CONFIG_X86_PC=y # CONFIG_X86_ELAN is not set @@ -36,17 +22,13 @@ CONFIG_VMI=y CONFIG_PARAVIRT=y CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y CONFIG_VM86=y CONFIG_TOSHIBA=m CONFIG_I8K=m # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_MICROCODE=m -CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m ## choice: High Memory Support @@ -58,11 +40,7 @@ # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set ## end choice -CONFIG_PAGE_OFFSET=0xC000 # CONFIG_X86_PAE is not set -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_MTRR=y CONFIG_EFI=y # CONFIG_IRQBALANCE is not set @@ -86,15 +64,11 @@ # CONFIG_PCI_GODIRECT is not set CONFIG_PCI_GOANY=y ## end choice -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y # CONFIG_DMAR is not set -CONFIG_ISA_DMA_API=y CONFIG_ISA=y CONFIG_SCx200=m CONFIG_SCx200HR_TIMER=m -CONFIG_K8_NB=y ## ## file: arch/x86/Kconfig.cpu @@ -129,8 +103,6 @@ # CONFIG_DEBUG_RODATA is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_4KSTACKS is not set -CONFIG_X86_FIND_SMP_CONFIG=y -CONFIG_X86_MPPARSE=y CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_BOOT_PARAMS is not set # CONFIG_CPA_DEBUG is not set @@ -141,7 +113,6 @@ CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m -CONFIG_X86_POWERNOW_K7_ACPI=y CONFIG_X86_POWERNOW_K8=m CONFIG_X86_POWERNOW_K8_ACPI=y CONFIG_X86_GX_SUSPMOD=m @@ -155,7 +126,6 @@ CONFIG_X86_LONGHAUL=m CONFIG_X86_E_POWERSAVER=m # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set -CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y ## @@ -187,7 +157,6 @@ ## file: drivers/acpi/Kconfig ## CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_SYSFS_POWER=y @@ -206,9 +175,6 @@ CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_EC=y -CONFIG_ACPI_POWER=y -CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m @@ -237,7 +203,6 @@ CONFIG_ATM_IDT77252=m # CONFIG_ATM_IDT77252_DEBUG is not set # CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y CONFIG_ATM_AMBASSADOR=m # CONFIG_ATM_AMBASSADOR_DEBUG is not set CONFIG_ATM_HORIZON=m @@ -249,7 +214,6 @@ # CONFIG_ATM_FORE200E_USE_TASKLET is not set CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_FORE200E=m CONFIG_ATM_HE=m CONFIG_ATM_HE_USE_SUNI=y @@ -331,7 +295,6 @@ ## CONFIG_VT=y CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y CONFIG_SERIAL_NONSTANDARD=y CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m @@ -348,7 +311,6 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m -CONFIG_VIRTIO_CONSOLE=y CONFIG_NVRAM=m CONFIG_RTC=m CONFIG_GEN_RTC=m @@ -424,7 +386,6 @@ ## file: drivers/cpufreq/Kconfig ## CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m ## choice: Default CPUFreq governor @@ -594,12 +555,10 @@ CONFIG_BLK_DEV_CMD640=y # CONFIG_BLK_DEV_CMD640_ENHANCED is not set CONFIG_BLK_DEV_IDEPNP=y -CONFIG_BLK_DEV_IDEPCI=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=m CONFIG_BLK_DEV_OPTI621=m CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_AEC62XX=m CONFIG_BLK_DEV_ALI15X3=m # CONFIG_WDC_ALI15X3 is not set @@ -632,8 +591,6 @@ # CONFIG_BLK_DEV_HT6560B is not set # CONFIG_BLK_DEV_QD65XX is not set # CONFIG_BLK_DEV_UMC8672 is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_BLK_DEV_HD is not set ## ## file: drivers/input/Kconfig @@ -774,7 +731,6 @@ CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m CONFIG_ISDN_CAPI_CAPIDRV=m ## @@ -850,7 +806,6 @@ CONFIG_HISAX_HFCUSB=m
[kernel] r10853 - dists/trunk/linux-2.6/debian/config/amd64
Author: waldi Date: Fri Mar 14 13:32:29 2008 New Revision: 10853 Log: debian/config/amd64: Remove silent options. Modified: dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/amd64/config.amd64 Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 13:32:29 2008 @@ -8,28 +8,6 @@ ## file: arch/x86/Kconfig ## CONFIG_64BIT=y -CONFIG_X86_64=y -CONFIG_X86=y -CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_MMU=y -CONFIG_ZONE_DMA=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_DMI=y -CONFIG_RWSEM_GENERIC_SPINLOCK=y -# CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_ZONE_DMA32=y -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_AUDIT_ARCH=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_HT=y ## choice: Subarchitecture Type CONFIG_X86_PC=y # CONFIG_X86_VSMP is not set @@ -37,22 +15,16 @@ CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT=y CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y CONFIG_CALGARY_IOMMU=y CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y -CONFIG_SWIOTLB=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y CONFIG_I8K=m CONFIG_MICROCODE=m -CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m -CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_MTRR=y CONFIG_EFI=y # CONFIG_CC_STACKPROTECTOR is not set @@ -61,19 +33,11 @@ # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x20 CONFIG_HOTPLUG_CPU=y -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y CONFIG_PCI=y -CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y # CONFIG_DMAR is not set -CONFIG_ISA_DMA_API=y -CONFIG_K8_NB=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=y -CONFIG_COMPAT=y -CONFIG_COMPAT_FOR_U64_ALIGNMENT=y -CONFIG_SYSVIPC_COMPAT=y ## ## file: arch/x86/Kconfig.cpu @@ -81,10 +45,6 @@ ## choice: Processor family # CONFIG_MCORE2 is not set ## end choice -CONFIG_X86_INTERNODE_CACHE_BYTES=128 -CONFIG_X86_CMPXCHG=y -CONFIG_X86_GOOD_APIC=y -CONFIG_X86_TSC=y ## ## file: arch/x86/Kconfig.debug @@ -106,7 +66,6 @@ CONFIG_X86_SPEEDSTEP_CENTRINO=m # CONFIG_X86_P4_CLOCKMOD is not set # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set -# CONFIG_X86_SPEEDSTEP_LIB is not set ## ## file: arch/x86/kvm/Kconfig @@ -124,15 +83,9 @@ CONFIG_CRYPTO_SALSA20_X86_64=m ## -## file: crypto/async_tx/Kconfig -## -CONFIG_ASYNC_CORE=m - -## ## file: drivers/acpi/Kconfig ## CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_SYSFS_POWER=y @@ -151,9 +104,6 @@ CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_EC=y -CONFIG_ACPI_POWER=y -CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_HOTPLUG_MEMORY=m @@ -174,7 +124,6 @@ CONFIG_ATM_IDT77252=m # CONFIG_ATM_IDT77252_DEBUG is not set # CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y CONFIG_ATM_AMBASSADOR=m # CONFIG_ATM_AMBASSADOR_DEBUG is not set CONFIG_ATM_HORIZON=m @@ -184,7 +133,6 @@ # CONFIG_ATM_FORE200E_USE_TASKLET is not set CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_FORE200E=m CONFIG_ATM_HE=m CONFIG_ATM_HE_USE_SUNI=y @@ -262,7 +210,6 @@ ## CONFIG_VT=y CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y CONFIG_SERIAL_NONSTANDARD=y CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m @@ -281,7 +228,6 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m -CONFIG_VIRTIO_CONSOLE=y CONFIG_NVRAM=m CONFIG_RTC=y CONFIG_GEN_RTC=m @@ -347,7 +293,6 @@ ## file: drivers/cpufreq/Kconfig ## CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m ## choice: Default CPUFreq governor @@ -510,13 +455,11 @@ CONFIG_BLK_DEV_CMD640=y # CONFIG_BLK_DEV_CMD640_ENHANCED is not set CONFIG_BLK_DEV_IDEPNP=y -CONFIG_BLK_DEV_IDEPCI=y # CONFIG_IDEPCI_PCIBUS_ORDER is not set # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=m CONFIG_BLK_DEV_OPTI621=m CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_AEC62XX=m CONFIG_BLK_DEV_ALI15X3=m # CONFIG_WDC_ALI15X3 is not set @@ -542,8 +485,6 @@ CONFIG_BLK_DEV_TRM290=m CONFIG_BLK_DEV_VIA82CXXX=m # CONFIG_IDE_ARM is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_BLK_DEV_HD is not set ## ## file: drivers/input/Kconfig @@ -678,7 +619,6 @@ CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m CONFIG_ISDN_CAPI_CAPIDRV=m ## @@ -742,7 +682,6 @@ CONFIG_HISAX_HFCUSB=m CONFIG_HISAX_HFC4S8S=m
[kernel] r10850 - in dists/trunk/linux-2.6/debian/config: . arm hppa m68k mips mipsel powerpc sparc
Author: waldi Date: Fri Mar 14 13:21:57 2008 New Revision: 10850 Log: * debian/config/config: Disable RAW_DRIVER. * debian/config/*: Remove old RAW_DRIVER defintions. Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/hppa/config dists/trunk/linux-2.6/debian/config/m68k/config dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/powerpc/config dists/trunk/linux-2.6/debian/config/sparc/config Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge == --- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 13:21:57 2008 @@ -222,7 +222,6 @@ # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set -# CONFIG_RAW_DRIVER is not set ## ## file: drivers/char/drm/Kconfig Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 13:21:57 2008 @@ -141,7 +141,6 @@ # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set -# CONFIG_RAW_DRIVER is not set # CONFIG_TELCLOCK is not set ## Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx == --- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 13:21:57 2008 @@ -133,7 +133,6 @@ # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set -# CONFIG_RAW_DRIVER is not set CONFIG_TELCLOCK=m ## Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 13:21:57 2008 @@ -310,7 +310,6 @@ # CONFIG_NVRAM is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set -# CONFIG_RAW_DRIVER is not set CONFIG_DEVPORT=y ## Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 13:21:57 2008 @@ -185,6 +185,7 @@ # CONFIG_LEGACY_PTYS is not set CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m +# CONFIG_RAW_DRIVER is not set CONFIG_TELCLOCK=m ## Modified: dists/trunk/linux-2.6/debian/config/hppa/config == --- dists/trunk/linux-2.6/debian/config/hppa/config (original) +++ dists/trunk/linux-2.6/debian/config/hppa/config Fri Mar 14 13:21:57 2008 @@ -65,7 +65,6 @@ # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set -# CONFIG_RAW_DRIVER is not set ## ## file: drivers/char/drm/Kconfig Modified: dists/trunk/linux-2.6/debian/config/m68k/config == --- dists/trunk/linux-2.6/debian/config/m68k/config (original) +++ dists/trunk/linux-2.6/debian/config/m68k/config Fri Mar 14 13:21:57 2008 @@ -38,7 +38,6 @@ CONFIG_GEN_RTC_X=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set -# CONFIG_RAW_DRIVER is not set ## ## file: drivers/char/drm/Kconfig Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 13:21:57 2008 @@ -363,7 +363,6 @@ CONFIG_DTLK=m CONFIG_R3964=m CONFIG_APPLICOM=m -#
[kernel] r10854 - dists/trunk/linux-2.6/debian/config/s390
Author: waldi Date: Fri Mar 14 13:37:14 2008 New Revision: 10854 Log: debian/config/s390/config: Explicitely set FLATMEM_MANUAL, DISCONTIGMEM_MANUAL and SPARSEMEM_MANUAL. Modified: dists/trunk/linux-2.6/debian/config/s390/config Modified: dists/trunk/linux-2.6/debian/config/s390/config == --- dists/trunk/linux-2.6/debian/config/s390/config (original) +++ dists/trunk/linux-2.6/debian/config/s390/config Fri Mar 14 13:37:14 2008 @@ -169,6 +169,15 @@ CONFIG_CRC32=m ## +## file: mm/Kconfig +## +## choice: Memory model +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +## end choice + +## ## file: net/atm/Kconfig ## # CONFIG_ATM is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10856 - dists/trunk/linux-2.6/debian/config/s390
Author: waldi Date: Fri Mar 14 13:41:58 2008 New Revision: 10856 Log: debian/config/s390/config.s390, debian/config/s390/config.s390-tape: Explicitely set RESOURCES_64BIT. Modified: dists/trunk/linux-2.6/debian/config/s390/config.s390 dists/trunk/linux-2.6/debian/config/s390/config.s390-tape Modified: dists/trunk/linux-2.6/debian/config/s390/config.s390 == --- dists/trunk/linux-2.6/debian/config/s390/config.s390(original) +++ dists/trunk/linux-2.6/debian/config/s390/config.s390Fri Mar 14 13:41:58 2008 @@ -12,3 +12,8 @@ CONFIG_IPL_VM=y ## end choice +## +## file: mm/Kconfig +## +# CONFIG_RESOURCES_64BIT is not set + Modified: dists/trunk/linux-2.6/debian/config/s390/config.s390-tape == --- dists/trunk/linux-2.6/debian/config/s390/config.s390-tape (original) +++ dists/trunk/linux-2.6/debian/config/s390/config.s390-tape Fri Mar 14 13:41:58 2008 @@ -12,3 +12,8 @@ # CONFIG_IPL_VM is not set ## end choice +## +## file: mm/Kconfig +## +# CONFIG_RESOURCES_64BIT is not set + ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10857 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc
Author: waldi Date: Fri Mar 14 13:52:24 2008 New Revision: 10857 Log: debian/config: Centralize core sound options. Modified: dists/trunk/linux-2.6/debian/config/alpha/config dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/arm/config.footbridge dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/hppa/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/ia64/config dists/trunk/linux-2.6/debian/config/m68k/config.amiga dists/trunk/linux-2.6/debian/config/m68k/config.atari dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/powerpc/config dists/trunk/linux-2.6/debian/config/sparc/config Modified: dists/trunk/linux-2.6/debian/config/alpha/config == --- dists/trunk/linux-2.6/debian/config/alpha/config(original) +++ dists/trunk/linux-2.6/debian/config/alpha/configFri Mar 14 13:52:24 2008 @@ -1547,8 +1547,6 @@ ## ## file: sound/Kconfig ## -CONFIG_SOUND=m -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 13:52:24 2008 @@ -1629,8 +1629,6 @@ ## ## file: sound/Kconfig ## -CONFIG_SOUND=m -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge == --- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 13:52:24 2008 @@ -1526,8 +1526,6 @@ ## ## file: sound/Kconfig ## -CONFIG_SOUND=m -CONFIG_SND=m CONFIG_SOUND_PRIME=m ## Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 13:52:24 2008 @@ -1021,13 +1021,6 @@ CONFIG_NET_KEY=m ## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - -## ## file: sound/core/Kconfig ## CONFIG_SND_TIMER=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx == --- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 13:52:24 2008 @@ -1098,13 +1098,6 @@ CONFIG_NET_KEY=m ## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - -## ## file: sound/core/Kconfig ## CONFIG_SND_TIMER=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 13:52:24 2008 @@ -1650,13 +1650,6 @@ # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set ## -## file: sound/Kconfig -## -CONFIG_SOUND=m -CONFIG_SND=m -# CONFIG_SOUND_PRIME is not set - -## ## file: sound/arm/Kconfig ## # CONFIG_SND_ARMAACI is not set Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 13:52:24 2008 @@ -1814,6 +1814,7 @@ CONFIG_USER_SCHED=y ## end choice CONFIG_CGROUP_CPUACCT=y +# CONFIG_RESOURCE_COUNTERS is not set CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_PROC_PID_CPUSET=y CONFIG_RELAY=y @@ -2364,6 +2365,13 @@ # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set ## +## file: sound/Kconfig +## +CONFIG_SOUND=m +CONFIG_SND=m +#
[kernel] r10858 - in dists/trunk/linux-2.6/debian/config: . amd64 i386 powerpc
Author: waldi Date: Fri Mar 14 13:57:17 2008 New Revision: 10858 Log: debian/config: Fix some arch specific settings. Modified: dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/powerpc/config Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 13:57:17 2008 @@ -29,6 +29,7 @@ CONFIG_EFI=y # CONFIG_CC_STACKPROTECTOR is not set CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x20 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x20 Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 13:57:17 2008 @@ -2450,8 +2450,6 @@ ## ## file: unknown ## -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_CRASH_DUMP is not set # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set CONFIG_EARLY_PRINTK=y Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 13:57:17 2008 @@ -45,6 +45,7 @@ CONFIG_EFI=y # CONFIG_IRQBALANCE is not set CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x10 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x10 Modified: dists/trunk/linux-2.6/debian/config/powerpc/config == --- dists/trunk/linux-2.6/debian/config/powerpc/config (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Mar 14 13:57:17 2008 @@ -9,6 +9,7 @@ CONFIG_HIGHMEM=y # CONFIG_HOTPLUG_CPU is not set CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set CONFIG_PPCBUG_NVRAM=y CONFIG_PROC_DEVICETREE=y CONFIG_CMDLINE_BOOL=y ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10859 - dists/trunk/linux-2.6/debian/config
Author: waldi Date: Fri Mar 14 14:00:07 2008 New Revision: 10859 Log: debian/config/config: Remove silent options. Modified: dists/trunk/linux-2.6/debian/config/config Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 14:00:07 2008 @@ -2450,14 +2450,6 @@ ## ## file: unknown ## -# CONFIG_DEBUG_STACKOVERFLOW is not set -# CONFIG_DEBUG_STACK_USAGE is not set -CONFIG_EARLY_PRINTK=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_LOCKDEP_SUPPORT=y # CONFIG_SECCOMP is not set -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_USB_ATMEL=m ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10862 - in dists/trunk/linux-2.6/debian/config: . amd64 arm hppa i386 m68k mips mipsel powerpc
Author: waldi Date: Fri Mar 14 14:09:42 2008 New Revision: 10862 Log: debian/control: Remove known gone options. Modified: dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/hppa/config dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp dists/trunk/linux-2.6/debian/config/hppa/config.parisc64-smp dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/m68k/config dists/trunk/linux-2.6/debian/config/m68k/config.atari dists/trunk/linux-2.6/debian/config/m68k/config.bvme6000 dists/trunk/linux-2.6/debian/config/m68k/config.mac dists/trunk/linux-2.6/debian/config/m68k/config.mvme16x dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/powerpc/config dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 14:09:42 2008 @@ -1736,9 +1736,3 @@ CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m -## -## file: unknown -## -CONFIG_QUICKLIST=y -CONFIG_SCSI_QLOGIC_FC=m - Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 14:09:42 2008 @@ -1759,14 +1759,3 @@ ## CONFIG_INITRAMFS_SOURCE= -## -## file: unknown -## -# CONFIG_FAIR_CGROUP_SCHED is not set -# CONFIG_FIXED_MII_1000_FDX is not set -# CONFIG_FIXED_MII_100_FDX is not set -# CONFIG_FIXED_MII_10_FDX is not set -CONFIG_FIXED_MII_AMNT=1 -# CONFIG_IWLWIFI is not set -CONFIG_SUSPEND_UP_POSSIBLE=y - Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 14:09:42 2008 @@ -2447,8 +2447,3 @@ ## CONFIG_INITRAMFS_SOURCE= -## -## file: unknown -## -CONFIG_USB_ATMEL=m - Modified: dists/trunk/linux-2.6/debian/config/hppa/config == --- dists/trunk/linux-2.6/debian/config/hppa/config (original) +++ dists/trunk/linux-2.6/debian/config/hppa/config Fri Mar 14 14:09:42 2008 @@ -949,10 +949,6 @@ ## ## file: unknown ## -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_JUMPS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 # CONFIG_DEBUG_IOREMAP is not set CONFIG_IP_TCPDIAG=m CONFIG_IP_TCPDIAG_IPV6=y Modified: dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp == --- dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp (original) +++ dists/trunk/linux-2.6/debian/config/hppa/config.parisc-smp Fri Mar 14 14:09:42 2008 @@ -39,8 +39,3 @@ CONFIG_LOCK_KERNEL=y CONFIG_STOP_MACHINE=y -## -## file: unknown -## -# CONFIG_DEBUG_RWLOCK is not set - Modified: dists/trunk/linux-2.6/debian/config/hppa/config.parisc64-smp == --- dists/trunk/linux-2.6/debian/config/hppa/config.parisc64-smp (original) +++ dists/trunk/linux-2.6/debian/config/hppa/config.parisc64-smpFri Mar 14 14:09:42 2008 @@ -28,8 +28,3 @@ CONFIG_DISCONTIGMEM=y CONFIG_NEED_MULTIPLE_NODES=y -## -## file: unknown -## -# CONFIG_DEBUG_RWLOCK is not set - Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 14:09:42 2008 @@ -2039,8 +2039,3 @@ CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m -## -## file: unknown -## -CONFIG_SCSI_QLOGIC_FC=m - Modified: dists/trunk/linux-2.6/debian/config/m68k/config
[kernel] r10860 - dists/trunk/linux-2.6/debian/config/sparc
Author: waldi Date: Fri Mar 14 14:02:41 2008 New Revision: 10860 Log: debian/config/sparc/defines: Set sparc64 as default kernel arch. Modified: dists/trunk/linux-2.6/debian/config/sparc/defines Modified: dists/trunk/linux-2.6/debian/config/sparc/defines == --- dists/trunk/linux-2.6/debian/config/sparc/defines (original) +++ dists/trunk/linux-2.6/debian/config/sparc/defines Fri Mar 14 14:02:41 2008 @@ -5,6 +5,7 @@ # sparc32 sparc64 sparc64-smp +kernel-arch: sparc64 kernel-header-dirs: sparc sparc64 [image] @@ -24,11 +25,9 @@ [sparc64_base] class: uniprocessor 64-bit UltraSPARC -kernel-arch: sparc64 kpkg-subarch: sparc64 [sparc64-smp_base] class: multiprocessor 64-bit UltraSPARC -kernel-arch: sparc64 kpkg-subarch: sparc64 ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10861 - in dists/trunk/linux-2.6/debian/config: . mips mipsel powerpc sparc
Author: waldi Date: Fri Mar 14 14:03:00 2008 New Revision: 10861 Log: debian/config: Fix some arch specific settings. Modified: dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/mips/config dists/trunk/linux-2.6/debian/config/mipsel/config dists/trunk/linux-2.6/debian/config/powerpc/config dists/trunk/linux-2.6/debian/config/sparc/config Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 14:03:00 2008 @@ -2450,6 +2450,5 @@ ## ## file: unknown ## -# CONFIG_SECCOMP is not set CONFIG_USB_ATMEL=m Modified: dists/trunk/linux-2.6/debian/config/mips/config == --- dists/trunk/linux-2.6/debian/config/mips/config (original) +++ dists/trunk/linux-2.6/debian/config/mips/config Fri Mar 14 14:03:00 2008 @@ -4,6 +4,7 @@ CONFIG_MIPS=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +# CONFIG_SECCOMP is not set ## ## file: drivers/net/Kconfig Modified: dists/trunk/linux-2.6/debian/config/mipsel/config == --- dists/trunk/linux-2.6/debian/config/mipsel/config (original) +++ dists/trunk/linux-2.6/debian/config/mipsel/config Fri Mar 14 14:03:00 2008 @@ -2,6 +2,7 @@ ## file: arch/mips/Kconfig ## CONFIG_MIPS=y +# CONFIG_SECCOMP is not set ## ## file: drivers/net/Kconfig Modified: dists/trunk/linux-2.6/debian/config/powerpc/config == --- dists/trunk/linux-2.6/debian/config/powerpc/config (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Mar 14 14:03:00 2008 @@ -14,6 +14,7 @@ CONFIG_PROC_DEVICETREE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE=console=ttyS0,9600 console=tty0 +# CONFIG_SECCOMP is not set # CONFIG_ISA is not set CONFIG_PCI=y # CONFIG_ADVANCED_OPTIONS is not set Modified: dists/trunk/linux-2.6/debian/config/sparc/config == --- dists/trunk/linux-2.6/debian/config/sparc/config(original) +++ dists/trunk/linux-2.6/debian/config/sparc/configFri Mar 14 14:03:00 2008 @@ -1,6 +1,7 @@ ## -## file: arch/sparc/Kconfig +## file: arch/sparc64/Kconfig ## +# CONFIG_SECCOMP is not set CONFIG_PCI=y CONFIG_SUN_OPENPROMFS=m ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10863 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package
Author: waldi
Date: Fri Mar 14 19:47:00 2008
New Revision: 10863
Log:
lib/kconfigeditor/kconfig/package/files.py: Support per-option comments.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
---
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
(original)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Fri Mar 14 19:47:00 2008
@@ -134,7 +134,7 @@
ignored.add(i.name)
return []
processed.add(i.name)
-return [e]
+return e.dump()
def _dump_file(self, processed, ignored, have_prompt, f):
ret = []
@@ -206,46 +206,68 @@
fd.write(str(i) + \n)
def read(self, f):
+comments = []
+
for line in iter(f.readlines()):
line = line.strip()
+
if line.startswith(CONFIG_):
i = line.find('=')
option = line[7:i]
value = line[i+1:]
if value in ('y', 'm', 'n'):
-entry = FileEntryTristate(option, value)
+entry = FileEntryTristate(option, value, comments)
else:
-entry = FileEntryString(option, value)
+entry = FileEntryString(option, value, comments)
self[option] = entry
+comments = []
+
elif line.startswith(# CONFIG_):
option = line[9:-11]
-self[option] = FileEntryTristate(option)
+self[option] = FileEntryTristate(option, 'n', comments)
+comments = []
+
+elif line.startswith(#. ):
+comments.append(line[3:])
+
elif line.startswith(#) or not line:
pass
+
else:
raise RuntimeError, Can't recognize %s % line
+class FileEntry(object):
+__slots__ = name, comments
+
+def __init__(self, name, comments):
+self.name, self.comments = name, comments
+
+def dump(self):
+ret = [#. %s % i for i in self.comments]
+ret.append(str(self))
+return ret
+
# TODO
-class FileEntryString(object):
-__slots__ = name, value
+class FileEntryString(FileEntry):
+__slots__ = value
-def __init__(self, name, value):
-self.name = name
+def __init__(self, name, value, comments):
+super(FileEntryString, self).__init__(name, comments)
self.value = value
def __str__(self):
return CONFIG_%s=%s % (self.name, self.value)
# TODO
-class FileEntryTristate(object):
-__slots__ = name, value
+class FileEntryTristate(FileEntry):
+__slots__ = name, value, comments
VALUE_NO = 0
VALUE_YES = 1
VALUE_MOD = 2
-def __init__(self, name, value = None):
-self.name = name
+def __init__(self, name, value, comments):
+super(FileEntryTristate, self).__init__(name, comments)
if value == 'n' or value is None:
self.value = self.VALUE_NO
elif value == 'y':
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10864 - in dists/trunk/linux-2.6/debian/config: . amd64 arm i386
Author: waldi Date: Fri Mar 14 19:51:54 2008 New Revision: 10864 Log: * config/amd64/config, config/i386/config: Move power supply class support from config/config. Modified: dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/i386/config Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 19:51:54 2008 @@ -1119,6 +1119,14 @@ CONFIG_PNP_DEBUG=y ## +## file: drivers/power/Kconfig +## +CONFIG_POWER_SUPPLY=m +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_BATTERY_DS2760=m + +## ## file: drivers/scsi/Kconfig ## CONFIG_SCSI_ARCMSR=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 19:51:54 2008 @@ -909,7 +909,6 @@ ## ## file: drivers/power/Kconfig ## -# CONFIG_POWER_SUPPLY is not set ## ## file: drivers/rtc/Kconfig Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 19:51:54 2008 @@ -1209,10 +1209,7 @@ ## ## file: drivers/power/Kconfig ## -CONFIG_POWER_SUPPLY=m -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_BATTERY_DS2760=m +# CONFIG_POWER_SUPPLY is not set ## ## file: drivers/rtc/Kconfig Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 19:51:54 2008 @@ -1343,6 +1343,14 @@ CONFIG_PNPBIOS_PROC_FS=y ## +## file: drivers/power/Kconfig +## +CONFIG_POWER_SUPPLY=m +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_BATTERY_DS2760=m + +## ## file: drivers/scsi/Kconfig ## CONFIG_SCSI_DPT_I2O=m ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10866 - dists/trunk/linux-2.6/debian/config/s390
Author: waldi Date: Fri Mar 14 19:57:50 2008 New Revision: 10866 Log: debian/config/s390/config: Disable MEMSTICK. Modified: dists/trunk/linux-2.6/debian/config/s390/config Modified: dists/trunk/linux-2.6/debian/config/s390/config == --- dists/trunk/linux-2.6/debian/config/s390/config (original) +++ dists/trunk/linux-2.6/debian/config/s390/config Fri Mar 14 19:57:50 2008 @@ -62,6 +62,11 @@ # CONFIG_DM_MULTIPATH_EMC is not set ## +## file: drivers/memstick/Kconfig +## +# CONFIG_MEMSTICK is not set + +## ## file: drivers/net/Kconfig ## # CONFIG_DUMMY is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10867 - in dists/trunk/linux-2.6/debian: . config/s390
Author: waldi Date: Fri Mar 14 20:01:03 2008 New Revision: 10867 Log: * debian/changelog: Update. * debian/config/s390/config: Remove DM_MULTIPATH_EMC override. Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/config/s390/config Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Fri Mar 14 20:01:03 2008 @@ -70,6 +70,7 @@ * Fix broken drivers: - Broadcom NetXtremeII support * [powerpc] Use new wrapper install support. + * [s390] Enable DM_MULTIPATH_EMC. -- Bastian Blank [EMAIL PROTECTED] Tue, 26 Feb 2008 23:59:55 -0700 Modified: dists/trunk/linux-2.6/debian/config/s390/config == --- dists/trunk/linux-2.6/debian/config/s390/config (original) +++ dists/trunk/linux-2.6/debian/config/s390/config Fri Mar 14 20:01:03 2008 @@ -57,11 +57,6 @@ CONFIG_CRYPTO_AES_S390=m ## -## file: drivers/md/Kconfig -## -# CONFIG_DM_MULTIPATH_EMC is not set - -## ## file: drivers/memstick/Kconfig ## # CONFIG_MEMSTICK is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10868 - dists/trunk/linux-2.6/debian/config
Author: waldi Date: Fri Mar 14 20:11:27 2008 New Revision: 10868 Log: debian/config/config - Enable BRIDGE. - Disable DECNET. Modified: dists/trunk/linux-2.6/debian/config/config Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 20:11:27 2008 @@ -1929,6 +1929,11 @@ # CONFIG_NET_9P_DEBUG is not set ## +## file: net/bridge/Kconfig +## +CONFIG_BRIDGE=m + +## ## file: net/bridge/netfilter/Kconfig ## CONFIG_BRIDGE_NF_EBTABLES=m @@ -1975,9 +1980,9 @@ CONFIG_IP_DCCP_CCID3_RTO=100 ## -## file: net/decnet/netfilter/Kconfig +## file: net/decnet/Kconfig ## -CONFIG_DECNET_NF_GRABULATOR=m +# CONFIG_DECNET is not set ## ## file: net/ieee80211/Kconfig ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10870 - in dists/trunk/linux-2.6/debian/config: arm mips mipsel
Author: waldi Date: Fri Mar 14 20:20:13 2008 New Revision: 10870 Log: debian/config: Centralize NSA SELinux Support. Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 20:20:13 2008 @@ -1621,23 +1621,6 @@ # CONFIG_SAMPLES is not set ## -## file: security/Kconfig -## - -## -## file: security/selinux/Kconfig -## -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set - -## ## file: sound/arm/Kconfig ## # CONFIG_SND_ARMAACI is not set Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 20:20:13 2008 @@ -2409,19 +2409,6 @@ CONFIG_NET_KEY=m ## -## file: security/selinux/Kconfig -## -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set - -## ## file: sound/Kconfig ## CONFIG_SOUND=y Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Mar 14 20:20:13 2008 @@ -2825,19 +2825,6 @@ # CONFIG_NET_KEY_MIGRATE is not set ## -## file: security/selinux/Kconfig -## -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set - -## ## file: sound/Kconfig ## CONFIG_SOUND=y Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 == --- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32(original) +++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32Fri Mar 14 20:20:13 2008 @@ -952,17 +952,6 @@ CONFIG_NET_KEY=y ## -## file: security/selinux/Kconfig -## -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 - -## ## file: sound/Kconfig ## CONFIG_SOUND_PRIME=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a == --- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Mar 14 20:20:13 2008 @@ -1434,18 +1434,6 @@ CONFIG_XFRM_USER=y CONFIG_NET_KEY=y - -## -## file: security/selinux/Kconfig -## -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 - ## ## file: sound/Kconfig ## Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b == ---
[kernel] r10872 - in dists/trunk/linux-2.6/debian/config: arm mips mipsel
Author: waldi Date: Fri Mar 14 20:32:57 2008 New Revision: 10872 Log: debian/config: Centralize Cryptographic API. Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge == --- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 20:32:57 2008 @@ -89,11 +89,6 @@ CONFIG_CPU_TLB_V4WB=y ## -## file: crypto/Kconfig -## -CONFIG_CRYPTO_DES=y - -## ## file: drivers/ata/Kconfig ## # CONFIG_ATA is not set Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 20:32:57 2008 @@ -121,48 +121,11 @@ ## ## file: crypto/Kconfig ## -CONFIG_XOR_BLOCKS=m -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_LRW=m +#. TODO # CONFIG_CRYPTO_XTS is not set -# CONFIG_CRYPTO_CRYPTD is not set -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m +#. TODO # CONFIG_CRYPTO_SEED is not set -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_TEST=m +#. TODO # CONFIG_CRYPTO_AUTHENC is not set ## Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 20:32:57 2008 @@ -176,45 +176,6 @@ # CONFIG_LSF is not set ## -## file: crypto/Kconfig -## -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m - -## ## file: drivers/ata/Kconfig ## CONFIG_ATA=y Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Mar 14 20:32:57 2008 @@ -166,49 +166,6 @@ # CONFIG_BLK_DEV_IO_TRACE is not set ## -## file: crypto/Kconfig -## -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_LRW=m -# CONFIG_CRYPTO_CRYPTD is not set -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m
[kernel] r10873 - in dists/trunk/linux-2.6/debian: . config config/alpha config/amd64 config/arm config/hppa config/i386 config/ia64 config/m68k config/mips config/mipsel config/powerpc
Author: waldi Date: Fri Mar 14 20:56:42 2008 New Revision: 10873 Log: * debian/changelog: Update. * debian/config - Enable AF_RXRPC and RXKAD. - Disable R3964. Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/config/alpha/config dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/arm/config.footbridge dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/hppa/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/ia64/config dists/trunk/linux-2.6/debian/config/m68k/config dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/powerpc/config Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Fri Mar 14 20:56:42 2008 @@ -71,6 +71,8 @@ - Broadcom NetXtremeII support * [powerpc] Use new wrapper install support. * [s390] Enable DM_MULTIPATH_EMC. + * Enable AF_RXRPC and RXKAD. + * Disable R3964. -- Bastian Blank [EMAIL PROTECTED] Tue, 26 Feb 2008 23:59:55 -0700 Modified: dists/trunk/linux-2.6/debian/config/alpha/config == --- dists/trunk/linux-2.6/debian/config/alpha/config(original) +++ dists/trunk/linux-2.6/debian/config/alpha/configFri Mar 14 20:56:42 2008 @@ -184,7 +184,6 @@ CONFIG_GEN_RTC=m CONFIG_GEN_RTC_X=y CONFIG_DTLK=m -CONFIG_R3964=m CONFIG_APPLICOM=m CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=256 Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 20:56:42 2008 @@ -1619,13 +1619,6 @@ CONFIG_LLC2=m ## -## file: net/rxrpc/Kconfig -## -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m - -## ## file: net/wanrouter/Kconfig ## CONFIG_WAN_ROUTER=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge == --- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 20:56:42 2008 @@ -207,7 +207,6 @@ CONFIG_NVRAM=m CONFIG_RTC=y # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set ## Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 20:56:42 2008 @@ -139,7 +139,6 @@ # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NVRAM is not set # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_TELCLOCK is not set Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx == --- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 20:56:42 2008 @@ -131,7 +131,6 @@ # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NVRAM is not set # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set CONFIG_TELCLOCK=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 20:56:42 2008 @@ -256,7 +256,6 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_NVRAM is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set CONFIG_DEVPORT=y @@ -1540,13 +1539,6 @@ CONFIG_RFKILL_INPUT=m ## -## file: net/rxrpc/Kconfig -## -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -# CONFIG_RXKAD is not set - -## ## file: net/wanrouter/Kconfig ## CONFIG_WAN_ROUTER=m Modified: dists/trunk/linux-2.6/debian/config/config
[kernel] r10877 - dists/trunk/linux-2.6/debian/config/powerpc
Author: waldi Date: Fri Mar 14 21:33:18 2008 New Revision: 10877 Log: debian/config/powerpc/config: Remove unused options. Modified: dists/trunk/linux-2.6/debian/config/powerpc/config Modified: dists/trunk/linux-2.6/debian/config/powerpc/config == --- dists/trunk/linux-2.6/debian/config/powerpc/config (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Mar 14 21:33:18 2008 @@ -10,7 +10,6 @@ # CONFIG_HOTPLUG_CPU is not set CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set -CONFIG_PPCBUG_NVRAM=y CONFIG_PROC_DEVICETREE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE=console=ttyS0,9600 console=tty0 @@ -18,11 +17,6 @@ # CONFIG_ISA is not set CONFIG_PCI=y # CONFIG_ADVANCED_OPTIONS is not set -CONFIG_HIGHMEM_START=0xfe00 -CONFIG_LOWMEM_SIZE=0x3000 -CONFIG_KERNEL_START=0xc000 -CONFIG_TASK_SIZE=0x8000 -CONFIG_BOOT_LOAD=0x0080 ## ## file: arch/powerpc/Kconfig.debug ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10878 - dists/trunk/linux-2.6/debian/config/powerpc
Author: waldi Date: Fri Mar 14 21:37:58 2008 New Revision: 10878 Log: debian/config/powerpc: Cleanup. Modified: dists/trunk/linux-2.6/debian/config/powerpc/config dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Modified: dists/trunk/linux-2.6/debian/config/powerpc/config == --- dists/trunk/linux-2.6/debian/config/powerpc/config (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Mar 14 21:37:58 2008 @@ -6,15 +6,12 @@ ## ## file: arch/powerpc/Kconfig ## -CONFIG_HIGHMEM=y # CONFIG_HOTPLUG_CPU is not set CONFIG_KEXEC=y -# CONFIG_CRASH_DUMP is not set CONFIG_PROC_DEVICETREE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE=console=ttyS0,9600 console=tty0 # CONFIG_SECCOMP is not set -# CONFIG_ISA is not set CONFIG_PCI=y # CONFIG_ADVANCED_OPTIONS is not set Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc == --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Fri Mar 14 21:37:58 2008 @@ -1,4 +1,10 @@ ## +## file: arch/powerpc/Kconfig +## +CONFIG_HIGHMEM=y +# CONFIG_ISA is not set + +## ## file: arch/powerpc/platforms/512x/Kconfig ## # CONFIG_MPC5121_ADS is not set Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 == --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64Fri Mar 14 21:37:58 2008 @@ -7,6 +7,7 @@ ## file: arch/powerpc/Kconfig ## CONFIG_IOMMU_VMERGE=y +# CONFIG_CRASH_DUMP is not set CONFIG_IRQ_ALL_CPUS=y CONFIG_NUMA=y # CONFIG_PPC_64K_PAGES is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10879 - dists/trunk/linux-2.6/debian/config/powerpc
Author: waldi Date: Fri Mar 14 21:48:09 2008 New Revision: 10879 Log: debian/config/powerpc - Cleanup. - Disable USB_GADGET. Modified: dists/trunk/linux-2.6/debian/config/powerpc/config dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot Modified: dists/trunk/linux-2.6/debian/config/powerpc/config == --- dists/trunk/linux-2.6/debian/config/powerpc/config (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Mar 14 21:48:09 2008 @@ -173,6 +173,8 @@ ## choice: Default CPUFreq governor CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set ## end choice CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m @@ -871,26 +873,7 @@ ## ## file: drivers/usb/gadget/Kconfig ## -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -## choice: USB Peripheral Controller -CONFIG_USB_GADGET_NET2280=y -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -## end choice -## choice: USB Gadget Drivers -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_FILE_STORAGE_TEST=y -CONFIG_USB_G_SERIAL=m -## end choice +# CONFIG_USB_GADGET is not set ## ## file: drivers/usb/host/Kconfig @@ -1073,14 +1056,6 @@ CONFIG_CRC32=y ## -## file: mm/Kconfig -## -## choice: Memory model -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -## end choice - -## ## file: net/atm/Kconfig ## CONFIG_ATM=m Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc == --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Fri Mar 14 21:48:09 2008 @@ -110,5 +110,7 @@ ## ## choice: Memory model CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set ## end choice Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot == --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot Fri Mar 14 21:48:09 2008 @@ -154,6 +154,8 @@ ## ## choice: Memory model CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set ## end choice ## ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10882 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc
Author: waldi Date: Fri Mar 14 22:05:05 2008 New Revision: 10882 Log: debian/config: Centralize USB source devices. Modified: dists/trunk/linux-2.6/debian/config/alpha/config dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/arm/config.footbridge dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/hppa/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/ia64/config dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/powerpc/config dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp Modified: dists/trunk/linux-2.6/debian/config/alpha/config == --- dists/trunk/linux-2.6/debian/config/alpha/config(original) +++ dists/trunk/linux-2.6/debian/config/alpha/configFri Mar 14 22:05:05 2008 @@ -1666,7 +1666,6 @@ ## ## file: sound/usb/Kconfig ## -CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m ## Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 22:05:05 2008 @@ -1707,6 +1707,5 @@ ## ## file: sound/usb/Kconfig ## -CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge == --- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 22:05:05 2008 @@ -1640,11 +1640,6 @@ # CONFIG_SND_YMFPCI is not set ## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - -## ## file: unknown ## # CONFIG_APM is not set Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 22:05:05 2008 @@ -1096,11 +1096,6 @@ # CONFIG_SND_YMFPCI is not set ## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m - -## ## file: unknown ## # CONFIG_APM is not set Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx == --- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 22:05:05 2008 @@ -1167,11 +1167,6 @@ # CONFIG_SND_YMFPCI is not set ## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m - -## ## file: unknown ## # CONFIG_APM is not set Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 22:05:05 2008 @@ -1650,10 +1650,3 @@ ## # CONFIG_SND_SOC is not set -## -## file: sound/usb/Kconfig -## -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_CAIAQ=m -# CONFIG_SND_USB_CAIAQ_INPUT is not set - Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 22:05:05 2008 @@ -2439,6 +2439,7 @@ ## ## file: sound/usb/Kconfig ## +CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y Modified: dists/trunk/linux-2.6/debian/config/hppa/config == --- dists/trunk/linux-2.6/debian/config/hppa/config (original) +++ dists/trunk/linux-2.6/debian/config/hppa/config Fri Mar 14 22:05:05 2008 @@ -904,11 +904,6 @@ # CONFIG_SND_YMFPCI is not set ## -## file: sound/usb/Kconfig -## -# CONFIG_SND_USB_AUDIO is not set - -## ## file:
[kernel] r10883 - in dists/trunk/linux-2.6/debian/config: . amd64 i386 ia64
Author: waldi Date: Fri Mar 14 22:06:53 2008 New Revision: 10883 Log: debian/config: Cleanup. Modified: dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/ia64/config Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 22:06:53 2008 @@ -96,6 +96,7 @@ CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=m CONFIG_ACPI_BAY=m CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_THERMAL=m Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 22:06:53 2008 @@ -69,11 +69,6 @@ CONFIG_CRYPTO_LZO=m ## -## file: drivers/acpi/Kconfig -## -CONFIG_ACPI_DOCK=m - -## ## file: drivers/ata/Kconfig ## CONFIG_ATA=m Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 22:06:53 2008 @@ -167,6 +167,7 @@ CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=m CONFIG_ACPI_BAY=m CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_THERMAL=m Modified: dists/trunk/linux-2.6/debian/config/ia64/config == --- dists/trunk/linux-2.6/debian/config/ia64/config (original) +++ dists/trunk/linux-2.6/debian/config/ia64/config Fri Mar 14 22:06:53 2008 @@ -61,6 +61,7 @@ ## ## file: drivers/acpi/Kconfig ## +CONFIG_ACPI_DOCK=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_EC=y CONFIG_ACPI_CONTAINER=y ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10884 - in dists/trunk/linux-2.6/debian/config: . amd64 i386 mips mipsel
Author: waldi Date: Fri Mar 14 22:09:43 2008 New Revision: 10884 Log: debian/config: Cleanup. Modified: dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 22:09:43 2008 @@ -269,6 +269,7 @@ ## ## file: drivers/char/hw_random/Kconfig ## +CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 22:09:43 2008 @@ -195,7 +195,7 @@ ## ## file: drivers/char/hw_random/Kconfig ## -CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM is not set ## ## file: drivers/char/pcmcia/Kconfig Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 22:09:43 2008 @@ -360,6 +360,7 @@ ## ## file: drivers/char/hw_random/Kconfig ## +CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 22:09:43 2008 @@ -319,11 +319,6 @@ CONFIG_DRM_SAVAGE=m ## -## file: drivers/char/hw_random/Kconfig -## -CONFIG_HW_RANDOM=m - -## ## file: drivers/char/ipmi/Kconfig ## CONFIG_IPMI_HANDLER=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Mar 14 22:09:43 2008 @@ -309,11 +309,6 @@ CONFIG_DRM_SAVAGE=m ## -## file: drivers/char/hw_random/Kconfig -## -CONFIG_HW_RANDOM=m - -## ## file: drivers/char/ipmi/Kconfig ## CONFIG_IPMI_HANDLER=m Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta Fri Mar 14 22:09:43 2008 @@ -318,11 +318,6 @@ CONFIG_DRM_SAVAGE=m ## -## file: drivers/char/hw_random/Kconfig -## -CONFIG_HW_RANDOM=m - -## ## file: drivers/char/ipmi/Kconfig ## CONFIG_IPMI_HANDLER=m Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Fri Mar 14 22:09:43 2008 @@ -308,11 +308,6 @@ CONFIG_DRM_SAVAGE=m ## -## file: drivers/char/hw_random/Kconfig -## -CONFIG_HW_RANDOM=m - -## ## file: drivers/char/ipmi/Kconfig ## CONFIG_IPMI_HANDLER=m ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10885 - in dists/trunk/linux-2.6/debian/config: arm mips mipsel
Author: waldi Date: Fri Mar 14 22:13:52 2008 New Revision: 10885 Log: debian/config: Cleanup Connector. Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 22:13:52 2008 @@ -155,11 +155,6 @@ # CONFIG_TCG_TPM is not set ## -## file: drivers/connector/Kconfig -## -CONFIG_CONNECTOR=m - -## ## file: drivers/dma/Kconfig ## CONFIG_DMADEVICES=y Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx == --- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 22:13:52 2008 @@ -147,11 +147,6 @@ # CONFIG_TCG_TPM is not set ## -## file: drivers/connector/Kconfig -## -CONFIG_CONNECTOR=m - -## ## file: drivers/firewire/Kconfig ## # CONFIG_FIREWIRE is not set Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 22:13:52 2008 @@ -277,11 +277,6 @@ # CONFIG_TCG_TPM is not set ## -## file: drivers/connector/Kconfig -## -CONFIG_CONNECTOR=m - -## ## file: drivers/crypto/Kconfig ## CONFIG_CRYPTO_HW=y Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 22:13:52 2008 @@ -334,11 +334,6 @@ # CONFIG_TCG_TPM is not set ## -## file: drivers/connector/Kconfig -## -CONFIG_CONNECTOR=m - -## ## file: drivers/dma/Kconfig ## # CONFIG_INTEL_IOATDMA is not set Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Mar 14 22:13:52 2008 @@ -324,11 +324,6 @@ # CONFIG_TCG_TPM is not set ## -## file: drivers/connector/Kconfig -## -CONFIG_CONNECTOR=m - -## ## file: drivers/dma/Kconfig ## # CONFIG_INTEL_IOATDMA is not set Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 == --- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22(original) +++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22Fri Mar 14 22:13:52 2008 @@ -174,6 +174,7 @@ ## ## file: drivers/connector/Kconfig ## +#. TODO # CONFIG_CONNECTOR is not set ## Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 == --- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32(original) +++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32Fri Mar 14 22:13:52 2008 @@ -177,6 +177,7 @@ ## ## file: drivers/connector/Kconfig ## +#. TODO # CONFIG_CONNECTOR is not set ## Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a == --- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Mar 14 22:13:52 2008 @@ -222,6 +222,7 @@ ## ## file: drivers/connector/Kconfig ## +#. TODO # CONFIG_CONNECTOR is not set ## Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b == --- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b (original)
[kernel] r10886 - in dists/trunk/linux-2.6/debian/config: . arm mips mipsel
Author: waldi Date: Fri Mar 14 22:19:41 2008 New Revision: 10886 Log: debian/config: Cleanup DMA engine support. Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 22:19:41 2008 @@ -159,7 +159,6 @@ ## CONFIG_DMADEVICES=y CONFIG_INTEL_IOP_ADMA=y -CONFIG_DMA_ENGINE=y CONFIG_NET_DMA=y ## Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 22:19:41 2008 @@ -229,11 +229,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y ## -## file: drivers/dma/Kconfig -## -CONFIG_NET_DMA=y - -## ## file: drivers/edac/Kconfig ## CONFIG_EDAC_I82975X=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 22:19:41 2008 @@ -334,13 +334,6 @@ # CONFIG_TCG_TPM is not set ## -## file: drivers/dma/Kconfig -## -# CONFIG_INTEL_IOATDMA is not set -CONFIG_DMA_ENGINE=y -CONFIG_NET_DMA=y - -## ## file: drivers/hid/Kconfig ## CONFIG_HID=y Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Mar 14 22:19:41 2008 @@ -324,13 +324,6 @@ # CONFIG_TCG_TPM is not set ## -## file: drivers/dma/Kconfig -## -# CONFIG_INTEL_IOATDMA is not set -CONFIG_DMA_ENGINE=y -CONFIG_NET_DMA=y - -## ## file: drivers/firewire/Kconfig ## CONFIG_FIREWIRE=m Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta Fri Mar 14 22:19:41 2008 @@ -333,13 +333,6 @@ # CONFIG_TCG_TPM is not set ## -## file: drivers/dma/Kconfig -## -# CONFIG_INTEL_IOATDMA is not set -CONFIG_DMA_ENGINE=y -CONFIG_NET_DMA=y - -## ## file: drivers/hid/Kconfig ## CONFIG_HID=y Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Fri Mar 14 22:19:41 2008 @@ -323,13 +323,6 @@ # CONFIG_TCG_TPM is not set ## -## file: drivers/dma/Kconfig -## -# CONFIG_INTEL_IOATDMA is not set -CONFIG_DMA_ENGINE=y -CONFIG_NET_DMA=y - -## ## file: drivers/firewire/Kconfig ## CONFIG_FIREWIRE=m ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10887 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm i386 mips mipsel powerpc
Author: waldi Date: Fri Mar 14 22:25:27 2008 New Revision: 10887 Log: debian/config: Centralize Bluetooth subsystem support. Modified: dists/trunk/linux-2.6/debian/config/alpha/config dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/arm/config.footbridge dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx dists/trunk/linux-2.6/debian/config/arm/config.versatile dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/powerpc/config Modified: dists/trunk/linux-2.6/debian/config/alpha/config == --- dists/trunk/linux-2.6/debian/config/alpha/config(original) +++ dists/trunk/linux-2.6/debian/config/alpha/configFri Mar 14 22:25:27 2008 @@ -1415,13 +1415,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/Kconfig -## -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m - -## ## file: net/bluetooth/bnep/Kconfig ## CONFIG_BT_BNEP=m Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 22:25:27 2008 @@ -1506,13 +1506,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/Kconfig -## -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m - -## ## file: net/bluetooth/bnep/Kconfig ## CONFIG_BT_BNEP=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge == --- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 22:25:27 2008 @@ -1366,9 +1366,8 @@ ## ## file: net/bluetooth/Kconfig ## +#. TODO # CONFIG_BT is not set -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m ## ## file: net/bluetooth/bnep/Kconfig Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 22:25:27 2008 @@ -862,13 +862,6 @@ # CONFIG_HAMRADIO is not set ## -## file: net/bluetooth/Kconfig -## -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m - -## ## file: net/bluetooth/bnep/Kconfig ## CONFIG_BT_BNEP=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx == --- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 22:25:27 2008 @@ -825,13 +825,6 @@ # CONFIG_HAMRADIO is not set ## -## file: net/bluetooth/Kconfig -## -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m - -## ## file: net/bluetooth/bnep/Kconfig ## CONFIG_BT_BNEP=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile == --- dists/trunk/linux-2.6/debian/config/arm/config.versatile(original) +++ dists/trunk/linux-2.6/debian/config/arm/config.versatileFri Mar 14 22:25:27 2008 @@ -1458,8 +1458,9 @@ ## ## file: net/bluetooth/Kconfig ## -CONFIG_BT=m +#. TODO # CONFIG_BT_L2CAP is not set +#. TODO # CONFIG_BT_SCO is not set ## Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 22:25:27 2008 @@ -1910,6 +1910,13 @@ # CONFIG_NET_9P_DEBUG is not set ## +## file: net/bluetooth/Kconfig +## +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m + +## ## file: net/bridge/Kconfig ## CONFIG_BRIDGE=m Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 22:25:27 2008 @@ -1771,13 +1771,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/Kconfig -## -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m - -## ## file: net/bluetooth/bnep/Kconfig ## CONFIG_BT_BNEP=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original)
[kernel] r10888 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm i386 mips mipsel powerpc
Author: waldi Date: Fri Mar 14 22:27:26 2008 New Revision: 10888 Log: debian/config: Unify RFCOMM protocol support. Modified: dists/trunk/linux-2.6/debian/config/alpha/config dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/arm/config.footbridge dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/powerpc/config Modified: dists/trunk/linux-2.6/debian/config/alpha/config == --- dists/trunk/linux-2.6/debian/config/alpha/config(original) +++ dists/trunk/linux-2.6/debian/config/alpha/configFri Mar 14 22:27:26 2008 @@ -1432,12 +1432,6 @@ CONFIG_BT_HIDP=m ## -## file: net/bluetooth/rfcomm/Kconfig -## -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y - -## ## file: net/bridge/Kconfig ## CONFIG_BRIDGE=m Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 22:27:26 2008 @@ -1523,12 +1523,6 @@ CONFIG_BT_HIDP=m ## -## file: net/bluetooth/rfcomm/Kconfig -## -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y - -## ## file: net/bridge/Kconfig ## CONFIG_BRIDGE=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge == --- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 22:27:26 2008 @@ -1382,12 +1382,6 @@ CONFIG_BT_HIDP=m ## -## file: net/bluetooth/rfcomm/Kconfig -## -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y - -## ## file: net/bridge/Kconfig ## # CONFIG_BRIDGE is not set Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 22:27:26 2008 @@ -874,12 +874,6 @@ CONFIG_BT_HIDP=m ## -## file: net/bluetooth/rfcomm/Kconfig -## -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y - -## ## file: net/bridge/Kconfig ## CONFIG_BRIDGE=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx == --- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 22:27:26 2008 @@ -837,12 +837,6 @@ CONFIG_BT_HIDP=m ## -## file: net/bluetooth/rfcomm/Kconfig -## -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y - -## ## file: net/bridge/Kconfig ## CONFIG_BRIDGE=m Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 22:27:26 2008 @@ -1917,6 +1917,12 @@ CONFIG_BT_SCO=m ## +## file: net/bluetooth/rfcomm/Kconfig +## +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y + +## ## file: net/bridge/Kconfig ## CONFIG_BRIDGE=m Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 22:27:26 2008 @@ -1788,12 +1788,6 @@ CONFIG_BT_HIDP=m ## -## file: net/bluetooth/rfcomm/Kconfig -## -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y - -## ## file: net/bridge/Kconfig ## CONFIG_BRIDGE=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 22:27:26 2008 @@ -1928,12 +1928,6 @@ CONFIG_BT_HIDP=m ## -## file: net/bluetooth/rfcomm/Kconfig -## -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y - -## ## file: net/bridge/Kconfig ## CONFIG_BRIDGE=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Mar
[kernel] r10889 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm i386 mips mipsel powerpc
Author: waldi Date: Fri Mar 14 22:29:09 2008 New Revision: 10889 Log: debian/config: Unify BNEP protocol support. Modified: dists/trunk/linux-2.6/debian/config/alpha/config dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/arm/config.footbridge dists/trunk/linux-2.6/debian/config/arm/config.iop32x dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/powerpc/config Modified: dists/trunk/linux-2.6/debian/config/alpha/config == --- dists/trunk/linux-2.6/debian/config/alpha/config(original) +++ dists/trunk/linux-2.6/debian/config/alpha/configFri Mar 14 22:29:09 2008 @@ -1415,13 +1415,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/bnep/Kconfig -## -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y - -## ## file: net/bluetooth/cmtp/Kconfig ## CONFIG_BT_CMTP=m Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 22:29:09 2008 @@ -1506,13 +1506,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/bnep/Kconfig -## -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y - -## ## file: net/bluetooth/cmtp/Kconfig ## CONFIG_BT_CMTP=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge == --- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Fri Mar 14 22:29:09 2008 @@ -1370,13 +1370,6 @@ # CONFIG_BT is not set ## -## file: net/bluetooth/bnep/Kconfig -## -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x == --- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Fri Mar 14 22:29:09 2008 @@ -862,13 +862,6 @@ # CONFIG_HAMRADIO is not set ## -## file: net/bluetooth/bnep/Kconfig -## -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx == --- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Fri Mar 14 22:29:09 2008 @@ -825,13 +825,6 @@ # CONFIG_HAMRADIO is not set ## -## file: net/bluetooth/bnep/Kconfig -## -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 22:29:09 2008 @@ -1917,6 +1917,13 @@ CONFIG_BT_SCO=m ## +## file: net/bluetooth/bnep/Kconfig +## +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y + +## ## file: net/bluetooth/rfcomm/Kconfig ## CONFIG_BT_RFCOMM=m Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 22:29:09 2008 @@ -1771,13 +1771,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/bnep/Kconfig -## -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y - -## ## file: net/bluetooth/cmtp/Kconfig ## CONFIG_BT_CMTP=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 22:29:09 2008 @@ -1911,13 +1911,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/bnep/Kconfig -## -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y - -## ## file:
[kernel] r10890 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 i386 mips mipsel powerpc
Author: waldi Date: Fri Mar 14 22:30:28 2008 New Revision: 10890 Log: debian/config: Unify CMTP protocol support. Modified: dists/trunk/linux-2.6/debian/config/alpha/config dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta dists/trunk/linux-2.6/debian/config/powerpc/config Modified: dists/trunk/linux-2.6/debian/config/alpha/config == --- dists/trunk/linux-2.6/debian/config/alpha/config(original) +++ dists/trunk/linux-2.6/debian/config/alpha/configFri Mar 14 22:30:28 2008 @@ -1415,11 +1415,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/cmtp/Kconfig -## -CONFIG_BT_CMTP=m - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configFri Mar 14 22:30:28 2008 @@ -1506,11 +1506,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/cmtp/Kconfig -## -CONFIG_BT_CMTP=m - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 22:30:28 2008 @@ -1924,6 +1924,11 @@ CONFIG_BT_BNEP_PROTO_FILTER=y ## +## file: net/bluetooth/cmtp/Kconfig +## +CONFIG_BT_CMTP=m + +## ## file: net/bluetooth/rfcomm/Kconfig ## CONFIG_BT_RFCOMM=m Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 22:30:28 2008 @@ -1771,11 +1771,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/cmtp/Kconfig -## -CONFIG_BT_CMTP=m - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Mar 14 22:30:28 2008 @@ -1911,11 +1911,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/cmtp/Kconfig -## -CONFIG_BT_CMTP=m - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Mar 14 22:30:28 2008 @@ -2253,11 +2253,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/cmtp/Kconfig -## -CONFIG_BT_CMTP=m - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta == --- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta Fri Mar 14 22:30:28 2008 @@ -1876,11 +1876,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/cmtp/Kconfig -## -CONFIG_BT_CMTP=m - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta == --- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta (original) +++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Fri Mar 14 22:30:28 2008 @@ -2236,11 +2236,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/cmtp/Kconfig -## -CONFIG_BT_CMTP=m - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m Modified: dists/trunk/linux-2.6/debian/config/powerpc/config == --- dists/trunk/linux-2.6/debian/config/powerpc/config (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Mar 14 22:30:28 2008 @@ -1071,11 +1071,6 @@ CONFIG_ROSE=m ## -## file: net/bluetooth/cmtp/Kconfig -## -CONFIG_BT_CMTP=m - -## ## file: net/bluetooth/hidp/Kconfig ## CONFIG_BT_HIDP=m ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org
[kernel] r10819 - in people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig: menu package
Author: waldi
Date: Thu Mar 13 08:46:09 2008
New Revision: 10819
Log:
* lib/kconfigeditor/kconfig/menu/file.py: Support choice.
* lib/kconfigeditor/kconfig/package/files.py: Dump choice correctly.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
==
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Thu Mar 13 08:46:09 2008
@@ -4,10 +4,16 @@
def __init__(self, filename):
self.filename = filename
+class FileChoice(list):
+def __init__(self, prompt = None):
+self.prompt = prompt
+
+def __repr__(self):
+return %s(%r) % (self.__class__.__name__, self.prompt)
+
class FileConfig(object):
-def __init__(self, name):
-self.name = name
-self.prompt = None
+def __init__(self, name, prompt = None):
+self.name, self.prompt = name, prompt
def __repr__(self):
return %s(%r, %r) % (self.__class__.__name__, self.name,
self.prompt)
@@ -35,8 +41,8 @@
else:
try:
stack.top().process_line(line)
-except:
-raise Exception(Can't parse: '%s' (%d) % (line, lineno))
+except Exception, e:
+raise Exception(Can't parse: '%s' (%d): %s % (line,
lineno, e))
lineno += 1
return stack.top().process_stop(lineno, 0)
@@ -178,9 +184,9 @@
class _BlockChoice(_BlockObject, _BlockContainerCommon):
def __init__(self, parent):
super(_BlockChoice, self).__init__(parent)
-# TODO
-self.entry = parent.entry
-_BlockConfigData(self, FileConfig(None))
+self.entry = FileChoice()
+parent.entry.append(self.entry)
+_BlockConfigData(self, self.entry)
def process_default(self, text, ind):
_BlockType(self, text, ind)
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
---
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
(original)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Thu Mar 13 08:46:09 2008
@@ -2,7 +2,7 @@
from debian_linux.config import ConfigCoreHierarchy
-from kconfigeditor.kconfig.menu.file import FileConfig
+from kconfigeditor.kconfig.menu.file import FileChoice, FileConfig
class Files(dict):
def __init__(self, root):
@@ -110,19 +110,36 @@
self.read(fd)
+def _dump_file_choice(self, processed, ignored, f):
+ret = []
+for i in f:
+if isinstance(i, FileConfig):
+ret.extend(self._dump_file_config(processed, ignored, i))
+if ret:
+ret.insert(0, ## choice: %s % f.prompt)
+ret.insert(-1, '## end choice')
+return ret
+
+def _dump_file_config(self, processed, ignored, i):
+ret = []
+e = self.get(i.name, None)
+if e is not None:
+if i.name in processed:
+pass
+elif i.prompt:
+processed.add(i.name)
+ret.append(e)
+else:
+ignored.add(i.name)
+return ret
+
def _dump_file(self, processed, ignored, f):
ret = []
for i in f:
if isinstance(i, FileConfig):
-e = self.get(i.name, None)
-if e is not None:
-if i.name in processed:
-pass
-elif i.prompt:
-processed.add(i.name)
-ret.append(e)
-else:
-ignored.add(i.name)
+ret.extend(self._dump_file_config(processed, ignored, i))
+elif isinstance(i, FileChoice):
+ret.extend(self._dump_file_choice(processed, ignored, i))
if ret:
ret[0:0] = [##, ## file: %s % f.filename, ##]
ret.append('')
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10820 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu
Author: waldi
Date: Thu Mar 13 08:46:41 2008
New Revision: 10820
Log:
lib/kconfigeditor/kconfig/menu/all.py: Make anything in arch/ arch-specific.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
==
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
Thu Mar 13 08:46:41 2008
@@ -14,8 +14,7 @@
while work:
filename = work.pop(0)
-filename_list = filename.split('/')
-if len(filename_list) 2 and filename_list[0] == 'arch':
+if filename.startswith('arch'):
self.filenames_arch[arch].append(filename)
else:
self.filenames_all.append(filename)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10822 - people/waldi/utils/kconfigeditor2/bin
Author: waldi Date: Thu Mar 13 09:03:35 2008 New Revision: 10822 Log: bin/process.py: Bail out on more then necessary arguments. Modified: people/waldi/utils/kconfigeditor2/bin/process.py Modified: people/waldi/utils/kconfigeditor2/bin/process.py == --- people/waldi/utils/kconfigeditor2/bin/process.py(original) +++ people/waldi/utils/kconfigeditor2/bin/process.pyThu Mar 13 09:03:35 2008 @@ -47,6 +47,9 @@ opts, args = options.parse_args() +if len(args) 1: +raise RuntimeError(Too much arguments.) + linux_root = args[0] package_root = opts.package or linux_root config_output = opts.config_output or os.path.join(package_root, 'debian/config') ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10821 - people/waldi/utils/kconfigeditor2/bin
Author: waldi
Date: Thu Mar 13 09:01:39 2008
New Revision: 10821
Log:
bin/process.py: Document options.
Modified:
people/waldi/utils/kconfigeditor2/bin/process.py
Modified: people/waldi/utils/kconfigeditor2/bin/process.py
==
--- people/waldi/utils/kconfigeditor2/bin/process.py(original)
+++ people/waldi/utils/kconfigeditor2/bin/process.pyThu Mar 13 09:01:39 2008
@@ -1,31 +1,57 @@
-import os, sys
+import optparse, os, sys
-root = sys.argv[1]
-output = sys.argv[2]
+def main(linux_root, package_root, config_output):
+from kconfigeditor.kconfig.menu.all import All
+from kconfigeditor.kconfig.package.files import Files
+
+package = Files(package_root)
+arches = {}
+for i in package.kernelarch.values():
+if i is not None:
+arches[i] = 1
+arches = arches.keys()
+
+menu = All(linux_root, arches)
+
+files = {}
+for key, filelist in package.iteritems():
+for f in filelist._files:
+files.setdefault(f.filename, (f, package.kernelarch[key]))
+
+for file, arch in files.itervalues():
+if arch is None:
+menufiles = menu.files_all.values()
+else:
+menufiles = menu.files_arch[arch].values()
+file.dump(config_output, menufiles)
+
+if __name__ == '__main__':
+try:
+import kconfigeditor
+except ImportError:
+sys.path.append(os.path.join(sys.path[0], '../lib'))
+
+options = optparse.OptionParser(
+usage = %prog [OPTION]... LINUX_ROOT
+)
+options.add_option(
+-p, --package,
+dest = package,
+help = location of linux-2.6 package [default: LINUX_ROOT]
+)
+options.add_option(
+-c, --config-output,
+dest = config_output,
+help = output directory for config [default:
{LINUX_ROOT,PACKAGE}/debian/config]
+)
+
+opts, args = options.parse_args()
+
+linux_root = args[0]
+package_root = opts.package or linux_root
+config_output = opts.config_output or os.path.join(package_root,
'debian/config')
-sys.path.append(os.path.join(sys.path[0], '../lib'))
-sys.path.append(os.path.join(root, debian/lib/python))
+sys.path.append(os.path.join(package_root, debian/lib/python))
+
+main(linux_root, package_root, config_output)
-from kconfigeditor.kconfig.menu.all import All
-from kconfigeditor.kconfig.package.files import Files
-
-package = Files(root)
-arches = {}
-for i in package.kernelarch.values():
-if i is not None:
-arches[i] = 1
-arches = arches.keys()
-
-menu = All(root, arches)
-
-files = {}
-for key, filelist in package.iteritems():
-for f in filelist._files:
-files.setdefault(f.filename, (f, package.kernelarch[key]))
-
-for file, arch in files.itervalues():
-if arch is None:
-menufiles = menu.files_all.values()
-else:
-menufiles = menu.files_arch[arch].values()
-file.dump(output, menufiles)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10823 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package
Author: waldi
Date: Thu Mar 13 09:07:52 2008
New Revision: 10823
Log:
lib/kconfigeditor/kconfig/package/files.py: Fix.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
---
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
(original)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Thu Mar 13 09:07:52 2008
@@ -117,7 +117,7 @@
ret.extend(self._dump_file_config(processed, ignored, i))
if ret:
ret.insert(0, ## choice: %s % f.prompt)
-ret.insert(-1, '## end choice')
+ret.append('## end choice')
return ret
def _dump_file_config(self, processed, ignored, i):
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10824 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu
Author: waldi Date: Thu Mar 13 10:06:34 2008 New Revision: 10824 Log: lib/kconfigeditor/kconfig/menu/file.py: Accept complete expression after if. Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py == --- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py (original) +++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py Thu Mar 13 10:06:34 2008 @@ -309,9 +309,10 @@ _BlockContainerCommon, _BlockContainerMenu, ): -def __init__(self, parent, name): +def __init__(self, parent, expression): super(_BlockIf, self).__init__(parent) self.entry = parent.entry +_BlockType(self, expression, '') def process_endif(self, text, ind): self.pop() ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10825 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu
Author: waldi
Date: Thu Mar 13 10:08:41 2008
New Revision: 10825
Log:
lib/kconfigeditor/kconfig/menu/file.py: Name expression correctly.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
==
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Thu Mar 13 10:08:41 2008
@@ -148,7 +148,7 @@
class _BlockContainerDepends(_BlockContainer):
def process_depends(self, text, ind):
-_BlockType(self, text, ind)
+_Expression(self, text)
class _BlockContainerMenu(_BlockContainer):
def process_menu(self, text, ind):
@@ -189,7 +189,7 @@
_BlockConfigData(self, self.entry)
def process_default(self, text, ind):
-_BlockType(self, text, ind)
+_Expression(self, text)
def process_endchoice(self, text, ind):
self.pop()
@@ -225,7 +225,7 @@
text = match.group('expression')
else:
raise Exception
-_BlockType(self, text, ind)
+_Expression(self, text)
def process_bool(self, text, ind):
# TODO
@@ -234,13 +234,13 @@
process_boolean = process_bool
def process_default(self, text, ind):
-_BlockType(self, text, ind)
+_Expression(self, text)
def process_def_bool(self, text, ind):
-_BlockType(self, text, ind)
+_Expression(self, text)
def process_def_tristate(self, text, ind):
-_BlockType(self, text, ind)
+_Expression(self, text)
def process_help(self, text, ind):
_BlockHelp(self, ind)
@@ -254,7 +254,7 @@
self._process_prompt(text, ind)
def process_option(self, text, ind):
-_BlockType(self, text, ind)
+_Expression(self, text)
def process_optional(self, text, ind):
pass
@@ -263,10 +263,10 @@
self._process_prompt(text, ind)
def process_range(self, text, ind):
-_BlockType(self, text, ind)
+_Expression(self, text)
def process_select(self, text, ind):
-_BlockType(self, text, ind)
+_Expression(self, text)
def process_string(self, text, ind):
# TODO
@@ -312,7 +312,7 @@
def __init__(self, parent, expression):
super(_BlockIf, self).__init__(parent)
self.entry = parent.entry
-_BlockType(self, expression, '')
+_Expression(self, expression)
def process_endif(self, text, ind):
self.pop()
@@ -348,9 +348,9 @@
self.entry = FileSource(text)
parent.entry.append(self.entry)
-class _BlockType(_Element):
-def __init__(self, parent, text, ind):
-super(_BlockType, self).__init__(parent)
+class _Expression(_Element):
+def __init__(self, parent, text):
+super(_Expression, self).__init__(parent)
self.process_line(text)
def process_line(self, text):
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10829 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu
Author: waldi
Date: Thu Mar 13 11:22:25 2008
New Revision: 10829
Log:
lib/kconfigeditor/kconfig/menu/file.py: Provide proper exception.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
==
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Thu Mar 13 11:22:25 2008
@@ -1,5 +1,15 @@
import re
+class ParseException(Exception):
+filename = None
+lineno = None
+
+def __init__(self, text):
+self.text = text
+
+def __str__(self):
+return %s:%d: %s % (self.filename, self.lineno, self.text)
+
class File(list):
def __init__(self, filename):
self.filename = filename
@@ -41,8 +51,10 @@
else:
try:
stack.top().process_line(line)
-except Exception, e:
-raise Exception(Can't parse: '%s' (%d): %s % (line,
lineno, e))
+except ParseException, e:
+e.filename = filename
+e.lineno = lineno
+raise
lineno += 1
return stack.top().process_stop(lineno, 0)
@@ -121,7 +133,7 @@
def process_line(self, text):
match = self.split_re.match(text)
if not match:
-raise Exception, Can't parse: '%s' % text
+raise ParseException(No match)
rest = match.group('rest1') or match.group('rest2')
getattr(self, process_%s % match.group('word'))(rest,
match.group('ind'))
@@ -224,7 +236,7 @@
self.entry.prompt = match.group('text1') or
match.group('text2')
text = match.group('expression')
else:
-raise Exception
+raise ParseException(Can't find a prompt)
_Expression(self, text)
def process_bool(self, text, ind):
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10830 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu
Author: waldi
Date: Thu Mar 13 11:24:29 2008
New Revision: 10830
Log:
lib/kconfigeditor/kconfig/menu/file.py: Support unquoted prompts.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
==
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Thu Mar 13 11:24:29 2008
@@ -133,7 +133,7 @@
def process_line(self, text):
match = self.split_re.match(text)
if not match:
-raise ParseException(No match)
+raise ParseException(Can't find a command)
rest = match.group('rest1') or match.group('rest2')
getattr(self, process_%s % match.group('word'))(rest,
match.group('ind'))
@@ -216,6 +216,8 @@
(?Ptext1.*((?=\\).*)*)
|
'(?Ptext2.*((?=\\).*)*)'
+|
+(?Ptext3\w+)
)
(
\s*
@@ -233,7 +235,7 @@
if text is not None:
match = self._prompt_re.match(text)
if match:
-self.entry.prompt = match.group('text1') or
match.group('text2')
+self.entry.prompt = match.group('text1') or
match.group('text2') or match.group('text3')
text = match.group('expression')
else:
raise ParseException(Can't find a prompt)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10773 - dists/trunk/linux-2.6/debian/config/powerpc
Author: waldi Date: Tue Mar 11 10:02:37 2008 New Revision: 10773 Log: debian/config/powerpc/config.powerpc * Set CONFIG_FEC_MPC52xx_MDIO=y. * Remove CONFIG_SND_PPC_MPC52xx_AC97. Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc == --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Tue Mar 11 10:02:37 2008 @@ -26,6 +26,5 @@ CONFIG_PPC_BESTCOMM_FEC=m CONFIG_PPC_BESTCOMM_GEN_BD=m CONFIG_FEC_MPC52xx=m -CONFIG_FEC_MPC52xx_MDIO=m -CONFIG_SND_PPC_MPC52xx_AC97=m +CONFIG_FEC_MPC52xx_MDIO=y CONFIG_SPI_MPC52xx_PSC=m ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10772 - in dists/trunk/linux-2.6/debian/config: . amd64 i386
Author: waldi Date: Tue Mar 11 10:00:39 2008 New Revision: 10772 Log: debian/config/amd64/config, debian/config/i386/config: Move CONFIG_DEBUG_BOOT_PARAMS setting from debian/config/config. Modified: dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/i386/config Modified: dists/trunk/linux-2.6/debian/config/amd64/config == --- dists/trunk/linux-2.6/debian/config/amd64/config(original) +++ dists/trunk/linux-2.6/debian/config/amd64/configTue Mar 11 10:00:39 2008 @@ -1327,3 +1327,4 @@ # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_NETDEVICES_MULTIQUEUE=y CONFIG_CRYPTO_SALSA20_X86_64=m +# CONFIG_DEBUG_BOOT_PARAMS is not set Modified: dists/trunk/linux-2.6/debian/config/config == --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Tue Mar 11 10:00:39 2008 @@ -1221,7 +1221,6 @@ CONFIG_EARLY_PRINTK=y # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_BOOT_PARAMS is not set CONFIG_XOR_BLOCKS=m CONFIG_ASYNC_MEMCPY=m Modified: dists/trunk/linux-2.6/debian/config/i386/config == --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Tue Mar 11 10:00:39 2008 @@ -1523,3 +1523,4 @@ CONFIG_FB_SYS_FILLRECT=m CONFIG_FB_SYS_FOPS=m CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_DEBUG_BOOT_PARAMS is not set ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10774 - dists/trunk/linux-2.6/debian/config/powerpc
Author: waldi Date: Tue Mar 11 10:38:51 2008 New Revision: 10774 Log: * debian/config/powerpc/config.powerpc-smp: Minimalize. * debian/config/powerpc/defines: Use powerpc config for powerpc-smp. Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-smp dists/trunk/linux-2.6/debian/config/powerpc/defines Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-smp == --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-smp (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-smp Tue Mar 11 10:38:51 2008 @@ -1,14 +1 @@ -CONFIG_PPC32=y -CONFIG_LOCK_KERNEL=y -CONFIG_STOP_MACHINE=y CONFIG_SMP=y -CONFIG_IRQ_ALL_CPUS=y -CONFIG_NR_CPUS=4 -# CONFIG_MAC_FLOPPY is not set -CONFIG_FLATMEM_MANUAL=y -CONFIG_FB_CONTROL=y -CONFIG_FB_PLATINUM=y -CONFIG_FB_VALKYRIE=y -CONFIG_FB_IMSTT=y -# CONFIG_PPC64 is not set -CONFIG_CLASSIC32=y Modified: dists/trunk/linux-2.6/debian/config/powerpc/defines == --- dists/trunk/linux-2.6/debian/config/powerpc/defines (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/defines Tue Mar 11 10:38:51 2008 @@ -27,6 +27,9 @@ [powerpc-smp_base] class: multiprocessor 32-bit PowerPC +[powerpc-smp_image] +configs: powerpc/config.powerpc powerpc/config.powerpc-smp + [powerpc-miboot_base] class: 32-bit PowerPC for miboot floppy ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10776 - dists/trunk/linux-2.6/debian/config/powerpc
Author: waldi Date: Tue Mar 11 11:49:06 2008 New Revision: 10776 Log: debian/config/powerpc/config.apus: Remove. Removed: dists/trunk/linux-2.6/debian/config/powerpc/config.apus ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10778 - dists/trunk/linux-2.6/debian/config/powerpc
Author: waldi Date: Tue Mar 11 11:56:20 2008 New Revision: 10778 Log: debian/config/powerpc/config, debian/config/powerpc/config.powerpc64: Remove not selectable options. Modified: dists/trunk/linux-2.6/debian/config/powerpc/config dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Modified: dists/trunk/linux-2.6/debian/config/powerpc/config == --- dists/trunk/linux-2.6/debian/config/powerpc/config (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config Tue Mar 11 11:56:20 2008 @@ -937,7 +937,6 @@ CONFIG_PPC_MERGE=y CONFIG_MPIC=y CONFIG_DEBUGGER=y -CONFIG_PPC_RTAS=y # CONFIG_MMIO_NVRAM is not set # CONFIG_PPC_82xx is not set # CONFIG_RTAS_ERROR_LOGGING is not set Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 == --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64Tue Mar 11 11:56:20 2008 @@ -39,7 +39,6 @@ CONFIG_HVC_CONSOLE=y CONFIG_HVCS=m CONFIG_IBMVETH=m -CONFIG_IBMVIO=y CONFIG_IOMMU_VMERGE=y # CONFIG_IRQSTACKS is not set CONFIG_KEYS_COMPAT=y ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10788 - people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu
Author: waldi
Date: Tue Mar 11 14:28:19 2008
New Revision: 10788
Log:
Update.
Modified:
people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
Modified: people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
==
--- people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
(original)
+++ people/waldi/utils/kconfigeditor2/kconfigeditor/kconfig/menu/file.py
Tue Mar 11 14:28:19 2008
@@ -11,14 +11,21 @@
def __repr__(self):
return %s(%s) % (self.__class__.__name__, self.name)
+class FileSource(object):
+def __init__(self, filename):
+self.filename = filename
+
+def __repr__(self):
+return %s(%s) % (self.__class__.__name__, self.filename)
+
class _Parser(object):
-def __call__(self, filename):
+def __call__(self, fd, filename):
lineno = 0
stack = _Stack()
_BlockRoot(stack, File(filename))
-for line in file(filename):
+for line in fd:
line = line.rstrip()
if not line:
stack.top().process_line_empty()
@@ -93,9 +100,9 @@
(?Pind\s*)
(---)?(?Pword[a-z_]+)(---)?
(
-\s+(?Prest1.+)
+\s*(?Prest2.+)
|
-(?Prest2.+)
+\s+(?Prest1.+)
)?
\s*
$
@@ -129,7 +136,7 @@
_BlockMenuconfig(self, text)
def process_source(self, text, ind):
-pass
+_BlockSource(self, text)
class _BlockContainerDepends(_BlockContainer):
def process_depends(self, text, ind):
@@ -289,6 +296,12 @@
self.entry = parent.entry
_BlockConfigData(self)
+class _BlockSource(_BlockObject):
+def __init__(self, parent, text):
+super(_BlockSource, self).__init__(parent)
+self.entry = FileSource(text)
+parent.entry.append(self.entry)
+
class _BlockType(_BlockObject):
def __init__(self, parent, text, ind):
super(_BlockType, self).__init__(parent)
@@ -301,3 +314,4 @@
self.nextline = False
else:
return self.recurse('process_line', text)
+
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10789 - in people/waldi/utils/kconfigeditor2: kconfigeditor lib lib/kconfigeditor
Author: waldi Date: Tue Mar 11 14:31:00 2008 New Revision: 10789 Log: Move. Added: people/waldi/utils/kconfigeditor2/lib/ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/ - copied from r10788, /people/waldi/utils/kconfigeditor2/kconfigeditor/ Removed: people/waldi/utils/kconfigeditor2/kconfigeditor/ ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10799 - in people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig: menu package
Author: waldi
Date: Tue Mar 11 15:33:25 2008
New Revision: 10799
Log:
Update.
Added:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/__init__.py
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Added: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
==
--- (empty file)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/all.py
Tue Mar 11 15:33:25 2008
@@ -0,0 +1,40 @@
+import os
+
+from file import FileSource, Parser
+
+class All(object):
+def __init__(self, root, arches):
+self.files = {}
+self.files_arch = {}
+self.filenames_all = []
+self.filenames_arch = {}
+
+for arch in arches:
+work = [arch/%s/Kconfig % arch]
+self.filenames_arch[arch] = []
+
+while work:
+filename = work.pop(0)
+filename_list = filename.split('/')
+if len(filename_list) 2 and filename_list[0] == 'arch':
+self.filenames_arch[arch].append(filename)
+else:
+self.filenames_all.append(filename)
+
+if filename in self.files:
+f = self.files[filename]
+else:
+f = self.files.setdefault(filename,
Parser()(file(os.path.join(root, filename)), filename))
+
+for i in f:
+if isinstance(i, FileSource):
+work.append(i.filename)
+
+for arch in arches:
+f = {}
+for i in self.filenames_all:
+f[i] = self.files[i]
+for i in self.filenames_arch[arch]:
+f[i] = self.files[i]
+self.files_arch[arch] = f
+
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
==
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Tue Mar 11 15:33:25 2008
@@ -18,7 +18,7 @@
def __repr__(self):
return %s(%s) % (self.__class__.__name__, self.filename)
-class _Parser(object):
+class Parser(object):
def __call__(self, fd, filename):
lineno = 0
Added:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/__init__.py
==
Added:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
--- (empty file)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Tue Mar 11 15:33:25 2008
@@ -0,0 +1,97 @@
+import os
+
+from debian_linux.config import ConfigCoreHierarchy
+
+class Files(dict):
+def __init__(self, root):
+self.files = {}
+self.filenames = {}
+self.root = os.path.join(root, debian/config)
+self.config = ConfigCoreHierarchy([self.root])
+
+self._read_base()
+
+for key, files in self.filenames.iteritems():
+r = self.setdefault(key, FileList())
+for f in files:
+if f in self.files:
+f = self.files[f]
+else:
+f = self.files.setdefault(f, File(None, f))
+r.append_file(f)
+
+def _read_arch(self, arch):
+kconfig = self.check_config(%s/config % arch, True, arch)
+self.filenames[arch,] = kconfig
+
+for featureset in self.config['base', arch]['featuresets']:
+self._read_featureset(arch, featureset)
+
+def _read_base(self):
+self.filenames[()] = self.check_config('config', True)
+
+for arch in self.config['base',]['arches']:
+self._read_arch(arch)
+
+def _read_featureset(self, arch, featureset):
+# TODO
+if featureset != 'none':
+return
+
+kconfig = []
+kconfig.extend(self.check_config(featureset-%s/config % featureset,
False, None, featureset))
+kconfig.extend(self.check_config(%s/%s/config % (arch, featureset),
False, arch, featureset))
+self.filenames[arch, featureset] = kconfig
+
+for flavour in self.config['base', arch, featureset]['flavours']:
+self._read_flavour(arch, featureset, flavour)
+
+def _read_flavour(self, arch, featureset, flavour):
+kconfig = []
+kconfig.extend(self.check_config(%s/config.%s % (arch, flavour),
False, arch, None, flavour))
+
[kernel] r10801 - people/waldi/utils/kconfigeditor2/bin
Author: waldi
Date: Tue Mar 11 16:18:07 2008
New Revision: 10801
Log:
bin: Add.
Added:
people/waldi/utils/kconfigeditor2/bin/
people/waldi/utils/kconfigeditor2/bin/process.py (contents, props changed)
Added: people/waldi/utils/kconfigeditor2/bin/process.py
==
--- (empty file)
+++ people/waldi/utils/kconfigeditor2/bin/process.pyTue Mar 11 16:18:07 2008
@@ -0,0 +1,32 @@
+import os, sys
+
+root = sys.argv[1]
+output = sys.argv[2]
+
+sys.path.append(os.path.join(sys.path[0], '../lib'))
+sys.path.append(os.path.join(root, debian/lib/python))
+
+from kconfigeditor.kconfig.menu.all import All
+from kconfigeditor.kconfig.package.files import Files
+
+package = Files(root)
+arches = {}
+for i in package.kernelarch.values():
+if i is not None:
+arches[i] = 1
+arches = arches.keys()
+
+menu = All(root, arches)
+
+files = {}
+for key, filelist in package.iteritems():
+for f in filelist._files:
+files.setdefault(f.filename, (f, package.kernelarch[key]))
+
+for file, arch in files.itervalues():
+if arch is None:
+menufiles = menu.files_all.values()
+else:
+menufiles = menu.files_arch[arch].values()
+menufiles.sort()
+file.dump(output, menufiles)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10802 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package
Author: waldi
Date: Tue Mar 11 16:26:41 2008
New Revision: 10802
Log:
lib/kconfigeditor/kconfig/package/files.py: Also dump unknown settings.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
---
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
(original)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Tue Mar 11 16:26:41 2008
@@ -110,12 +110,13 @@
self.read(fd)
-def _dump_file(self, fd, f):
+def _dump_file(self, processed, f):
ret = []
for i in f:
if isinstance(i, FileConfig):
e = self.get(i.name, None)
if e is not None:
+processed.add(i.name)
ret.append(e)
if ret:
ret[0:0] = [##, ## file: %s % f.filename, ##]
@@ -123,10 +124,25 @@
return ret
def dump(self, root, menufiles):
-fd = file(os.path.join(root, self.filename), 'w')
+filename = os.path.join(root, self.filename)
+if not os.path.exists(os.path.dirname(filename)):
+os.makedirs(os.path.dirname(filename))
+fd = file(filename, 'w')
+
ret = []
+processed = set()
for f in menufiles:
-ret.extend(self._dump_file(fd, f))
+ret.extend(self._dump_file(processed, f))
+
+s = set(self.keys())
+unprocessed = s - processed
+if unprocessed:
+ret.extend([##, ## file: unknown, ##])
+for i in unprocessed:
+e = self.get(i)
+ret.append(e)
+ret.append('')
+
for i in ret:
fd.write(str(i) + \n)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10805 - people/waldi/utils/kconfigeditor2/bin
Author: waldi Date: Tue Mar 11 17:03:38 2008 New Revision: 10805 Log: Fix filename sorting. Modified: people/waldi/utils/kconfigeditor2/bin/process.py Modified: people/waldi/utils/kconfigeditor2/bin/process.py == --- people/waldi/utils/kconfigeditor2/bin/process.py(original) +++ people/waldi/utils/kconfigeditor2/bin/process.pyTue Mar 11 17:03:38 2008 @@ -28,5 +28,4 @@ menufiles = menu.files_all.values() else: menufiles = menu.files_arch[arch].values() -menufiles.sort() file.dump(output, menufiles) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10806 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu
Author: waldi
Date: Tue Mar 11 17:39:58 2008
New Revision: 10806
Log:
lib/kconfigeditor/kconfig/menu/file.py
- Parse '-enclosed strings correctly.
- End text correctly.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
==
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Tue Mar 11 17:39:58 2008
@@ -4,37 +4,20 @@
def __init__(self, filename):
self.filename = filename
-def __lt__(self, other):
-return self.filename other.filename
-
-def __le__(self, other):
-return self.filename = other.filename
-
-def __eq__(self, other):
-return self.filename == other.filename
-
-def __ne__(self, other):
-return self.filename != other.filename
-
-def __gt__(self, other):
-return self.filename other.filename
-
-def __ge__(self, other):
-return self.filename = other.filename
-
class FileConfig(object):
def __init__(self, name):
self.name = name
+self.prompt = None
def __repr__(self):
-return %s(%s) % (self.__class__.__name__, self.name)
+return %s(%r, %r) % (self.__class__.__name__, self.name,
self.prompt)
class FileSource(object):
def __init__(self, filename):
self.filename = filename
def __repr__(self):
-return %s(%s) % (self.__class__.__name__, self.filename)
+return %s(%r) % (self.__class__.__name__, self.filename)
class Parser(object):
def __call__(self, fd, filename):
@@ -50,6 +33,8 @@
elif line.lstrip()[0] == '#':
pass
else:
+print line
+print stack._list
stack.top().process_line(line)
lineno += 1
return stack.top().process_stop(lineno, 0)
@@ -118,7 +103,7 @@
(?Pind\s*)
(---\s*)?(?Pword[a-z_]+)(\s*---)?
(
-\s*(?Prest2.+)
+\s*(?Prest2['].+)
|
\s+(?Prest1.+)
)?
@@ -154,6 +139,7 @@
_BlockMenuconfig(self, text)
def process_source(self, text, ind):
+text = text.strip('')
_BlockSource(self, text)
class _BlockContainerDepends(_BlockContainer):
@@ -196,7 +182,7 @@
super(_BlockChoice, self).__init__(parent)
# TODO
self.entry = parent.entry
-_BlockConfigData(self)
+_BlockConfigData(self, FileConfig(None))
def process_default(self, text, ind):
_BlockType(self, text, ind)
@@ -208,8 +194,37 @@
pass
class _BlockConfigData(_BlockObject, _BlockContainerDepends):
+_prompt_rules = r
+^
+(
+(?Ptext1[^]*)
+|
+'(?Ptext2[^']*)'
+)
+(
+\s*
+if
+\s+
+(?Pexpression.*)
+)?
+$
+_prompt_re = re.compile(_prompt_rules, re.X)
+
+def __init__(self, parent, entry):
+super(_BlockConfigData, self).__init__(parent)
+self.entry = entry
+
+def _process_prompt(self, text, ind):
+if text is not None:
+match = self._prompt_re.match(text)
+if match:
+self.entry.prompt = match.group('text1') or
match.group('text2')
+text = match.group('expression')
+_BlockType(self, text, ind)
+
def process_bool(self, text, ind):
-_BlockType(self, text, ind)
+# TODO
+self._process_prompt(text, ind)
process_boolean = process_bool
@@ -226,10 +241,12 @@
_BlockHelp(self, ind)
def process_hex(self, text, ind):
-_BlockType(self, text, ind)
+# TODO
+self._process_prompt(text, ind)
def process_int(self, text, ind):
-_BlockType(self, text, ind)
+# TODO
+self._process_prompt(text, ind)
def process_option(self, text, ind):
_BlockType(self, text, ind)
@@ -238,7 +255,7 @@
pass
def process_prompt(self, text, ind):
-pass
+self._process_prompt(text, ind)
def process_range(self, text, ind):
_BlockType(self, text, ind)
@@ -247,15 +264,16 @@
_BlockType(self, text, ind)
def process_string(self, text, ind):
-_BlockType(self, text, ind)
+# TODO
+self._process_prompt(text, ind)
def process_tristate(self, text, ind):
-_BlockType(self, text, ind)
+# TODO
+self._process_prompt(text, ind)
class _BlockConfig(_BlockConfigData):
def __init__(self, parent, name):
-super(_BlockConfig, self).__init__(parent)
-self.entry = FileConfig(name)
+super(_BlockConfig, self).__init__(parent, FileConfig(name))
parent.entry.append(self.entry)
class _BlockHelp(_BlockObject):
@@ -320,7 +338,7 @@
[kernel] r10807 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu
Author: waldi Date: Tue Mar 11 17:40:25 2008 New Revision: 10807 Log: lib/kconfigeditor/kconfig/menu/file.py: Remove debugging code. Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py Modified: people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py == --- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py (original) +++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py Tue Mar 11 17:40:25 2008 @@ -33,8 +33,6 @@ elif line.lstrip()[0] == '#': pass else: -print line -print stack._list stack.top().process_line(line) lineno += 1 return stack.top().process_stop(lineno, 0) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10808 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package
Author: waldi
Date: Tue Mar 11 17:44:29 2008
New Revision: 10808
Log:
lib/kconfigeditor/kconfig/package/files.py
- Remove options without prompt.
- Update file sort.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
---
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
(original)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Tue Mar 11 17:44:29 2008
@@ -117,7 +117,8 @@
e = self.get(i.name, None)
if e is not None:
processed.add(i.name)
-ret.append(e)
+if i.prompt:
+ret.append(e)
if ret:
ret[0:0] = [##, ## file: %s % f.filename, ##]
ret.append('')
@@ -129,6 +130,16 @@
os.makedirs(os.path.dirname(filename))
fd = file(filename, 'w')
+def menufiles_cmp_key(entry):
+filename_list = entry.filename.split('/')
+if filename_list[-1] == 'Kconfig':
+filename_list.pop()
+else:
+filename_list[-1] = filename_list[-1].replace('Kconfig.', '')
+return filename_list
+
+menufiles.sort(key = menufiles_cmp_key)
+
ret = []
processed = set()
for f in menufiles:
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10809 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu
Author: waldi
Date: Tue Mar 11 17:50:50 2008
New Revision: 10809
Log:
lib/kconfigeditor/kconfig/menu/file.py
- Empty lines are not sensitive in this language.
- Expressions are selfcontained.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
==
--- people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
(original)
+++ people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/menu/file.py
Tue Mar 11 17:50:50 2008
@@ -29,7 +29,7 @@
for line in fd:
line = line.rstrip()
if not line:
-stack.top().process_line_empty()
+pass
elif line.lstrip()[0] == '#':
pass
else:
@@ -116,9 +116,6 @@
rest = match.group('rest1') or match.group('rest2')
getattr(self, process_%s % match.group('word'))(rest,
match.group('ind'))
-def process_line_empty(self):
-pass
-
class _BlockContainerChoice(_BlockContainer):
def process_choice(self, text, ind):
_BlockChoice(self)
@@ -297,10 +294,6 @@
return self.recurse('process_line', text)
-def process_line_empty(self):
-pass
-
-
class _BlockIf(_BlockObject,
_BlockContainerChoice,
_BlockContainerCommon,
@@ -344,7 +337,7 @@
self.entry = FileSource(text)
parent.entry.append(self.entry)
-class _BlockType(_BlockObject):
+class _BlockType(_Element):
def __init__(self, parent, text, ind):
super(_BlockType, self).__init__(parent)
self.process_line(text)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10811 - people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package
Author: waldi
Date: Tue Mar 11 18:40:35 2008
New Revision: 10811
Log:
lib/kconfigeditor/kconfig/package/files.py: Dump duplicated symbols correctly.
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Modified:
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
==
---
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
(original)
+++
people/waldi/utils/kconfigeditor2/lib/kconfigeditor/kconfig/package/files.py
Tue Mar 11 18:40:35 2008
@@ -110,15 +110,17 @@
self.read(fd)
-def _dump_file(self, processed, f):
+def _dump_file(self, processed, ignored, f):
ret = []
for i in f:
if isinstance(i, FileConfig):
e = self.get(i.name, None)
if e is not None:
-processed.add(i.name)
if i.prompt:
+processed.add(i.name)
ret.append(e)
+else:
+ignored.add(i.name)
if ret:
ret[0:0] = [##, ## file: %s % f.filename, ##]
ret.append('')
@@ -142,11 +144,12 @@
ret = []
processed = set()
+ignored = set()
for f in menufiles:
-ret.extend(self._dump_file(processed, f))
+ret.extend(self._dump_file(processed, ignored, f))
s = set(self.keys())
-unprocessed = s - processed
+unprocessed = s - processed - ignored
if unprocessed:
ret.extend([##, ## file: unknown, ##])
for i in unprocessed:
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10742 - people/waldi/dkt/lib/dkt/hooks/modules
Author: waldi
Date: Sat Mar 8 19:47:25 2008
New Revision: 10742
Log:
lib/dkt/hooks/modules/backward_config_boot.py: Set initramfs filename in config.
Modified:
people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
==
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
(original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py Sat Mar
8 19:47:25 2008
@@ -33,18 +33,18 @@
for l in configs.itervalues():
if IImageBaseConfig(l).file == image_file:
-return self._update_config(l, data)
+return self._update_config(l, *data)
return self._add_config(configs, version, *data)
-def _update_config(self, config, data):
-symlinks_file = data[2]
-
+def _update_config(self, config, image_file, initramfs_file,
symlinks_file):
config = IMutableConfig(config)
if symlinks_file is not None:
config.add_section('backward-compatibility')
config.set('backward-compatibility', 'symlink-file', symlinks_file)
+config.add_section('initramfs')
+config.set('initramfs', 'file', initramfs_file)
def _get_files(self):
ret = ([], [], [], [])
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10743 - people/waldi/dkt/lib/dkt/support
Author: waldi
Date: Sat Mar 8 19:47:43 2008
New Revision: 10743
Log:
lib/dkt/support/ordered_dict.py: Add __repr__.
Modified:
people/waldi/dkt/lib/dkt/support/ordered_dict.py
Modified: people/waldi/dkt/lib/dkt/support/ordered_dict.py
==
--- people/waldi/dkt/lib/dkt/support/ordered_dict.py(original)
+++ people/waldi/dkt/lib/dkt/support/ordered_dict.pySat Mar 8 19:47:43 2008
@@ -14,6 +14,12 @@
def __getitem__(self, key):
return self._data.__getitem__(key)
+def __repr__(self):
+ret = []
+for item in self.iteritems():
+ret.append('%r: %r' % item)
+return '%s({' % self.__class__.__name__ + ', '.join(ret) + '})'
+
def __setitem__(self, key, value):
self._data.__setitem__(key, value)
if key not in self._keys:
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10744 - people/waldi/dkt/lib/dkt/bin
Author: waldi Date: Sat Mar 8 20:35:51 2008 New Revision: 10744 Log: lib/dkt/bin/base.py: Update. Modified: people/waldi/dkt/lib/dkt/bin/base.py Modified: people/waldi/dkt/lib/dkt/bin/base.py == --- people/waldi/dkt/lib/dkt/bin/base.py(original) +++ people/waldi/dkt/lib/dkt/bin/base.pySat Mar 8 20:35:51 2008 @@ -22,6 +22,12 @@ self.imageconfigs.read_dir(dir) default_registry.run(IImageConfig, 'image_config', self.imageconfigs, self.config) +def bootconfig_deploy(self): +# XXX +ret = default_registry.run(IBootConfigDeploy, 'boot_config_deploy', self.bootconfig, self.config) +if ret is None: +raise RuntimeError + def bootconfig_generate(self): # XXX bootconfig = default_registry.run(IBootConfigPrepare, 'boot_config_prepare', [], self.config, self.imageconfigs) @@ -34,6 +40,11 @@ return i raise KeyError(package) +def imageconfig_delete(self, package): +for name, value in self.imageconfigs.iteritems(): +if IImageBaseConfig(name).package == package: +del self.imageconfigs[name] + def run_imagetask(self, type, *args): return default_registry.run(IImageTask, 'image_' + type, self.config, *args) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10745 - people/waldi/dkt/lib/dkt/hooks/modules
Author: waldi
Date: Sat Mar 8 21:16:36 2008
New Revision: 10745
Log:
* lib/dkt/hooks/modules/backward_config_boot.py: Remove symlink handling.
* lib/dkt/hooks/modules/backward_symlinks.py: Add symlink handling.
Modified:
people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
==
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
(original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py Sat Mar
8 21:16:36 2008
@@ -6,7 +6,7 @@
from dkt.imageconfig.interfaces import IImageBaseConfig
class Hook(object):
-def _add_config(self, configs, version, image_file, initramfs_file,
symlinks_file):
+def _add_config(self, configs, version, image_file, initramfs_file):
c = {
'image': {
@@ -21,11 +21,6 @@
if initramfs_file is not None:
c['initramfs'] = {'file': initramfs_file}
-if symlinks_file is not None:
-c['backward-compatibility'] = {
-'symlink-file': symlinks_file,
-}
-
configs.add('boot-backward-' + version, MutableConfig(c))
def _check_config(self, configs, version, data):
@@ -37,46 +32,35 @@
return self._add_config(configs, version, *data)
-def _update_config(self, config, image_file, initramfs_file,
symlinks_file):
+def _update_config(self, config, image_file, initramfs_file):
config = IMutableConfig(config)
-if symlinks_file is not None:
-config.add_section('backward-compatibility')
-config.set('backward-compatibility', 'symlink-file', symlinks_file)
+if initramfs_file is not None:
config.add_section('initramfs')
config.set('initramfs', 'file', initramfs_file)
def _get_files(self):
-ret = ([], [], [], [])
+ret = ([], [])
for root, dirs, files in os.walk('/boot'):
del dirs[:]
for file in files:
real_file = os.path.join(root, file)
file_parts = file.split('-', 1)
+
+if file.endswith('.bak'):
+continue
+if os.path.islink(real_file):
+continue
+
+version = unknown
+if len(file_parts) 1:
+version = file_parts[1]
+
if file_parts[0] in (vmlinuz, vmlinux):
-if len(file_parts) 1:
-ret[0].append((real_file, file_parts[1]))
-else:
-ret[2].append((real_file, file))
-elif file in (vmlinuz.old, vmlinux.old):
-ret[2].append((real_file, file))
+ret[0].append((real_file, version))
elif file_parts[0] in (initrd.img,):
-if len(file_parts) 1:
-ret[1].append((real_file, file_parts[1]))
-else:
-ret[3].append((real_file, file))
-elif file in (initrd.img.old):
-ret[3].append((real_file, file))
-
-for root, dirs, files in os.walk('/'):
-del dirs[:]
-for file in files:
-real_file = os.path.join(root, file)
-if file in (vmlinuz, vmlinux):
-ret[2].append((real_file, file))
-elif file in (initrd.img):
-ret[3].append((real_file, file))
+ret[1].append((real_file, version))
return ret
@@ -85,35 +69,15 @@
versions = {}
for file in iter(files[0]):
-if file[0].endswith('.bak'):
-continue
version = file[1]
-e = versions.setdefault(version, [None, None, None])
+e = versions.setdefault(version, [None, None])
e[0] = file[0]
for file in iter(files[1]):
-if file[0].endswith('.bak'):
-continue
version = file[1]
-e = versions.setdefault(version, [None, None, None])
+e = versions.setdefault(version, [None, None])
e[1] = file[0]
-for file in iter(files[2]):
-if not os.path.islink(file[0]):
-e = versions.setdefault(unknown, [None, None, None])
-e[0] = file[0]
-else:
-link = os.readlink(file[0])
-link_parts = os.path.basename(link).split('-', 1)
-e = versions.get(link_parts[1], None)
-if e is not None:
-e[2] = file[0]
-
-for file in iter(files[3]):
-if not os.path.islink(file[0]):
-e = versions.setdefault(unknown, [None, None, None])
-
[kernel] r10746 - people/waldi/dkt/lib/dkt/bootconfig
Author: waldi
Date: Sat Mar 8 21:17:26 2008
New Revision: 10746
Log:
lib/dkt/bootconfig/hooks.py: Add new hook.
Modified:
people/waldi/dkt/lib/dkt/bootconfig/hooks.py
Modified: people/waldi/dkt/lib/dkt/bootconfig/hooks.py
==
--- people/waldi/dkt/lib/dkt/bootconfig/hooks.py(original)
+++ people/waldi/dkt/lib/dkt/bootconfig/hooks.pySat Mar 8 21:17:26 2008
@@ -3,6 +3,12 @@
class HookPartitionRescue(object):
def boot_config_partition(self, bootconfigs, systemconfig):
+# TODO
+return bootconfigs
+
+class HookPartitionSystemconfig(object):
+def boot_config_partition(self, bootconfigs, systemconfig):
+# TODO
return bootconfigs
class HookSort(object):
@@ -13,5 +19,6 @@
ret.extend(i)
return ret
-register('bootconfig-partition-rescue', IBootConfigPartition,
HookPartitionRescue(), default_registry.PRIORITY_FIRST)
+register('bootconfig-partition-rescue', IBootConfigPartition,
HookPartitionRescue(), default_registry.PRIORITY_LAST)
+register('bootconfig-partition-systemconfig', IBootConfigPartition,
HookPartitionSystemconfig(), default_registry.PRIORITY_FIRST)
register('bootconfig-sort', IBootConfigSort, HookSort(),
default_registry.PRIORITY_LAST)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10747 - people/waldi/dkt/bin
Author: waldi
Date: Sat Mar 8 21:17:44 2008
New Revision: 10747
Log:
bin/dkt-maintainer: postinst and prerm works.
Modified:
people/waldi/dkt/bin/dkt-maintainer
Modified: people/waldi/dkt/bin/dkt-maintainer
==
--- people/waldi/dkt/bin/dkt-maintainer (original)
+++ people/waldi/dkt/bin/dkt-maintainer Sat Mar 8 21:17:44 2008
@@ -80,7 +80,8 @@
def __call__(self):
self.run_systemtask()
self.run_imagetask('postinst', self.imageconfig, (self.command,) +
self.args)
-raise NotImplementedError
+self.bootconfig_generate()
+self.bootconfig_deploy()
class MainImagePreRm(MainAllPreRm):
def __init__(self, *args):
@@ -95,7 +96,12 @@
def __call__(self):
self.run_systemtask()
self.run_imagetask('prerm', self.imageconfig, (self.command,) +
self.args)
-raise NotImplementedError
+self.bootconfig_generate()
+for i in self.bootconfig:
+if i.config.package == self.package:
+self.bootconfig.remove(i)
+break
+self.bootconfig_deploy()
class MainImagePostRm(MainAllPostRm):
def __call__(self):
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10748 - people/waldi/dkt/lib/dkt/hooks/modules
Author: waldi
Date: Sat Mar 8 21:27:17 2008
New Revision: 10748
Log:
lib/dkt/hooks/modules/backward_symlinks.py:
Support image with current and old links.
Modified:
people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
==
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py (original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py Sat Mar 8
21:27:17 2008
@@ -19,7 +19,7 @@
if IImageBaseConfig(l).file == target:
self._set_config(l, 'symlink-dir', dir)
self._set_config(l, 'symlink-image-file', file)
-self._set_config(l, 'symlink-type', type)
+self._set_config(l, 'symlink-type-' + type, True)
return
def _get_files_dir(self, act, old, dir):
@@ -69,8 +69,8 @@
dir, file, act, old = self._get_files()
-self._check_file_config(configs, 0, act, dir, file)
-self._check_file_config(configs, 1, old, dir, file)
+self._check_file_config(configs, act, act, dir, file)
+self._check_file_config(configs, old, old, dir, file)
def image_preinst(*args):
pass
@@ -123,10 +123,9 @@
for i in chain(*bootconfigs):
config = i.config
if 'backward-compatibility' in config:
-symlink_type = config.get('backward-compatibility',
'symlink-type', None)
-if symlink_type == 0:
+if config.get('backward-compatibility', 'symlink-type-act',
None):
symlink_act = i
-if symlink_type == 1:
+if config.get('backward-compatibility', 'symlink-type-old',
None):
symlink_old = i
if config.get('backward-compatibility', 'symlink-create',
None):
@@ -143,9 +142,9 @@
if symlink_remove is not None:
if symlink_remove is symlink_act:
-raise NotImplementedError
+symlink_act = symlink_old
elif symlink_remove is symlink_old:
-raise NotImplementedError
+symlink_old = symlink_act
ret = []
if symlink_old is not None:
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10749 - people/waldi/dkt/lib/dkt/bootconfig
Author: waldi Date: Sat Mar 8 21:27:43 2008 New Revision: 10749 Log: lib/dkt/bootconfig: Add all image configs. Modified: people/waldi/dkt/lib/dkt/bootconfig/base.py people/waldi/dkt/lib/dkt/bootconfig/interfaces.py people/waldi/dkt/lib/dkt/bootconfig/linux.py Modified: people/waldi/dkt/lib/dkt/bootconfig/base.py == --- people/waldi/dkt/lib/dkt/bootconfig/base.py (original) +++ people/waldi/dkt/lib/dkt/bootconfig/base.py Sat Mar 8 21:27:43 2008 @@ -6,8 +6,8 @@ class BootConfigBase(object): implements(IBootBaseConfig) -def __init__(self, config): -self.config = config +def __init__(self, configs): +self.configs = configs def __cmp__(self, other): if other is None: Modified: people/waldi/dkt/lib/dkt/bootconfig/interfaces.py == --- people/waldi/dkt/lib/dkt/bootconfig/interfaces.py (original) +++ people/waldi/dkt/lib/dkt/bootconfig/interfaces.py Sat Mar 8 21:27:43 2008 @@ -4,12 +4,12 @@ features = Attribute() version = Attribute() +configs = Attribute() + class IBootMainConfig(IBootBaseConfig): kernel_entry = Attribute() initrd_file = Attribute() -config = Attribute() - class IBootMultibootConfig(IBootBaseConfig): kernel_entry = Attribute() module_entries = Attribute() Modified: people/waldi/dkt/lib/dkt/bootconfig/linux.py == --- people/waldi/dkt/lib/dkt/bootconfig/linux.py(original) +++ people/waldi/dkt/lib/dkt/bootconfig/linux.pySat Mar 8 21:27:43 2008 @@ -9,7 +9,8 @@ implements(IBootMainConfig) def __init__(self, config): -super(BootConfigLinux, self).__init__(config) +super(BootConfigLinux, self).__init__([config]) +self.config = config self.kernel_entry = BootEntry(IImageBaseConfig(self.config).file, ) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10751 - people/waldi/dkt/lib/dkt/support
Author: waldi
Date: Sat Mar 8 22:03:13 2008
New Revision: 10751
Log:
lib/dkt/support/system.py: Add.
Added:
people/waldi/dkt/lib/dkt/support/system.py
Added: people/waldi/dkt/lib/dkt/support/system.py
==
--- (empty file)
+++ people/waldi/dkt/lib/dkt/support/system.py Sat Mar 8 22:03:13 2008
@@ -0,0 +1,10 @@
+def _architecture():
+import os
+f = os.popen('dpkg --print-architecture')
+ret = f.readline().strip()
+if f.close():
+raise RuntimeError
+return ret
+
+architecture = _architecture()
+
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10752 - people/waldi/dkt/lib/dkt/hooks/modules
Author: waldi
Date: Sat Mar 8 22:04:38 2008
New Revision: 10752
Log:
lib/dkt/hooks/modules/backward_symlinks.py:
Use default values for symlink targets and dir.
Modified:
people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
==
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py (original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py Sat Mar 8
22:04:38 2008
@@ -4,6 +4,7 @@
from dkt.config.interfaces import IMutableConfig
from dkt.hooks import default_registry, interfaces, register
from dkt.imageconfig.interfaces import IImageBaseConfig
+from dkt.support.system import architecture
class Hook(object):
def _check_active(self, systemconfig):
@@ -133,8 +134,19 @@
if config.get('backward-compatibility', 'symlink-remove',
None):
symlink_remove = i
-symlink_dir = symlink_act.config.get('backward-compatibility',
'symlink-dir')
-symlink_image_file = symlink_act.config.get('backward-compatibility',
'symlink-image-file')
+if symlink_act:
+symlink_dir = symlink_act.config.get('backward-compatibility',
'symlink-dir')
+symlink_image_file =
symlink_act.config.get('backward-compatibility', 'symlink-image-file')
+elif symlink_old:
+symlink_dir = symlink_old.config.get('backward-compatibility',
'symlink-dir')
+symlink_image_file =
symlink_old.config.get('backward-compatibility', 'symlink-image-file')
+else:
+symlink_dir = '/'
+if systemconfig.get('backward-compatibility', 'kpkg-link-in-boot',
None):
+symlink_dir = '/boot'
+symlink_image_file = vmlinuz
+if architecture in ('mips', 'mipsel', 'hppa', 'powerpc'):
+symlink_image_file = vmlinux
if symlink_create is not None and symlink_create is not symlink_act
and symlink_create is not symlink_old:
symlink_old = symlink_act
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10753 - people/waldi/dkt/lib/dkt/config
Author: waldi Date: Sat Mar 8 22:16:17 2008 New Revision: 10753 Log: lib/dkt/config/base.py, lib/dkt/config/interfaces.py: Add setdefault. Modified: people/waldi/dkt/lib/dkt/config/base.py people/waldi/dkt/lib/dkt/config/interfaces.py Modified: people/waldi/dkt/lib/dkt/config/base.py == --- people/waldi/dkt/lib/dkt/config/base.py (original) +++ people/waldi/dkt/lib/dkt/config/base.py Sat Mar 8 22:16:17 2008 @@ -93,3 +93,7 @@ s = self._sections.get(section) s[option] = value +def setdefault(self, section, option, value = None): +s = self._sections.get(section) +return s.setdefault(option, value) + Modified: people/waldi/dkt/lib/dkt/config/interfaces.py == --- people/waldi/dkt/lib/dkt/config/interfaces.py (original) +++ people/waldi/dkt/lib/dkt/config/interfaces.py Sat Mar 8 22:16:17 2008 @@ -32,3 +32,6 @@ def set(section, option, value): pass +def setdefault(section, option, value = None): +pass + ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10728 - dists/trunk/firmware-nonfree/debian/bin
Author: waldi
Date: Thu Mar 6 10:55:28 2008
New Revision: 10728
Log:
debian/bin/gencontrol.py
- Fix files with including dash.
- Get version info from config if not included in filename.
- Fix firmware file description.
Modified:
dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py (original)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py Thu Mar 6
10:55:28 2008
@@ -93,27 +93,33 @@
file(debian/firmware-%s.copyright % package,
'w').write(self.substitute(copyright, vars))
-files_orig = set(config_entry['files'])
-files = {}
-for r in os.walk(package):
-for t in r[2]:
-t1 = t.rsplit('-', 1)
-if len(t1) == 1:
-t1.append(unknown)
-if t1[0] in files_orig:
-if t1[0] in files:
-raise RuntimeError(Multiple files for %s % t1[0])
-files[t1[0]] = t, t1[1]
+files_orig = config_entry['files']
+files_real = {}
-makeflags['FILES'] = ' '.join([%s:%s % (i[1][0], i[0]) for i in
files.iteritems()])
+for root, dirs, files in os.walk(package):
+del dirs[:]
+for f in files:
+f1 = f.rsplit('-', 1)
+if f in files_orig:
+files_real[f] = f, f, None
+elif len(f1) 1:
+f_base, f_version = f1
+if f_base in files_orig:
+if f_base in files_real:
+raise RuntimeError(Multiple files for %s %
f_base)
+files_real[f_base] = f_base, f, f_version
+
+makeflags['FILES'] = ' '.join([%s:%s % (i[1], i[0]) for i in
files_real.itervalues()])
vars['files_real'] = ' '.join([/lib/firmware/%s % i for i in
config_entry['files']])
files_desc = [Contents:]
for f in config_entry['files']:
-f_in, version = files[f]
+base, f, version = files_real[f]
c = self.config.get(('base', package, f), {})
desc = c.get('desc', f)
+if version is None:
+version = c.get('version', 'unknown')
files_desc.append( * %s, version %s % (desc, version))
packages_binary = self.process_packages(binary, vars)
@@ -218,7 +224,7 @@
packages = config['base',]['packages']
for section in iter(config):
-real = (section[-1],) + section[1:]
+real = (section[-1],) + section[:-1]
self[real] = config[section]
for package in packages:
@@ -229,7 +235,7 @@
config.read(%s/%s % (package, self.config_name))
for section in iter(config):
-real = (section[-1], package)
+real = (section[-1], package) + section[:-1]
s = self.get(real, {})
s.update(config[section])
self[real] = s
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10732 - in dists/trunk/firmware-nonfree: iwlwifi qlogic
Author: waldi Date: Thu Mar 6 11:01:50 2008 New Revision: 10732 Log: iwlwifi/defines, qlogic/defines: Fix file sections. Modified: dists/trunk/firmware-nonfree/iwlwifi/defines dists/trunk/firmware-nonfree/qlogic/defines Modified: dists/trunk/firmware-nonfree/iwlwifi/defines == --- dists/trunk/firmware-nonfree/iwlwifi/defines(original) +++ dists/trunk/firmware-nonfree/iwlwifi/definesThu Mar 6 11:01:50 2008 @@ -6,8 +6,8 @@ longdesc: Intel Wireless 3945 and 4965 cards uri: http://intellinuxwireless.org/?p=iwlwifin=downloads -[iwlwifi-3945-1.ucode] +[iwlwifi-3945-1.ucode_base] desc: Intel Wireless 3945 firmware -[iwlwifi-4965-1.ucode] +[iwlwifi-4965-1.ucode_base] desc: Intel Wireless 4965 firmware Modified: dists/trunk/firmware-nonfree/qlogic/defines == --- dists/trunk/firmware-nonfree/qlogic/defines (original) +++ dists/trunk/firmware-nonfree/qlogic/defines Thu Mar 6 11:01:50 2008 @@ -11,20 +11,20 @@ support: initramfs-tools uri: ftp://ftp.qlogic.com/outgoing/linux/firmware/ -[ql2100_fw.bin] +[ql2100_fw.bin_base] desc: QLogic QLA21XX firmware -[ql2200_fw.bin] +[ql2200_fw.bin_base] desc: QLogic QLA22XX firmware -[ql2300_fw.bin] +[ql2300_fw.bin_base] desc: QLogic QLA2300, 2312, 6312 firmware -[ql2322_fw.bin] +[ql2322_fw.bin_base] desc: QLogic QLA2322, 6322 firmware -[ql2400_fw.bin] +[ql2400_fw.bin_base] desc: QLogic QLA24XX firmware -[ql2500_fw.bin] +[ql2500_fw.bin_base] desc: QLogic QLA25XX firmware ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10735 - in dists/trunk/linux-2.6/debian: . patches/debian/dfsg patches/series
Author: waldi
Date: Thu Mar 6 12:02:59 2008
New Revision: 10735
Log:
* debian/changelog: Update.
* debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch: Add.
* debian/patches/series/1~experimental.1: New patch.
Added:
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Modified: dists/trunk/linux-2.6/debian/changelog
==
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Thu Mar 6 12:02:59 2008
@@ -57,6 +57,8 @@
- Broadcom NetXtremeII 10Gb support
* Disable now broken drivers:
- Broadcom NetXtremeII 10Gb support
+ * Fix broken drivers:
+- Broadcom NetXtremeII support
* [powerpc] Use new wrapper install support.
-- Bastian Blank [EMAIL PROTECTED] Tue, 26 Feb 2008 23:59:55 -0700
Added:
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
==
--- (empty file)
+++
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
Thu Mar 6 12:02:59 2008
@@ -0,0 +1,531 @@
+diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
+index 8b552c6..ec72b56 100644
+--- a/drivers/net/bnx2.c
b/drivers/net/bnx2.c
+@@ -46,11 +46,10 @@
+ #include linux/crc32.h
+ #include linux/prefetch.h
+ #include linux/cache.h
+-#include linux/zlib.h
++#include linux/firmware.h
+
+ #include bnx2.h
+-#include bnx2_fw.h
+-#include bnx2_fw2.h
++#include bnx2_fw_file.h
+
+ #define FW_BUF_SIZE 0x1
+
+@@ -58,12 +57,20 @@
+ #define PFX DRV_MODULE_NAME :
+ #define DRV_MODULE_VERSION1.7.4
+ #define DRV_MODULE_RELDATEFebruary 18, 2008
++#define FW_FILE_06bnx2-06-4.0.5.fw
++#define FW_FILE_09bnx2-09-4.0.5.fw
+
+ #define RUN_AT(x) (jiffies + (x))
+
+ /* Time in jiffies before concluding the transmitter is hung. */
+ #define TX_TIMEOUT (5*HZ)
+
++#ifdef DEBUG
++# define DPRINTK(fmt, args...) printk(KERN_DEBUG %s: fmt, __FUNCTION__ ,
## args)
++#else
++# define DPRINTK(fmt, args...)
++#endif
++
+ static char version[] __devinitdata =
+ Broadcom NetXtreme II Gigabit Ethernet Driver DRV_MODULE_NAME v
DRV_MODULE_VERSION ( DRV_MODULE_RELDATE )\n;
+
+@@ -71,6 +78,8 @@ MODULE_AUTHOR(Michael Chan [EMAIL PROTECTED]);
+ MODULE_DESCRIPTION(Broadcom NetXtreme II BCM5706/5708 Driver);
+ MODULE_LICENSE(GPL);
+ MODULE_VERSION(DRV_MODULE_VERSION);
++MODULE_FIRMWARE(FW_FILE_06);
++MODULE_FIRMWARE(FW_FILE_09);
+
+ static int disable_msi = 0;
+
+@@ -3161,26 +3170,32 @@ bnx2_set_rx_mode(struct net_device *dev)
+ spin_unlock_bh(bp-phy_lock);
+ }
+
+-static void
+-load_rv2p_fw(struct bnx2 *bp, __le32 *rv2p_code, u32 rv2p_code_len,
+- u32 rv2p_proc)
++static int
++load_rv2p_fw(struct bnx2 *bp, u32 rv2p_proc, const struct
bnx2_fw_file_section *fw_section)
+ {
+- int i;
++ int i, len, offset;
++ u32 *data;
+ u32 val;
+
++ len = be32_to_cpu(fw_section-len);
++ offset = be32_to_cpu(fw_section-offset);
++
++ if (!len || !offset || len + offset bp-firmware-size)
++ return -EINVAL;
++ DPRINTK(load rv2p firmware with length %u from file offset %u\n, len,
offset);
++
++ data = (u32 *)(bp-firmware-data + offset);
+
+- for (i = 0; i rv2p_code_len; i += 8) {
+- REG_WR(bp, BNX2_RV2P_INSTR_HIGH, le32_to_cpu(*rv2p_code));
+- rv2p_code++;
+- REG_WR(bp, BNX2_RV2P_INSTR_LOW, le32_to_cpu(*rv2p_code));
+- rv2p_code++;
++ for (i = 0; i (len / 4); i += 2) {
++ REG_WR(bp, BNX2_RV2P_INSTR_HIGH, be32_to_cpu(data[i]));
++ REG_WR(bp, BNX2_RV2P_INSTR_LOW, be32_to_cpu(data[i+1]));
+
+ if (rv2p_proc == RV2P_PROC1) {
+- val = (i / 8) | BNX2_RV2P_PROC1_ADDR_CMD_RDWR;
++ val = (i / 2) | BNX2_RV2P_PROC1_ADDR_CMD_RDWR;
+ REG_WR(bp, BNX2_RV2P_PROC1_ADDR_CMD, val);
+ }
+ else {
+- val = (i / 8) | BNX2_RV2P_PROC2_ADDR_CMD_RDWR;
++ val = (i / 2) | BNX2_RV2P_PROC2_ADDR_CMD_RDWR;
+ REG_WR(bp, BNX2_RV2P_PROC2_ADDR_CMD, val);
+ }
+ }
+@@ -3192,14 +3207,18 @@ load_rv2p_fw(struct bnx2 *bp, __le32 *rv2p_code, u32
rv2p_code_len,
+ else {
+ REG_WR(bp, BNX2_RV2P_COMMAND, BNX2_RV2P_COMMAND_PROC2_RESET);
+ }
++
++ return 0;
+ }
+
+ static int
+-load_cpu_fw(struct bnx2 *bp, struct cpu_reg *cpu_reg, struct fw_info *fw)
++load_cpu_fw(struct bnx2 *bp, struct cpu_reg *cpu_reg,
++ const struct bnx2_fw_file_entry *fw_entry)
+ {
++ u32 addr, len, file_offset;
+ u32 offset
[kernel] r10731 - dists/trunk/firmware-nonfree/debian/bin
Author: waldi
Date: Thu Mar 6 11:01:29 2008
New Revision: 10731
Log:
debian/bin/gencontrol.py: Handle files with underscore correctly.
Modified:
dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py (original)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py Thu Mar 6
11:01:29 2008
@@ -235,7 +235,10 @@
config.read(%s/%s % (package, self.config_name))
for section in iter(config):
-real = (section[-1], package) + section[:-1]
+if len(section) 1:
+real = (section[-1], package, '_'.join(section[:-1]))
+else:
+real = (section[-1], package)
s = self.get(real, {})
s.update(config[section])
self[real] = s
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10733 - in dists/trunk/firmware-nonfree/bnx2: . fwcutter
Author: waldi
Date: Thu Mar 6 11:03:58 2008
New Revision: 10733
Log:
bnx2: Add.
Added:
dists/trunk/firmware-nonfree/bnx2/
dists/trunk/firmware-nonfree/bnx2/LICENSE
dists/trunk/firmware-nonfree/bnx2/defines
dists/trunk/firmware-nonfree/bnx2/fwcutter/
dists/trunk/firmware-nonfree/bnx2/fwcutter/Makefile
dists/trunk/firmware-nonfree/bnx2/fwcutter/bnx2_fw_file.h
dists/trunk/firmware-nonfree/bnx2/fwcutter/bnx2_fwcutter.c
dists/trunk/firmware-nonfree/bnx2/fwcutter/bnx2_fwcutter_2.6.25.c
Added: dists/trunk/firmware-nonfree/bnx2/LICENSE
==
--- (empty file)
+++ dists/trunk/firmware-nonfree/bnx2/LICENSE Thu Mar 6 11:03:58 2008
@@ -0,0 +1,7 @@
+This file contains firmware data derived from proprietary unpublished
+source code, Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation.
+
+Permission is hereby granted for the distribution of this firmware data
+in hexadecimal or equivalent format, provided this copyright notice is
+accompanying it.
+
Added: dists/trunk/firmware-nonfree/bnx2/defines
==
--- (empty file)
+++ dists/trunk/firmware-nonfree/bnx2/defines Thu Mar 6 11:03:58 2008
@@ -0,0 +1,15 @@
+[base]
+desc: Broadcom NetXtremeII
+files:
+ bnx2-06-4.0.5.fw
+ bnx2-09-4.0.5.fw
+longdesc: Broadcom NetXtremeII network adapters
+uri: http://ftp.debian.org/debian/pool/non-free/f/firmware-nonfree
+
+[bnx2-06-4.0.5.fw_base]
+desc: Broadcom NetXtremeII 5706 firmware
+version: Linux 2.6.25
+
+[bnx2-09-4.0.5.fw_base]
+desc: Broadcom NetXtremeII 5709 firmware
+version: Linux 2.6.25
Added: dists/trunk/firmware-nonfree/bnx2/fwcutter/Makefile
==
--- (empty file)
+++ dists/trunk/firmware-nonfree/bnx2/fwcutter/Makefile Thu Mar 6 11:03:58 2008
@@ -0,0 +1,15 @@
+ifndef KERNEL_SOURCE
+$(error Please define KERNEL_SOURCE)
+endif
+ifndef KERNEL_VERSION
+$(error Please define KERNEL_VERSION)
+endif
+
+CFLAGS += -I$(KERNEL_SOURCE)/drivers/net
+CFLAGS += --std=gnu99
+LDFLAGS += -lz
+
+all: bnx2_fwcutter_$(KERNEL_VERSION)
+
+bnx2_fwcutter_$(KERNEL_VERSION): bnx2_fwcutter_$(KERNEL_VERSION).c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
Added: dists/trunk/firmware-nonfree/bnx2/fwcutter/bnx2_fw_file.h
==
--- (empty file)
+++ dists/trunk/firmware-nonfree/bnx2/fwcutter/bnx2_fw_file.h Thu Mar 6
11:03:58 2008
@@ -0,0 +1,25 @@
+struct bnx2_fw_file_section {
+ uint32_t addr;
+ uint32_t len;
+ uint32_t offset;
+};
+
+struct bnx2_fw_file_entry {
+ uint32_t start_addr;
+ struct bnx2_fw_file_section text;
+ struct bnx2_fw_file_section data;
+ struct bnx2_fw_file_section sbss;
+ struct bnx2_fw_file_section bss;
+ struct bnx2_fw_file_section rodata;
+};
+
+struct bnx2_fw_file {
+ struct bnx2_fw_file_entry com;
+ struct bnx2_fw_file_entry cp;
+ struct bnx2_fw_file_entry rxp;
+ struct bnx2_fw_file_entry tpat;
+ struct bnx2_fw_file_entry txp;
+ struct bnx2_fw_file_section rv2p_proc1;
+ struct bnx2_fw_file_section rv2p_proc2;
+};
+
Added: dists/trunk/firmware-nonfree/bnx2/fwcutter/bnx2_fwcutter.c
==
--- (empty file)
+++ dists/trunk/firmware-nonfree/bnx2/fwcutter/bnx2_fwcutter.c Thu Mar 6
11:03:58 2008
@@ -0,0 +1,177 @@
+#include assert.h
+#include byteswap.h
+#include endian.h
+#include fcntl.h
+#include sys/stat.h
+#include sys/types.h
+#include stdint.h
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include zlib.h
+
+#include bnx2_fw_file.h
+
+struct fw_info {
+ const uint32_t ver_major;
+ const uint32_t ver_minor;
+ const uint32_t ver_fix;
+
+ const uint32_t start_addr;
+
+ /* Text section. */
+ const uint32_t text_addr;
+ const uint32_t text_len;
+ const uint32_t text_index;
+ void *text;
+ const void *gz_text;
+ const uint32_t gz_text_len;
+
+ /* Data section. */
+ const uint32_t data_addr;
+ const uint32_t data_len;
+ const uint32_t data_index;
+ const uint32_t *data;
+
+ /* SBSS section. */
+ const uint32_t sbss_addr;
+ const uint32_t sbss_len;
+ const uint32_t sbss_index;
+
+ /* BSS section. */
+ const uint32_t bss_addr;
+ const uint32_t bss_len;
+ const uint32_t bss_index;
+
+ /* Read-only section. */
+ const uint32_t rodata_addr;
+ const uint32_t rodata_len;
+ const uint32_t rodata_index;
+ const uint32_t *rodata;
+};
+
+typedef uint8_t u8;
+typedef uint32_t u32;
+
+#include bnx2_fw.h
+#include bnx2_fw2.h
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define cpu_to_be32(x) bswap_32(x)
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define cpu_to_be32(x) (x)
+#endif
+#define le32_to_be32(x) bswap_32(x)
+
+void set_firmware_image_part(struct bnx2_fw_file_section *s, uint32_t addr,
uint32_t len)
+{
+s-addr = cpu_to_be32(addr);
+s-len = cpu_to_be32(len);
+}
+
+void
[kernel] r10730 - dists/trunk/firmware-nonfree/debian/bin
Author: waldi
Date: Thu Mar 6 10:57:46 2008
New Revision: 10730
Log:
debian/bin/gencontrol.py: Also handle descriptions of versioned files.
Modified:
dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py (original)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py Thu Mar 6
10:57:46 2008
@@ -115,7 +115,7 @@
files_desc = [Contents:]
for f in config_entry['files']:
-base, f, version = files_real[f]
+f, f_real, version = files_real[f]
c = self.config.get(('base', package, f), {})
desc = c.get('desc', f)
if version is None:
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10734 - dists/trunk/linux-2.6/debian
Author: waldi Date: Thu Mar 6 12:01:38 2008 New Revision: 10734 Log: debian/changelog: Update. Modified: dists/trunk/linux-2.6/debian/changelog Modified: dists/trunk/linux-2.6/debian/changelog == --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Thu Mar 6 12:01:38 2008 @@ -1,6 +1,6 @@ linux-2.6 (2.6.25~rc4-1~experimental.1) UNRELEASED; urgency=low - * New upstream release (closes: #456799) + * New upstream release (closes: #456799, #468440) [ maximilian attems ] * topconfig set NOZOMI, CRYPTO_SEQIV, CRYPTO_CTR, CRYPTO_GCM, CRYPTO_CCM, ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10704 - people/waldi/dkt/lib/dkt/bootconfig
Author: waldi Date: Wed Mar 5 11:07:14 2008 New Revision: 10704 Log: lib/dkt/bootconfig: Add. Added: people/waldi/dkt/lib/dkt/bootconfig/ people/waldi/dkt/lib/dkt/bootconfig/__init__.py people/waldi/dkt/lib/dkt/bootconfig/interfaces.py Added: people/waldi/dkt/lib/dkt/bootconfig/__init__.py == Added: people/waldi/dkt/lib/dkt/bootconfig/interfaces.py == --- (empty file) +++ people/waldi/dkt/lib/dkt/bootconfig/interfaces.py Wed Mar 5 11:07:14 2008 @@ -0,0 +1,19 @@ +from dkt.interface import Attribute, Interface + +class IBootBaseConfig(Interface): +description = Attribute() +features = Attribute() +version = Attribute() + +class IBootMainConfig(IBootBaseConfig): +kernel_entry = Attribute() +initrd_file = Attribute() + +class IBootMultibootConfig(IBootBaseConfig): +kernel_entry = Attribute() +module_entries = Attribute() + +class IBootEntry(Interface): +file = Attribute() +commandline = Attribute() + ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10707 - people/waldi/dkt/lib/dkt/bin
Author: waldi Date: Wed Mar 5 12:06:27 2008 New Revision: 10707 Log: lib/dkt/bin/base.py: Fix. Modified: people/waldi/dkt/lib/dkt/bin/base.py Modified: people/waldi/dkt/lib/dkt/bin/base.py == --- people/waldi/dkt/lib/dkt/bin/base.py(original) +++ people/waldi/dkt/lib/dkt/bin/base.pyWed Mar 5 12:06:27 2008 @@ -24,7 +24,7 @@ def bootconfig_generate(self): # XXX -bootconfig = None +bootconfig = [] bootconfig = default_registry.run(IBootConfigPrepare, 'boot_config_prepare', bootconfig, self.config, self.imageconfigs) bootconfig = default_registry.run(IBootConfigPartition, 'boot_config_partition', bootconfig, self.config) self.bootconfig = default_registry.run(IBootConfigSort, 'boot_config_sort', bootconfig, self.config) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10709 - people/waldi/dkt/lib/dkt
Author: waldi Date: Wed Mar 5 12:07:34 2008 New Revision: 10709 Log: lib/dkt/__init__.py: Import bootconfig. Modified: people/waldi/dkt/lib/dkt/__init__.py Modified: people/waldi/dkt/lib/dkt/__init__.py == --- people/waldi/dkt/lib/dkt/__init__.py(original) +++ people/waldi/dkt/lib/dkt/__init__.pyWed Mar 5 12:07:34 2008 @@ -1 +1,2 @@ +import bootconfig import config ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10710 - people/waldi/dkt/lib/dkt/bootconfig
Author: waldi
Date: Wed Mar 5 12:08:17 2008
New Revision: 10710
Log:
* lib/dkt/bootconfig/__init__.py: Import gen, gen_linux.
* lib/dkt/bootconfig/interfaces.py: Remove description.
* lib/dkt/bootconfig/base.py, lib/dkt/bootconfig/entry.py,
lib/dkt/bootconfig/gen.py, lib/dkt/bootconfig/gen_linux.py,
lib/dkt/bootconfig/linux.py: Add.
Added:
people/waldi/dkt/lib/dkt/bootconfig/base.py
people/waldi/dkt/lib/dkt/bootconfig/entry.py
people/waldi/dkt/lib/dkt/bootconfig/gen.py
people/waldi/dkt/lib/dkt/bootconfig/gen_linux.py
people/waldi/dkt/lib/dkt/bootconfig/linux.py
Modified:
people/waldi/dkt/lib/dkt/bootconfig/__init__.py
people/waldi/dkt/lib/dkt/bootconfig/interfaces.py
Modified: people/waldi/dkt/lib/dkt/bootconfig/__init__.py
==
--- people/waldi/dkt/lib/dkt/bootconfig/__init__.py (original)
+++ people/waldi/dkt/lib/dkt/bootconfig/__init__.py Wed Mar 5 12:08:17 2008
@@ -0,0 +1 @@
+import gen, gen_linux
Added: people/waldi/dkt/lib/dkt/bootconfig/base.py
==
--- (empty file)
+++ people/waldi/dkt/lib/dkt/bootconfig/base.py Wed Mar 5 12:08:17 2008
@@ -0,0 +1,42 @@
+from itertools import izip
+
+from interfaces import IBootBaseConfig
+from dkt.imageconfig.interfaces import IImageBaseConfig
+from zope.interface import implements
+
+class BootConfigBase(object):
+implements(IBootBaseConfig)
+
+def __init__(self, config):
+self.config = config
+
+def __cmp__(self, other):
+other = IBootBaseConfig(other)
+version_self = '-'.split(self.version)
+version_other = '-'.split(other.version)
+
+ret = cmp(len(version_self), len(version_other))
+if ret:
+return ret
+
+for v_self, v_other in izip(version_self, version_other):
+part_self = '.'.split(v_self)
+part_other = '.'.split(v_other)
+
+ret = cmp(part_self, part_other)
+if ret:
+return ret
+
+features_self = self.features
+features_other = other.features
+
+return cmp(features_self, features_other)
+
+@property
+def features(self):
+return IImageBaseConfig(self.config).features
+
+@property
+def version(self):
+return IImageBaseConfig(self.config).version
+
Added: people/waldi/dkt/lib/dkt/bootconfig/entry.py
==
--- (empty file)
+++ people/waldi/dkt/lib/dkt/bootconfig/entry.pyWed Mar 5 12:08:17 2008
@@ -0,0 +1,9 @@
+from interfaces import IBootEntry
+from zope.interface import implements
+
+class BootEntry(object):
+implements(IBootEntry)
+
+def __init__(self, file, commandline):
+self.file, self.commandline = file, commandline
+
Added: people/waldi/dkt/lib/dkt/bootconfig/gen.py
==
--- (empty file)
+++ people/waldi/dkt/lib/dkt/bootconfig/gen.py Wed Mar 5 12:08:17 2008
@@ -0,0 +1,14 @@
+from dkt.hooks import default_registry, register
+from dkt.hooks.interfaces import IBootConfigPartition, IBootConfigSort
+
+class HookPartitionRescue(object):
+def boot_config_partition(self, bootconfigs, systemconfig):
+return bootconfigs
+
+class HookSort(object):
+def boot_config_sort(self, bootconfigs, systemconfig):
+bootconfigs.sort()
+return bootconfigs
+
+register('bootconfig-partition-rescue', IBootConfigPartition,
HookPartitionRescue(), default_registry.PRIORITY_FIRST)
+register('bootconfig-sort', IBootConfigSort, HookSort(),
default_registry.PRIORITY_LAST)
Added: people/waldi/dkt/lib/dkt/bootconfig/gen_linux.py
==
--- (empty file)
+++ people/waldi/dkt/lib/dkt/bootconfig/gen_linux.pyWed Mar 5 12:08:17 2008
@@ -0,0 +1,16 @@
+from linux import BootConfigLinux
+from dkt.hooks import default_registry, register
+from dkt.hooks.interfaces import IBootConfigPrepare
+from dkt.imageconfig.interfaces import IImageBaseConfig
+
+class Hook(object):
+def boot_config_prepare(self, bootconfigs, systemconfig, imageconfigs):
+for config in imageconfigs.itervalues():
+try:
+image = IImageBaseConfig(config)
+except:
+raise
+if image.type == 'linux' and image.subtype is None:
+bootconfigs.append(BootConfigLinux(config))
+
+register('bootconfig-prepare-linux', IBootConfigPrepare, Hook(),
default_registry.PRIORITY_FIRST)
Modified: people/waldi/dkt/lib/dkt/bootconfig/interfaces.py
==
--- people/waldi/dkt/lib/dkt/bootconfig/interfaces.py (original)
+++ people/waldi/dkt/lib/dkt/bootconfig/interfaces.py Wed Mar 5 12:08:17 2008
@@ -1,7 +1,6 @@
from
[kernel] r10714 - people/waldi/dkt/lib/dkt/hooks/modules
Author: waldi
Date: Wed Mar 5 13:38:15 2008
New Revision: 10714
Log:
* lib/dkt/hooks/modules/backward_config_boot.py: Change type setup.
* lib/dkt/hooks/modules/backward_symlinks.py: Add code to check symlinks.
Modified:
people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
==
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
(original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py Wed Mar
5 13:38:15 2008
@@ -112,10 +112,10 @@
link_parts = os.path.basename(link).split('-', 1)
e = versions.get(link_parts[1], None)
if e is not None:
+type = 0
if file[1].endswith('.old'):
-e[2] = (file[0], 'old')
-else:
-e[2] = (file[0], 'actual')
+type = 1
+e[2] = (file[0], type)
for file in iter(files[3]):
if not os.path.islink(file[0]):
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
==
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py (original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py Wed Mar 5
13:38:15 2008
@@ -1,3 +1,5 @@
+from itertools import chain
+
from dkt.config.interfaces import IMutableConfig
from dkt.hooks import default_registry, interfaces, register
@@ -32,5 +34,34 @@
if not self._check_active(systemconfig):
return
+symlink_act = symlink_act_file = symlink_old = symlink_old_file = None
+symlink_create = symlink_remove = None
+
+for i in chain(*bootconfigs):
+config = i.config
+if 'backward-compatibility' in config:
+symlink_type = config.get('backward-compatibility',
'symlink-type', None)
+if symlink_type == 0:
+symlink_act = i
+symlink_act_file = config.get('backward-compatibility',
'symlink-file')
+elif symlink_type == 1:
+symlink_old = i
+symlink_old_file = config.get('backward-compatibility',
'symlink-file')
+
+if config.get('backward-compatibility', 'symlink-create',
None):
+symlink_create = i
+if config.get('backward-compatibility', 'symlink-remove',
None):
+symlink_remove = i
+
+if symlink_create is not None:
+if symlink_create not in (symlink_act, symlink_old):
+raise NotImplementedError
+
+if symlink_remove is not None:
+if symlink_remove not in (symlink_act, symlink_old):
+raise NotImplementedError
+
+return [[symlink_old, symlink_act]]
+
register('backward-symlinks', interfaces.IBootConfigPartition, Hook(),
default_registry.PRIORITY_FIRST)
register('backward-symlinks', interfaces.IImageTask, Hook())
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10715 - people/waldi/dkt/lib/dkt/bootconfig
Author: waldi
Date: Wed Mar 5 13:46:51 2008
New Revision: 10715
Log:
lib/dkt/bootconfig/hooks.py: Return only one list.
Modified:
people/waldi/dkt/lib/dkt/bootconfig/hooks.py
Modified: people/waldi/dkt/lib/dkt/bootconfig/hooks.py
==
--- people/waldi/dkt/lib/dkt/bootconfig/hooks.py(original)
+++ people/waldi/dkt/lib/dkt/bootconfig/hooks.pyWed Mar 5 13:46:51 2008
@@ -7,8 +7,11 @@
class HookSort(object):
def boot_config_sort(self, bootconfigs, systemconfig):
-bootconfigs.sort()
-return bootconfigs
+ret = []
+for i in bootconfigs:
+i.sort()
+ret.extend(i)
+return ret
register('bootconfig-partition-rescue', IBootConfigPartition,
HookPartitionRescue(), default_registry.PRIORITY_FIRST)
register('bootconfig-sort', IBootConfigSort, HookSort(),
default_registry.PRIORITY_LAST)
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10716 - people/waldi/dkt/lib/dkt/bootconfig
Author: waldi Date: Wed Mar 5 13:47:19 2008 New Revision: 10716 Log: lib/dkt/bootconfig/base.py: Use dkt.support.version. Modified: people/waldi/dkt/lib/dkt/bootconfig/base.py Modified: people/waldi/dkt/lib/dkt/bootconfig/base.py == --- people/waldi/dkt/lib/dkt/bootconfig/base.py (original) +++ people/waldi/dkt/lib/dkt/bootconfig/base.py Wed Mar 5 13:47:19 2008 @@ -1,7 +1,6 @@ -from itertools import izip - from interfaces import IBootBaseConfig from dkt.imageconfig.interfaces import IImageBaseConfig +from dkt.support.version import VersionImage from zope.interface import implements class BootConfigBase(object): @@ -12,25 +11,10 @@ def __cmp__(self, other): other = IBootBaseConfig(other) -version_self = '-'.split(self.version) -version_other = '-'.split(other.version) - -ret = cmp(len(version_self), len(version_other)) -if ret: -return ret - -for v_self, v_other in izip(version_self, version_other): -part_self = '.'.split(v_self) -part_other = '.'.split(v_other) - -ret = cmp(part_self, part_other) -if ret: -return ret - -features_self = self.features -features_other = other.features -return cmp(features_self, features_other) +ret = cmp(self.version, other.version) +if ret: return ret +return cmp(self.features, other.features) @property def features(self): @@ -38,5 +22,5 @@ @property def version(self): -return IImageBaseConfig(self.config).version +return VersionImage(IImageBaseConfig(self.config).version) ___ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10717 - people/waldi/dkt/lib/dkt/hooks/modules
Author: waldi
Date: Wed Mar 5 13:47:42 2008
New Revision: 10717
Log:
lib/dkt/hooks/modules/backward_symlinks.py: Set new symlinks.
Modified:
people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
==
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py (original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py Wed Mar 5
13:47:42 2008
@@ -55,7 +55,9 @@
if symlink_create is not None:
if symlink_create not in (symlink_act, symlink_old):
-raise NotImplementedError
+symlink_create.config.set('backward-compatibility',
'symlink-file', symlink_act_file)
+symlink_old = symlink_act
+symlink_act = symlink_create
if symlink_remove is not None:
if symlink_remove not in (symlink_act, symlink_old):
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
[kernel] r10718 - people/waldi/dkt/lib/dkt/hooks/modules
Author: waldi
Date: Wed Mar 5 13:53:07 2008
New Revision: 10718
Log:
lib/dkt/hooks/modules/backward_config_boot.py,
lib/dkt/hooks/modules/backward_symlinks.py: Move type detection.
Modified:
people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
==
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py
(original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_config_boot.py Wed Mar
5 13:53:07 2008
@@ -6,10 +6,7 @@
from dkt.imageconfig.interfaces import IImageBaseConfig
class Hook(object):
-def _add_config(self, configs, version, data):
-image_file = data[0]
-initramfs_file = data[1]
-symlinks_data = data[2]
+def _add_config(self, configs, version, image_file, initramfs_file,
symlinks_file):
c = {
'image': {
@@ -24,10 +21,9 @@
if initramfs_file is not None:
c['initramfs'] = {'file': initramfs_file}
-if symlinks_data is not None:
+if symlinks_file is not None:
c['backward-compatibility'] = {
-'symlink-file': symlinks_data[0],
-'symlink-type': symlinks_data[1],
+'symlink-file': symlinks_file,
}
configs.add('boot-backward-' + version, MutableConfig(c))
@@ -39,17 +35,16 @@
if IImageBaseConfig(l).file == image_file:
return self._update_config(l, data)
-return self._add_config(configs, version, data)
+return self._add_config(configs, version, *data)
def _update_config(self, config, data):
-symlinks_data = data[2]
+symlinks_file = data[2]
config = IMutableConfig(config)
-if symlinks_data is not None:
+if symlinks_file is not None:
config.add_section('backward-compatibility')
-config.set('backward-compatibility', 'symlink-file',
symlinks_data[0])
-config.set('backward-compatibility', 'symlink-type',
symlinks_data[1])
+config.set('backward-compatibility', 'symlink-file', symlinks_file)
def _get_files(self):
ret = ([], [], [], [])
@@ -112,10 +107,7 @@
link_parts = os.path.basename(link).split('-', 1)
e = versions.get(link_parts[1], None)
if e is not None:
-type = 0
-if file[1].endswith('.old'):
-type = 1
-e[2] = (file[0], type)
+e[2] = file[0]
for file in iter(files[3]):
if not os.path.islink(file[0]):
Modified: people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py
==
--- people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py (original)
+++ people/waldi/dkt/lib/dkt/hooks/modules/backward_symlinks.py Wed Mar 5
13:53:07 2008
@@ -40,13 +40,14 @@
for i in chain(*bootconfigs):
config = i.config
if 'backward-compatibility' in config:
-symlink_type = config.get('backward-compatibility',
'symlink-type', None)
-if symlink_type == 0:
-symlink_act = i
-symlink_act_file = config.get('backward-compatibility',
'symlink-file')
-elif symlink_type == 1:
-symlink_old = i
-symlink_old_file = config.get('backward-compatibility',
'symlink-file')
+symlink_file = config.get('backward-compatibility',
'symlink-file', None)
+if symlink_file:
+if symlink_file.endswith('.old'):
+symlink_old = i
+symlink_old_file = symlink_file
+else:
+symlink_act = i
+symlink_act_file = symlink_file
if config.get('backward-compatibility', 'symlink-create',
None):
symlink_create = i
___
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
