Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=7262
This commit is contained in:
Bastian Blank
parent
5e9257409a
commit
61c4bbd140
|
|
@ -1,4 +1,5 @@
|
|||
[base]
|
||||
compiler: gcc-4.0
|
||||
flavours: alpha-generic alpha-smp alpha-legacy
|
||||
kernel-arch: alpha
|
||||
kernel-header-dirs: alpha
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1288,6 +1288,7 @@ CONFIG_USB_STORAGE_SDDR55=y
|
|||
CONFIG_USB_STORAGE_JUMPSHOT=y
|
||||
CONFIG_USB_HID=m
|
||||
CONFIG_USB_HIDINPUT=y
|
||||
CONFIG_USB_HIDINPUT_POWERBOOK=y
|
||||
# CONFIG_HID_FF is not set
|
||||
CONFIG_USB_HIDDEV=y
|
||||
CONFIG_USB_KBD=m
|
||||
|
|
@ -1551,3 +1552,7 @@ CONFIG_VIDEO_V4L2=m
|
|||
CONFIG_AGP_SIS=m
|
||||
CONFIG_RIO=m
|
||||
CONFIG_RIO_OLDPCI=y
|
||||
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
|
||||
CONFIG_X86_HT=y
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_SCHED_MC=y
|
||||
|
|
|
|||
|
|
@ -1,26 +1,18 @@
|
|||
CONFIG_LOCK_KERNEL=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_STOP_MACHINE=y
|
||||
CONFIG_MK8=y
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=64
|
||||
CONFIG_X86_L1_CACHE_SHIFT=6
|
||||
CONFIG_SMP=y
|
||||
# CONFIG_SCHED_SMT is not set
|
||||
CONFIG_K8_NUMA=y
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
CONFIG_NUMA=y
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
CONFIG_NR_CPUS=32
|
||||
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
|
||||
# CONFIG_R8169_VLAN is not set
|
||||
CONFIG_R8169_VLAN=y
|
||||
CONFIG_FB_MATROX_G=y
|
||||
CONFIG_FB_MATROX_MAVEN=m
|
||||
# CONFIG_SOUND_AWE32_SYNTH is not set
|
||||
CONFIG_FS_MBCACHE=m
|
||||
CONFIG_NEED_MULTIPLE_NODES=y
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
CONFIG_HAVE_MEMORY_PRESENT=y
|
||||
CONFIG_DIGIEPCA=m
|
||||
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
|
||||
|
|
@ -29,8 +21,17 @@ CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
|
|||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
CONFIG_DISCONTIGMEM=y
|
||||
CONFIG_DISCONTIGMEM_MANUAL=y
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_ACPI_NUMA=y
|
||||
CONFIG_MIGRATION=y
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
|
||||
CONFIG_SUSPEND_SMP=y
|
||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||
CONFIG_NODES_SHIFT=6
|
||||
CONFIG_X86_L1_CACHE_BYTES=128
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_K8_NUMA=y
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_GENERIC_CPU=y
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
CONFIG_BROKEN_ON_SMP=y
|
||||
CONFIG_MK8=y
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=64
|
||||
CONFIG_X86_L1_CACHE_SHIFT=6
|
||||
# CONFIG_SMP is not set
|
||||
# CONFIG_NUMA is not set
|
||||
CONFIG_CPU_FREQ_STAT_DETAILS=y
|
||||
# CONFIG_MTD_XIP is not set
|
||||
CONFIG_IRPORT_SIR=m
|
||||
# CONFIG_DONGLE_OLD is not set
|
||||
CONFIG_PCMCIA_XIRTULIP=m
|
||||
# CONFIG_R8169_VLAN is not set
|
||||
CONFIG_ISDN_DRV_LOOP=m
|
||||
CONFIG_HYSDN=m
|
||||
CONFIG_HYSDN_CAPI=y
|
||||
# CONFIG_DIGIEPCA is not set
|
||||
CONFIG_RISCOM8=m
|
||||
CONFIG_STALLION=m
|
||||
CONFIG_ISTALLION=m
|
||||
CONFIG_FTAPE=m
|
||||
CONFIG_ZFTAPE=m
|
||||
CONFIG_ZFT_DFLT_BLK_SZ=10240
|
||||
CONFIG_ZFT_COMPRESSOR=m
|
||||
CONFIG_FT_NR_BUFFERS=3
|
||||
CONFIG_FT_PROC_FS=y
|
||||
CONFIG_FT_NORMAL_DEBUG=y
|
||||
# CONFIG_FT_FULL_DEBUG is not set
|
||||
# CONFIG_FT_NO_TRACE is not set
|
||||
# CONFIG_FT_NO_TRACE_AT_ALL is not set
|
||||
CONFIG_FT_STD_FDC=y
|
||||
# CONFIG_FT_MACH2 is not set
|
||||
# CONFIG_FT_PROBE_FC10 is not set
|
||||
# CONFIG_FT_ALT_FDC is not set
|
||||
CONFIG_FT_FDC_THR=8
|
||||
CONFIG_FT_FDC_MAX_RATE=2000
|
||||
CONFIG_FT_ALPHA_CLOCK=0
|
||||
CONFIG_FB_MATROX_G=y
|
||||
CONFIG_FB_MATROX_MAVEN=m
|
||||
# CONFIG_SOUND_AWE32_SYNTH is not set
|
||||
CONFIG_FS_MBCACHE=m
|
||||
# CONFIG_CHECKING is not set
|
||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||
CONFIG_FLATMEM_MANUAL=y
|
||||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
# CONFIG_DISCONTIGMEM_MANUAL is not set
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_X86_INTERNODE_CACHE_BYTES=64
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
CONFIG_BROKEN_ON_SMP=y
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_MPSC=y
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=128
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
# CONFIG_SMP is not set
|
||||
# CONFIG_NUMA is not set
|
||||
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
|
||||
# CONFIG_MTD_XIP is not set
|
||||
CONFIG_IRPORT_SIR=m
|
||||
# CONFIG_DONGLE_OLD is not set
|
||||
CONFIG_PCMCIA_XIRTULIP=m
|
||||
# CONFIG_R8169_VLAN is not set
|
||||
CONFIG_ISDN_DRV_LOOP=m
|
||||
CONFIG_HYSDN=m
|
||||
CONFIG_HYSDN_CAPI=y
|
||||
# CONFIG_DIGIEPCA is not set
|
||||
CONFIG_RISCOM8=m
|
||||
CONFIG_STALLION=m
|
||||
CONFIG_ISTALLION=m
|
||||
CONFIG_FTAPE=m
|
||||
CONFIG_ZFTAPE=m
|
||||
CONFIG_ZFT_DFLT_BLK_SZ=10240
|
||||
CONFIG_ZFT_COMPRESSOR=m
|
||||
CONFIG_FT_NR_BUFFERS=3
|
||||
CONFIG_FT_PROC_FS=y
|
||||
CONFIG_FT_NORMAL_DEBUG=y
|
||||
# CONFIG_FT_FULL_DEBUG is not set
|
||||
# CONFIG_FT_NO_TRACE is not set
|
||||
# CONFIG_FT_NO_TRACE_AT_ALL is not set
|
||||
CONFIG_FT_STD_FDC=y
|
||||
# CONFIG_FT_MACH2 is not set
|
||||
# CONFIG_FT_PROBE_FC10 is not set
|
||||
# CONFIG_FT_ALT_FDC is not set
|
||||
CONFIG_FT_FDC_THR=8
|
||||
CONFIG_FT_FDC_MAX_RATE=2000
|
||||
CONFIG_FT_ALPHA_CLOCK=0
|
||||
CONFIG_FB_MATROX_G=y
|
||||
CONFIG_FB_MATROX_MAVEN=m
|
||||
# CONFIG_SOUND_AWE32_SYNTH is not set
|
||||
CONFIG_FS_MBCACHE=m
|
||||
# CONFIG_CHECKING is not set
|
||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||
CONFIG_FLATMEM_MANUAL=y
|
||||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
# CONFIG_DISCONTIGMEM_MANUAL is not set
|
||||
# CONFIG_X86_MCE_AMD is not set
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
CONFIG_LOCK_KERNEL=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_STOP_MACHINE=y
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_MPSC=y
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=128
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
CONFIG_X86_HT=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_SCHED_SMT=y
|
||||
# CONFIG_K8_NUMA is not set
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
# CONFIG_NUMA is not set
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
CONFIG_NR_CPUS=32
|
||||
CONFIG_CPU_FREQ_STAT_DETAILS=y
|
||||
CONFIG_R8169_VLAN=y
|
||||
# CONFIG_FB_MATROX_G is not set
|
||||
CONFIG_SOUND_AWE32_SYNTH=m
|
||||
CONFIG_FS_MBCACHE=m
|
||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||
CONFIG_DIGIEPCA=m
|
||||
CONFIG_FLATMEM_MANUAL=y
|
||||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
# CONFIG_DISCONTIGMEM_MANUAL is not set
|
||||
# CONFIG_X86_MCE_AMD is not set
|
||||
CONFIG_SCHED_MC=y
|
||||
CONFIG_SUSPEND_SMP=y
|
||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||
|
|
@ -1,15 +1,12 @@
|
|||
[base]
|
||||
compiler: gcc-4.1
|
||||
flavours:
|
||||
amd64-k8
|
||||
amd64-k8-smp
|
||||
em64t-p4
|
||||
em64t-p4-smp
|
||||
amd64
|
||||
kernel-arch: x86_64
|
||||
kernel-header-dirs: x86_64 i386
|
||||
subarches:
|
||||
vserver
|
||||
# xen
|
||||
xen
|
||||
# xen-vserver
|
||||
|
||||
[image]
|
||||
|
|
@ -17,19 +14,7 @@ conflicts: grub (<= 0.95+cvs20040624-17)
|
|||
depends: e2fsprogs (>= 1.35-7)
|
||||
suggests: grub (>= 0.97-3) | lilo (>= 19.1)
|
||||
|
||||
[amd64-k8]
|
||||
class: AMD64 K8
|
||||
longclass: 64bit AMD Athlon64, AthlonFX, Opteron 1xx and Turion64
|
||||
|
||||
[amd64-k8-smp]
|
||||
class: AMD64 K8 SMP
|
||||
longclass: 64bit multi-processor/multi-core AMD Athlon64 X2 and Opteron 2xx/8xx
|
||||
|
||||
[em64t-p4]
|
||||
class: Intel em64t P4
|
||||
longclass: 64bit Intel em64t Pentium4
|
||||
|
||||
[em64t-p4-smp]
|
||||
class: Intel em64t P4/Xeon SMP
|
||||
longclass: 64bit multi-processor/multi-core Intel em64t Pentium 4/Pentium D/Xeon
|
||||
[amd64]
|
||||
class: AMD64
|
||||
longclass: all 64bit single- and multiprocessor AMD and Intel
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,14 +1,7 @@
|
|||
CONFIG_LOCK_KERNEL=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_STOP_MACHINE=y
|
||||
CONFIG_MK8=y
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=64
|
||||
CONFIG_X86_L1_CACHE_SHIFT=6
|
||||
CONFIG_SMP=y
|
||||
# CONFIG_SCHED_SMT is not set
|
||||
CONFIG_K8_NUMA=y
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
CONFIG_NUMA=y
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
|
|
@ -28,13 +21,17 @@ CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
|
|||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
CONFIG_DISCONTIGMEM=y
|
||||
CONFIG_DISCONTIGMEM_MANUAL=y
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_ACPI_NUMA=y
|
||||
CONFIG_MIGRATION=y
|
||||
CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
|
||||
CONFIG_SCHED_MC=y
|
||||
CONFIG_NODES_SHIFT=6
|
||||
CONFIG_SUSPEND_SMP=y
|
||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||
CONFIG_X86_INTERNODE_CACHE_BYTES=64
|
||||
CONFIG_NODES_SHIFT=6
|
||||
CONFIG_X86_L1_CACHE_BYTES=128
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_K8_NUMA=y
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_GENERIC_CPU=y
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
CONFIG_LOCK_KERNEL=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_STOP_MACHINE=y
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_MPSC=y
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=128
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
CONFIG_X86_HT=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_SCHED_SMT=y
|
||||
# CONFIG_K8_NUMA is not set
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
# CONFIG_NUMA is not set
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
CONFIG_NR_CPUS=32
|
||||
CONFIG_CPU_FREQ_STAT_DETAILS=y
|
||||
CONFIG_R8169_VLAN=y
|
||||
# CONFIG_FB_MATROX_G is not set
|
||||
CONFIG_SOUND_AWE32_SYNTH=m
|
||||
CONFIG_FS_MBCACHE=m
|
||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||
CONFIG_DIGIEPCA=m
|
||||
CONFIG_FLATMEM_MANUAL=y
|
||||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
# CONFIG_DISCONTIGMEM_MANUAL is not set
|
||||
# CONFIG_X86_MCE_AMD is not set
|
||||
|
|
@ -1,16 +1,7 @@
|
|||
[base]
|
||||
flavours:
|
||||
amd64-k8
|
||||
em64t-p4
|
||||
amd64
|
||||
|
||||
[image]
|
||||
recommends: util-vserver
|
||||
|
||||
[amd64-k8]
|
||||
class: AMD64 K8
|
||||
longclass: 64bit AMD Athlon64, AthlonFX, Opteron and Turion64
|
||||
|
||||
[em64t-p4]
|
||||
class: Intel em64t P4
|
||||
longclass: 64bit Intel em64t Pentium4/Pentium D/Xeon
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,7 @@
|
|||
CONFIG_LOCK_KERNEL=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_STOP_MACHINE=y
|
||||
CONFIG_MK8=y
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=64
|
||||
CONFIG_X86_L1_CACHE_SHIFT=6
|
||||
CONFIG_SMP=y
|
||||
# CONFIG_SCHED_SMT is not set
|
||||
CONFIG_K8_NUMA=y
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
CONFIG_NUMA=y
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
|
|
@ -28,7 +21,17 @@ CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
|
|||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
CONFIG_DISCONTIGMEM=y
|
||||
CONFIG_DISCONTIGMEM_MANUAL=y
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_ACPI_NUMA=y
|
||||
CONFIG_MIGRATION=y
|
||||
CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
|
||||
CONFIG_SUSPEND_SMP=y
|
||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||
CONFIG_NODES_SHIFT=6
|
||||
CONFIG_X86_L1_CACHE_BYTES=128
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_K8_NUMA=y
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_GENERIC_CPU=y
|
||||
|
|
@ -1,12 +1,8 @@
|
|||
[base]
|
||||
flavours:
|
||||
amd64-k8
|
||||
amd64
|
||||
|
||||
[image]
|
||||
initramfs: false
|
||||
type: plain-xen
|
||||
|
||||
[amd64-k8]
|
||||
class: AMD64 K8
|
||||
longclass: 64bit AMD Athlon64, AthlonFX, Opteron and Turion64
|
||||
|
||||
|
|
|
|||
|
|
@ -8,15 +8,14 @@ CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
|
|||
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
|
||||
# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
|
||||
CONFIG_XEN_BLKDEV_BACKEND=y
|
||||
# CONFIG_XEN_BLKDEV_TAP_BE is not set
|
||||
CONFIG_XEN_NETDEV_BACKEND=y
|
||||
# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
|
||||
# CONFIG_XEN_TPMDEV_BACKEND is not set
|
||||
CONFIG_XEN_BLKDEV_FRONTEND=y
|
||||
CONFIG_XEN_NETDEV_FRONTEND=y
|
||||
# CONFIG_XEN_BLKDEV_TAP is not set
|
||||
CONFIG_XEN_NETDEV_LOOPBACK=y
|
||||
# CONFIG_XEN_TPMDEV_FRONTEND is not set
|
||||
CONFIG_XEN_NETDEV_LOOPBACK=m
|
||||
CONFIG_XEN_SCRUB_PAGES=y
|
||||
CONFIG_XEN_DISABLE_SERIAL=y
|
||||
CONFIG_XEN_SYSFS=y
|
||||
CONFIG_XEN_COMPAT_030002_AND_LATER=y
|
||||
# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
|
||||
|
|
|
|||
|
|
@ -1,14 +1,7 @@
|
|||
CONFIG_LOCK_KERNEL=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_STOP_MACHINE=y
|
||||
CONFIG_MK8=y
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=64
|
||||
CONFIG_X86_L1_CACHE_SHIFT=6
|
||||
CONFIG_SMP=y
|
||||
# CONFIG_SCHED_SMT is not set
|
||||
CONFIG_K8_NUMA=y
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
CONFIG_NUMA=y
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
|
|
@ -20,7 +13,6 @@ CONFIG_FB_MATROX_MAVEN=m
|
|||
# CONFIG_SOUND_AWE32_SYNTH is not set
|
||||
CONFIG_FS_MBCACHE=m
|
||||
CONFIG_NEED_MULTIPLE_NODES=y
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
CONFIG_HAVE_MEMORY_PRESENT=y
|
||||
CONFIG_DIGIEPCA=m
|
||||
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
|
||||
|
|
@ -29,8 +21,17 @@ CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
|
|||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
CONFIG_DISCONTIGMEM=y
|
||||
CONFIG_DISCONTIGMEM_MANUAL=y
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_ACPI_NUMA=y
|
||||
CONFIG_MIGRATION=y
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y
|
||||
CONFIG_SUSPEND_SMP=y
|
||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||
CONFIG_NODES_SHIFT=6
|
||||
CONFIG_X86_L1_CACHE_BYTES=128
|
||||
CONFIG_X86_MCE_AMD=y
|
||||
CONFIG_X86_64_ACPI_NUMA=y
|
||||
CONFIG_K8_NUMA=y
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_GENERIC_CPU=y
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
CONFIG_LOCK_KERNEL=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_STOP_MACHINE=y
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_MPSC=y
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=128
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
CONFIG_X86_HT=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_SCHED_SMT=y
|
||||
# CONFIG_K8_NUMA is not set
|
||||
# CONFIG_NUMA_EMU is not set
|
||||
# CONFIG_NUMA is not set
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
CONFIG_NR_CPUS=32
|
||||
CONFIG_CPU_FREQ_STAT_DETAILS=y
|
||||
CONFIG_R8169_VLAN=y
|
||||
# CONFIG_FB_MATROX_G is not set
|
||||
CONFIG_SOUND_AWE32_SYNTH=m
|
||||
CONFIG_FS_MBCACHE=m
|
||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
CONFIG_DIGIEPCA=m
|
||||
CONFIG_FLATMEM_MANUAL=y
|
||||
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||
# CONFIG_DISCONTIGMEM_MANUAL is not set
|
||||
# CONFIG_X86_MCE_AMD is not set
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
|
|
@ -1,17 +1,10 @@
|
|||
[base]
|
||||
flavours:
|
||||
amd64-k8
|
||||
em64t-p4
|
||||
amd64
|
||||
|
||||
[image]
|
||||
initramfs: false
|
||||
initramfs-generators: initramfs-tools
|
||||
type: plain-xen
|
||||
|
||||
[amd64-k8]
|
||||
class: AMD64 K8
|
||||
longclass: 64bit AMD Athlon64, AthlonFX, Opteron and Turion64
|
||||
|
||||
[em64t-p4]
|
||||
class: Intel em64t P4
|
||||
longclass: 64bit Intel em64t Pentium4/Pentium D/Xeon
|
||||
|
||||
[xen]
|
||||
flavour: amd64
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1058,7 +1058,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
|
|||
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
|
||||
# CONFIG_DEBUG_KOBJECT is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_INFO=y
|
||||
# CONFIG_DEBUG_INFO is not set
|
||||
# CONFIG_DEBUG_FS is not set
|
||||
CONFIG_FRAME_POINTER=y
|
||||
CONFIG_DEBUG_USER=y
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
[base]
|
||||
flavours:
|
||||
footbridge
|
||||
iop32x
|
||||
ixp4xx
|
||||
nslu2
|
||||
rpc
|
||||
|
|
@ -18,6 +19,10 @@ suggests: nwutil
|
|||
class: Footbridge based
|
||||
longclass: Footbridge (CATS, Netwinder)
|
||||
|
||||
[iop32x]
|
||||
class: IOP32x
|
||||
longclass: IOP32x based (Thecus N2100, etc)
|
||||
|
||||
[ixp4xx]
|
||||
class: IXP4xx
|
||||
longclass: IXP4xx based
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ CONFIG_PROC_FS=y
|
|||
CONFIG_PROC_KCORE=y
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_USB_MON=y
|
||||
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
|
||||
CONFIG_BSD_PROCESS_ACCT_V3=y
|
||||
CONFIG_BSD_PROCESS_ACCT=y
|
||||
CONFIG_SCSI_SATA=m
|
||||
CONFIG_SCSI_SATA_AHCI=m
|
||||
|
|
|
|||
|
|
@ -16,12 +16,15 @@ arches:
|
|||
powerpc
|
||||
s390
|
||||
sparc
|
||||
compiler: gcc-4.0
|
||||
compiler: gcc-4.1
|
||||
|
||||
[image]
|
||||
initramfs-generators: initramfs-tools yaird
|
||||
initramfs-generators: initramfs-tools yaird initramfs-fallback
|
||||
type: kernel-package
|
||||
|
||||
[xen]
|
||||
version: 3.0-unstable-1
|
||||
|
||||
[commands-image-initramfs-generators]
|
||||
initramfs-tools: mkinitramfs-kpkg
|
||||
yaird: mkinitrd.yaird
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
[base]
|
||||
compiler: gcc-4.0
|
||||
flavours:
|
||||
parisc
|
||||
parisc-smp
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
#
|
||||
# Variables
|
||||
#
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -44,7 +44,6 @@ CONFIG_X86_CPUID=m
|
|||
CONFIG_EDD=m
|
||||
# CONFIG_HIGHMEM64G is not set
|
||||
CONFIG_MTRR=y
|
||||
# CONFIG_EFI is not set
|
||||
CONFIG_REGPARM=y
|
||||
CONFIG_PM=y
|
||||
# CONFIG_PM_DEBUG is not set
|
||||
|
|
@ -1542,6 +1541,7 @@ CONFIG_USB_STORAGE_SDDR55=y
|
|||
CONFIG_USB_STORAGE_JUMPSHOT=y
|
||||
CONFIG_USB_HID=m
|
||||
CONFIG_USB_HIDINPUT=y
|
||||
CONFIG_USB_HIDINPUT_POWERBOOK=y
|
||||
# CONFIG_HID_FF is not set
|
||||
CONFIG_USB_HIDDEV=y
|
||||
CONFIG_USB_KBD=m
|
||||
|
|
@ -1794,3 +1794,8 @@ CONFIG_EDAC_I82860=m
|
|||
CONFIG_EDAC_E752X=m
|
||||
CONFIG_EDAC_R82600=m
|
||||
CONFIG_CLEAN_COMPILE=y
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_SCHED_MC=y
|
||||
CONFIG_EFI_VARS=y
|
||||
CONFIG_BOOT_IOREMAP=y
|
||||
CONFIG_EFI=y
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ CONFIG_X86_GOOD_APIC=y
|
|||
CONFIG_X86_USE_PPRO_CHECKSUM=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=8
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_SCHED_MC=y
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_MCE=y
|
||||
CONFIG_X86_MCE_NONFATAL=m
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ CONFIG_X86_GOOD_APIC=y
|
|||
CONFIG_X86_USE_PPRO_CHECKSUM=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=32
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_SCHED_MC=y
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_MCE=y
|
||||
CONFIG_X86_MCE_NONFATAL=m
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
|
|||
CONFIG_X86_USE_3DNOW=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=8
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_SCHED_MC=y
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_MCE=y
|
||||
CONFIG_X86_MCE_NONFATAL=m
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
[base]
|
||||
compiler: gcc-4.1
|
||||
flavours:
|
||||
486
|
||||
686
|
||||
k7
|
||||
686-bigmem
|
||||
kernel-arch: i386
|
||||
kernel-header-dirs: i386
|
||||
subarches:
|
||||
vserver
|
||||
# xen
|
||||
xen
|
||||
# xen-vserver
|
||||
|
||||
[image]
|
||||
|
|
@ -24,7 +24,7 @@ recommends: libc6-i686
|
|||
|
||||
[686-bigmem]
|
||||
class: PPro/Celeron/PII/PIII/P4
|
||||
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
|
||||
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with 4-64G RAM
|
||||
|
||||
[686-bigmem_image]
|
||||
recommends: libc6-i686
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -18,7 +18,6 @@ CONFIG_X86_GOOD_APIC=y
|
|||
CONFIG_X86_USE_PPRO_CHECKSUM=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=8
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_MCE=y
|
||||
CONFIG_X86_MCE_NONFATAL=m
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
|
|||
CONFIG_X86_USE_3DNOW=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=8
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_MCE=y
|
||||
CONFIG_X86_MCE_NONFATAL=m
|
||||
|
|
|
|||
|
|
@ -6,11 +6,3 @@ flavours:
|
|||
[image]
|
||||
recommends: util-vserver, libc6-i686
|
||||
|
||||
[686]
|
||||
class: PPro/Celeron/PII/PIII/P4
|
||||
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
|
||||
|
||||
[k7]
|
||||
class: AMD K7
|
||||
longclass: 32bit AMD Duron/Athlon/AthlonXP
|
||||
|
||||
|
|
|
|||
|
|
@ -8,19 +8,17 @@ CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
|
|||
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
|
||||
# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
|
||||
CONFIG_XEN_BLKDEV_BACKEND=y
|
||||
# CONFIG_XEN_BLKDEV_TAP_BE is not set
|
||||
CONFIG_XEN_NETDEV_BACKEND=y
|
||||
# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
|
||||
# CONFIG_XEN_TPMDEV_BACKEND is not set
|
||||
CONFIG_XEN_BLKDEV_FRONTEND=y
|
||||
CONFIG_XEN_NETDEV_FRONTEND=y
|
||||
# CONFIG_XEN_BLKDEV_TAP is not set
|
||||
CONFIG_XEN_NETDEV_LOOPBACK=y
|
||||
# CONFIG_XEN_TPMDEV_FRONTEND is not set
|
||||
CONFIG_XEN_SCRUB_PAGES=y
|
||||
CONFIG_XEN_DISABLE_SERIAL=y
|
||||
CONFIG_XEN_SYSFS=y
|
||||
# CONFIG_SMP_ALTERNATIVES is not set
|
||||
CONFIG_XEN_COMPAT_030002_AND_LATER=y
|
||||
# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
|
||||
# CONFIG_PCI_GOXEN_FE is not set
|
||||
CONFIG_VSERVER=y
|
||||
CONFIG_VSERVER_SECURITY=y
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ CONFIG_X86_GOOD_APIC=y
|
|||
CONFIG_X86_USE_PPRO_CHECKSUM=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=8
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_MCE=y
|
||||
CONFIG_X86_MCE_NONFATAL=m
|
||||
|
|
@ -28,7 +27,7 @@ CONFIG_HIGHMEM4G=y
|
|||
CONFIG_HIGHMEM=y
|
||||
# CONFIG_HIGHPTE is not set
|
||||
# CONFIG_MATH_EMULATION is not set
|
||||
# CONFIG_IRQBALANCE is not set
|
||||
CONFIG_IRQBALANCE=y
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
|
||||
# CONFIG_EISA is not set
|
||||
|
|
|
|||
|
|
@ -6,7 +6,3 @@ flavours:
|
|||
recommends: libc6-xen
|
||||
type: plain-xen
|
||||
|
||||
[686]
|
||||
class: PPro/Celeron/PII/PIII/P4
|
||||
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
|
||||
|
||||
|
|
|
|||
|
|
@ -9,17 +9,15 @@ CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
|
|||
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
|
||||
# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
|
||||
CONFIG_XEN_BLKDEV_BACKEND=y
|
||||
# CONFIG_XEN_BLKDEV_TAP_BE is not set
|
||||
CONFIG_XEN_NETDEV_BACKEND=y
|
||||
# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
|
||||
# CONFIG_XEN_TPMDEV_BACKEND is not set
|
||||
CONFIG_XEN_BLKDEV_FRONTEND=y
|
||||
CONFIG_XEN_NETDEV_FRONTEND=y
|
||||
# CONFIG_XEN_BLKDEV_TAP is not set
|
||||
CONFIG_XEN_NETDEV_LOOPBACK=y
|
||||
# CONFIG_XEN_TPMDEV_FRONTEND is not set
|
||||
CONFIG_XEN_NETDEV_LOOPBACK=m
|
||||
CONFIG_XEN_SCRUB_PAGES=y
|
||||
CONFIG_XEN_DISABLE_SERIAL=y
|
||||
CONFIG_XEN_SYSFS=y
|
||||
# CONFIG_SMP_ALTERNATIVES is not set
|
||||
CONFIG_XEN_COMPAT_030002_AND_LATER=y
|
||||
# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
|
||||
# CONFIG_PCI_GOXEN_FE is not set
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ CONFIG_X86_GOOD_APIC=y
|
|||
CONFIG_X86_USE_PPRO_CHECKSUM=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=8
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_MCE=y
|
||||
CONFIG_X86_MCE_NONFATAL=m
|
||||
|
|
@ -28,7 +27,7 @@ CONFIG_HIGHMEM4G=y
|
|||
CONFIG_HIGHMEM=y
|
||||
# CONFIG_HIGHPTE is not set
|
||||
# CONFIG_MATH_EMULATION is not set
|
||||
# CONFIG_IRQBALANCE is not set
|
||||
CONFIG_IRQBALANCE=y
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
|
||||
# CONFIG_EISA is not set
|
||||
|
|
@ -69,4 +68,3 @@ CONFIG_X86_HT=y
|
|||
CONFIG_X86_TRAMPOLINE=y
|
||||
CONFIG_X86_CMPXCHG64=y
|
||||
# CONFIG_M486 is not set
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
|
|||
CONFIG_X86_USE_3DNOW=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=8
|
||||
CONFIG_SCHED_SMT=y
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_MCE=y
|
||||
CONFIG_X86_MCE_NONFATAL=m
|
||||
|
|
@ -29,7 +28,7 @@ CONFIG_HIGHMEM4G=y
|
|||
CONFIG_HIGHMEM=y
|
||||
# CONFIG_HIGHPTE is not set
|
||||
# CONFIG_MATH_EMULATION is not set
|
||||
# CONFIG_IRQBALANCE is not set
|
||||
CONFIG_IRQBALANCE=y
|
||||
CONFIG_HAVE_DEC_LOCK=y
|
||||
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
|
||||
# CONFIG_EISA is not set
|
||||
|
|
@ -70,4 +69,3 @@ CONFIG_X86_HT=y
|
|||
CONFIG_X86_TRAMPOLINE=y
|
||||
CONFIG_X86_CMPXCHG64=y
|
||||
# CONFIG_M486 is not set
|
||||
# CONFIG_HOTPLUG_CPU is not set
|
||||
|
|
|
|||
|
|
@ -4,14 +4,9 @@ flavours:
|
|||
k7
|
||||
|
||||
[image]
|
||||
initramfs-generators: initramfs-tools
|
||||
recommends: libc6-xen
|
||||
type: plain-xen
|
||||
|
||||
[686]
|
||||
class: PPro/Celeron/PII/PIII/P4
|
||||
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
|
||||
|
||||
[k7]
|
||||
class: AMD K7
|
||||
longclass: 32bit AMD Duron/Athlon/AthlonXP
|
||||
|
||||
[xen]
|
||||
flavour: i386
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
[base]
|
||||
compiler: gcc-4.1
|
||||
flavours:
|
||||
itanium
|
||||
mckinley
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ kernel-arch: m68k
|
|||
kernel-header-dirs: m68k
|
||||
|
||||
[image]
|
||||
initramfs-generators: yaird initramfs-tools
|
||||
initramfs-generators: yaird initramfs-tools initramfs-fallback
|
||||
suggests: vmelilo, fdutils
|
||||
|
||||
[amiga]
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ flavours:
|
|||
sb1a-bcm91480b
|
||||
kernel-arch: mips
|
||||
kernel-header-dirs: mips
|
||||
initrd: no
|
||||
|
||||
[image]
|
||||
initramfs: false
|
||||
|
|
|
|||
|
|
@ -940,8 +940,8 @@ CONFIG_SERIO_LIBPS2=m
|
|||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_PCI=y
|
||||
CONFIG_SERIAL_8250_NR_UARTS=1
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
|
||||
CONFIG_SERIAL_8250_NR_UARTS=4
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
|
||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ flavours:
|
|||
r4k-kn04
|
||||
kernel-arch: mips
|
||||
kernel-header-dirs: mips
|
||||
initrd: no
|
||||
|
||||
[image]
|
||||
initramfs: false
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,4 @@
|
|||
[base]
|
||||
compiler: gcc-4.1
|
||||
flavours:
|
||||
s390
|
||||
s390-tape
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,4 @@
|
|||
[base]
|
||||
compiler: gcc-4.1
|
||||
flavours:
|
||||
sparc32
|
||||
sparc64
|
||||
|
|
|
|||
|
|
@ -35,7 +35,9 @@ class main(object):
|
|||
self.version = changelog['Version']['version']
|
||||
self.version_source = changelog['Version']['source']
|
||||
|
||||
self.abiname = "1"
|
||||
local_config = config_reader_arch(["debian/arch"])
|
||||
|
||||
self.abiname = local_config['abi',]['abiname']
|
||||
self.version_abi = self.version + '-' + self.abiname
|
||||
|
||||
def __call__(self):
|
||||
|
|
|
|||
|
|
@ -13,18 +13,14 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
def do_main_setup(self, vars, makeflags, extra):
|
||||
super(gencontrol, self).do_main_setup(vars, makeflags, extra)
|
||||
vars.update(self.config['image',])
|
||||
makeflags['REVISIONS'] = ' '.join([i['Version']['debian'] for i in self.changelog[::-1]])
|
||||
makeflags.update({
|
||||
'SOURCEVERSION': self.version['linux']['source'],
|
||||
})
|
||||
|
||||
def do_main_packages(self, packages, extra):
|
||||
vars = self.vars
|
||||
|
||||
main = self.templates["control.main"]
|
||||
packages.extend(self.process_packages(main, vars))
|
||||
|
||||
tree = self.templates["control.tree"]
|
||||
packages.append(self.process_real_tree(tree[0], vars))
|
||||
|
||||
packages.extend(self.process_packages(self.templates["control.support"], vars))
|
||||
packages.extend(self.process_packages(self.templates["control.main"], self.vars))
|
||||
packages.append(self.process_real_tree(self.templates["control.tree"][0], self.vars))
|
||||
packages.extend(self.process_packages(self.templates["control.support"], self.vars))
|
||||
|
||||
def do_arch_setup(self, vars, makeflags, arch, extra):
|
||||
vars.update(self.config.get(('image', arch), {}))
|
||||
|
|
@ -44,12 +40,10 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
package['Architecture'] = [arch]
|
||||
packages.append(package)
|
||||
|
||||
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
||||
|
||||
cmds_binary_arch = []
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags_string))
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags))
|
||||
cmds_source = []
|
||||
cmds_source.append(("$(MAKE) -f debian/rules.real source-arch %s" % makeflags_string,))
|
||||
cmds_source.append(("$(MAKE) -f debian/rules.real source-arch %s" % makeflags,))
|
||||
makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
|
||||
makefile.append(("build-%s-real:" % arch))
|
||||
makefile.append(("setup-%s-real:" % arch))
|
||||
|
|
@ -77,12 +71,10 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
package_headers['Architecture'] = [arch]
|
||||
packages.append(package_headers)
|
||||
|
||||
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
||||
|
||||
cmds_binary_arch = []
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % makeflags_string,))
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % makeflags,))
|
||||
cmds_source = []
|
||||
cmds_source.append(("$(MAKE) -f debian/rules.real source-subarch %s" % makeflags_string,))
|
||||
cmds_source.append(("$(MAKE) -f debian/rules.real source-subarch %s" % makeflags,))
|
||||
makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch), cmds_binary_arch))
|
||||
makefile.append("build-%s-%s-real:" % (arch, subarch))
|
||||
makefile.append(("setup-%s-%s-real:" % (arch, subarch)))
|
||||
|
|
@ -109,8 +101,6 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
image_type_modulesinline = self.templates["control.image.type-modulesinline"]
|
||||
image_type_standalone = self.templates["control.image.type-standalone"]
|
||||
headers = self.templates["control.headers"]
|
||||
image_latest = self.templates["control.image.latest"]
|
||||
headers_latest = self.templates["control.headers.latest"]
|
||||
|
||||
config_entry_base = self.config.merge('base', arch, subarch, flavour)
|
||||
config_entry_relations = self.config.merge('relations', arch, subarch, flavour)
|
||||
|
|
@ -130,29 +120,31 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
commands = [config_entry_commands_initramfs[i] for i in generators if config_entry_commands_initramfs.has_key(i)]
|
||||
makeflags['INITRD_CMD'] = ' '.join(commands)
|
||||
l = package_relation_group()
|
||||
l.extend(generators + ['initramfs-fallback'])
|
||||
l.extend(generators)
|
||||
image_depends.append(l)
|
||||
|
||||
packages_own = []
|
||||
packages_dummy = []
|
||||
packages_own = []
|
||||
|
||||
if vars['type'] == 'plain-s390-tape':
|
||||
image = image_type_standalone
|
||||
elif vars['type'] == 'plain-xen':
|
||||
image = image_type_modulesextra
|
||||
config_entry_xen = self.config.merge('xen', arch, subarch, flavour)
|
||||
for i, j in config_entry_xen.iteritems():
|
||||
vars['xen-%s' % i] = j
|
||||
packages_dummy.extend(self.process_packages(self.templates['control.xen-linux-system'], vars))
|
||||
else:
|
||||
image = image_type_modulesinline
|
||||
|
||||
packages_own.append(self.process_real_image(image[0], {'depends': image_depends}, config_entry_relations, vars))
|
||||
packages_own.extend(self.process_packages(image[1:], vars))
|
||||
packages_dummy.extend(self.process_packages(image_latest, vars))
|
||||
|
||||
if image in (image_type_modulesextra, image_type_modulesinline):
|
||||
makeflags['MODULES'] = True
|
||||
package_headers = self.process_package(headers[0], vars)
|
||||
package_headers['Depends'].extend(relations_compiler)
|
||||
packages_own.append(package_headers)
|
||||
packages_dummy.append(self.process_package(headers_latest[0], vars))
|
||||
extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[-1]['Package'])
|
||||
|
||||
for package in packages_own + packages_dummy:
|
||||
|
|
@ -164,27 +156,47 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
package['Architecture'] = [arch]
|
||||
packages.append(package)
|
||||
|
||||
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
||||
if vars['type'] == 'plain-xen':
|
||||
for i in ('postinst', 'postrm', 'prerm'):
|
||||
j = self.substitute(self.templates["image.xen.%s" % i], vars)
|
||||
file("debian/%s.%s" % (packages_own[0]['Package'], i), 'w').write(j)
|
||||
|
||||
cmds_binary_arch = []
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags_string),))
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags,))
|
||||
if packages_dummy:
|
||||
cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags),))
|
||||
cmds_build = []
|
||||
cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
|
||||
cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags,))
|
||||
cmds_setup = []
|
||||
cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string,))
|
||||
cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags,))
|
||||
makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_binary_arch))
|
||||
makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
|
||||
makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
|
||||
makefile.append(("source-%s-%s-%s-real:" % (arch, subarch, flavour)))
|
||||
|
||||
def do_extra(self, packages, makefile):
|
||||
apply = self.templates['patch.apply']
|
||||
unpatch = self.templates['patch.unpatch']
|
||||
|
||||
vars = {
|
||||
'home': '/usr/src/kernel-patches/all/%s' % self.version['linux']['upstream'],
|
||||
'revisions': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
|
||||
}
|
||||
vars.update(self.version['linux'])
|
||||
|
||||
apply = self.substitute(apply, vars)
|
||||
unpatch = self.substitute(unpatch, vars)
|
||||
|
||||
file('debian/bin/patch-apply', 'w').write(apply)
|
||||
file('debian/bin/patch-unpatch', 'w').write(unpatch)
|
||||
|
||||
def process_changelog(self):
|
||||
version = self.changelog[0]['Version']
|
||||
self.process_version(version)
|
||||
if version['modifier'] is not None:
|
||||
self.abiname = self.vars['abiname'] = ''
|
||||
self.version = self.changelog[0]['Version']
|
||||
if self.version['linux']['modifier'] is not None:
|
||||
self.abiname = ''
|
||||
else:
|
||||
self.abiname = self.vars['abiname'] = '-%s' % self.config['abi',]['abiname']
|
||||
self.abiname = '-%s' % self.config['abi',]['abiname']
|
||||
self.vars = self.process_version_linux(self.version, self.abiname)
|
||||
|
||||
def process_real_image(self, in_entry, relations, config, vars):
|
||||
entry = self.process_package(in_entry, vars)
|
||||
|
|
@ -197,22 +209,23 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
t = relations.get(field.lower(), [])
|
||||
value.extend(t)
|
||||
value.config(config)
|
||||
entry[field] = value
|
||||
if value:
|
||||
entry[field] = value
|
||||
return entry
|
||||
|
||||
def process_real_tree(self, in_entry, vars):
|
||||
entry = self.process_package(in_entry, vars)
|
||||
tmp = self.changelog[0]['Version']['upstream']
|
||||
tmp = self.changelog[0]['Version']['linux']['upstream']
|
||||
versions = []
|
||||
for i in self.changelog:
|
||||
if i['Version']['upstream'] != tmp:
|
||||
if i['Version']['linux']['upstream'] != tmp:
|
||||
break
|
||||
versions.insert(0, i['Version'])
|
||||
versions.insert(0, i['Version']['linux'])
|
||||
for i in (('Depends', 'Provides')):
|
||||
value = package_relation_list()
|
||||
value.extend(entry.get(i, []))
|
||||
if i == 'Depends':
|
||||
value.append("linux-patch-debian-%(version)s (= %(source)s)" % self.changelog[0]['Version'])
|
||||
value.append("linux-patch-debian-%(version)s (= %(source)s)" % self.changelog[0]['Version']['linux'])
|
||||
value.append(' | '.join(["linux-source-%(version)s (= %(source)s)" % v for v in versions]))
|
||||
elif i == 'Provides':
|
||||
value.extend(["linux-tree-%(source)s" % v for v in versions])
|
||||
|
|
|
|||
|
|
@ -1,14 +1,138 @@
|
|||
linux-2.6 (2.6.17+2.6.18-rc3-0experimental.1) unstable; urgency=low
|
||||
|
||||
[ Bastian Blank ]
|
||||
* Initial fork.
|
||||
|
||||
[ Sven Luther ]
|
||||
* [powerpc] Added console=hvsi0 too to CMDLINE to the powerpc64 flavour,
|
||||
for non-virtualized IBM power machines serial console.
|
||||
*
|
||||
|
||||
-- Sven Luther <luther@debian.org> Wed, 9 Aug 2006 20:35:39 +0200
|
||||
|
||||
linux-2.6 (2.6.17-8) UNRELEASED; urgency=low
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
* arm/ixp4xx: Enable CONFIG_W1.
|
||||
|
||||
[ dann frazier ]
|
||||
* sound-pci-hda-mac-mini-quirks.diff, sound-pci-hda-intel-d965.diff
|
||||
sound-pci-hda-mac-mini-intel945.diff:
|
||||
Updates to patch_sigmatel.c to add x86 mac-mini sound support
|
||||
Thanks to Matt Kraai. (closes: #384972)
|
||||
|
||||
-- dann frazier <dannf@debian.org> Tue, 29 Aug 2006 00:06:48 -0600
|
||||
|
||||
linux-2.6 (2.6.17-7) unstable; urgency=low
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
* arm/iop32x: Enable CONFIG_BLK_DEV_OFFBOARD.
|
||||
* arm/iop32x: Unset CONFIG_BLK_DEV_AMD74XX since it fails on ARM
|
||||
with "Unknown symbol pci_get_legacy_ide_irq".
|
||||
* arm/iop32x: Enable a number of MD and DM modules.
|
||||
* arm/iop32x: Enable some more USB network modules.
|
||||
* mipsel/r5k-cobalt: Increase 8250 NR_UARTS and RUNTIME_UARTS to 4.
|
||||
* mipsel/r5k-cobalt: Fix MAC detection problem on Qube 2700.
|
||||
|
||||
[ Bastian Blank ]
|
||||
* Update vserver patch to 2.0.2-rc29.
|
||||
* Add stable release 2.6.17.10:
|
||||
- Fix possible UDF deadlock and memory corruption (CVE-2006-4145)
|
||||
- elv_unregister: fix possible crash on module unload
|
||||
- Fix sctp privilege elevation (CVE-2006-3745)
|
||||
|
||||
[ maximilian attems ]
|
||||
* Add RAM range to longclass for -bigmem. (closes: 382799)
|
||||
* Add stable release 2.6.17.9:
|
||||
- powerpc: Clear HID0 attention enable on PPC970 at boot time
|
||||
(CVE-2006-4093)
|
||||
* Add stable release 2.6.17.11:
|
||||
- Fix ipv4 routing locking bug
|
||||
- disable debugging version of write_lock()
|
||||
- PCI: fix ICH6 quirks
|
||||
- 1394: fix for recently added firewire patch that breaks things on ppc
|
||||
- Fix IFLA_ADDRESS handling
|
||||
- Fix BeFS slab corruption
|
||||
- Fix timer race in dst GC code
|
||||
- Have ext3 reject file handles with bad inode numbers early
|
||||
- Kill HASH_HIGHMEM from route cache hash sizing
|
||||
- sys_getppid oopses on debug kernel
|
||||
- IA64: local DoS with corrupted ELFs
|
||||
- tpm: interrupt clear fix
|
||||
- ulog: fix panic on SMP kernels
|
||||
- dm: BUG/OOPS fix
|
||||
- MD: Fix a potential NULL dereference in md/raid1
|
||||
- ip_tables: fix table locking in ipt_do_table
|
||||
- swsusp: Fix swap_type_of
|
||||
- sky2: phy power problem on 88e805x
|
||||
- ipx: header length validation needed
|
||||
|
||||
[ Frederik Schüler ]
|
||||
* Activate CONFIG_R8169_VLAN on amd64. (closes: #383707)
|
||||
* Activate EFI boot support on i386. (closes: #381951)
|
||||
|
||||
[ dann frazier ]
|
||||
* Include module.lds in headers package if it exists. (closes: #342246)
|
||||
* Add Apple MacBook product IDs to usbhid and set
|
||||
CONFIG_USB_HIDINPUT_POWERBOOK=y on i386 and amd64. (closes: #383620)
|
||||
|
||||
-- Bastian Blank <waldi@debian.org> Thu, 24 Aug 2006 15:54:51 +0000
|
||||
|
||||
linux-2.6 (2.6.17-6) unstable; urgency=low
|
||||
|
||||
[ maximilian attems ]
|
||||
* debian/arch/i386/defines: Activate 686-bigmem flavour for enterprise
|
||||
usage.
|
||||
* Add ubuntu pci table patch for scsi drivers advansys and fdomain.
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
* arm/armeb: Use gcc-4.1.
|
||||
* mips/mipsel: Use gcc-4.1.
|
||||
* arm/ixp4xx: Update config based on the NSLU2 config.
|
||||
* arm/s3c2410: Unset CONFIG_DEBUG_INFO.
|
||||
* arm/iop32x: xscale: don't mis-report 80219 as an iop32x
|
||||
* arm/iop32x: Add an MTD map for IOP3xx boards
|
||||
* arm/iop32x: Add support for the Thecus N2100.
|
||||
* arm/iop32x: Add support for the GLAN Tank.
|
||||
* arm/iop32x: Add a flavour for IOP32x based machines.
|
||||
|
||||
[ Bastian Blank ]
|
||||
* Shrink short descriptions.
|
||||
* Make gcc-4.1 the default compiler.
|
||||
* [powerpc]: Use gcc-4.1.
|
||||
* Move latest and transitional packages to linux-latest-2.6.
|
||||
|
||||
[ Frederik Schüler ]
|
||||
* [amd64] Add smp-alternatives backport.
|
||||
* [amd64] Drop smp flavours.
|
||||
* [amd64] Merge k8 and p4 flavours into a generic one, following upstreams
|
||||
advice.
|
||||
* Activate BSD_PROCESS_ACCT_V3.
|
||||
* Add stable release 2.6.17.8:
|
||||
- ALSA: Don't reject O_RDWR at opening PCM OSS
|
||||
- Add stable branch to maintainers file
|
||||
- tty serialize flush_to_ldisc
|
||||
- S390: fix futex_atomic_cmpxchg_inatomic
|
||||
- Fix budget-av compile failure
|
||||
- cond_resched() fix
|
||||
- e1000: add forgotten PCI ID for supported device
|
||||
- ext3: avoid triggering ext3_error on bad NFS file handle
|
||||
- ext3 -nobh option causes oops
|
||||
- Fix race related problem when adding items to and svcrpc auth cache.
|
||||
- ieee1394: sbp2: enable auto spin-up for Maxtor disks
|
||||
- invalidate_bdev() speedup
|
||||
- Sparc64 quad-float emulation fix
|
||||
- VLAN state handling fix
|
||||
- Update frag_list in pskb_trim
|
||||
- UHCI: Fix handling of short last packet
|
||||
- sky2: NAPI bug
|
||||
- i2c: Fix 'ignore' module parameter handling in i2c-core
|
||||
- scx200_acb: Fix the block transactions
|
||||
- scx200_acb: Fix the state machine
|
||||
- H.323 helper: fix possible NULL-ptr dereference
|
||||
- Don't allow chmod() on the /proc/<pid>/ files
|
||||
- PCI: fix issues with extended conf space when MMCONFIG disabled because of e820
|
||||
|
||||
[ Sven Luther ]
|
||||
* [powerpc] Added console=hvsi0 too to CMDLINE to the powerpc64 flavour, for
|
||||
non-virtualized IBM power machines serial console.
|
||||
|
||||
-- Bastian Blank <waldi@debian.org> Fri, 11 Aug 2006 19:58:06 +0200
|
||||
|
||||
linux-2.6 (2.6.17-5) unstable; urgency=low
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
|
|
@ -224,6 +348,58 @@ linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low
|
|||
|
||||
-- Frederik Schüler <fs@debian.org> Sun, 7 May 2006 17:06:29 +0200
|
||||
|
||||
linux-2.6.16 (2.6.16-18) unstable; urgency=high
|
||||
|
||||
[ Sven Luther ]
|
||||
* [powerpc] Added console=hvsi0 too to CMDLINE to the powerpc64 flavour,
|
||||
for non-virtualized IBM power machines serial console.
|
||||
|
||||
[ dann frazier ]
|
||||
* fs-ext3-bad-nfs-handle.patch: avoid triggering ext3_error on bad NFS
|
||||
file handle (CVE-2006-3468)
|
||||
* cdrom-bad-cgc.buflen-assign.patch: fix buffer overflow in dvd_read_bca
|
||||
* usb-serial-ftdi_sio-dos.patch: fix userspace DoS in ftdi_sio driver
|
||||
|
||||
[ Bastian Blank ]
|
||||
* Update xen patch to changeset 9762.
|
||||
|
||||
-- Frederik Schüler <fs@debian.org> Fri, 18 Aug 2006 20:29:17 +0200
|
||||
|
||||
linux-2.6.16 (2.6.16-17) unstable; urgency=high
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
* Add stable release 2.6.16.22:
|
||||
- powernow-k8 crash workaround
|
||||
- NTFS: Critical bug fix (affects MIPS and possibly others)
|
||||
- JFS: Fix multiple errors in metapage_releasepage
|
||||
- SPARC64: Fix D-cache corruption in mremap
|
||||
- SPARC64: Respect gfp_t argument to dma_alloc_coherent().
|
||||
- SPARC64: Fix missing fold at end of checksums.
|
||||
- scsi_lib.c: properly count the number of pages in scsi_req_map_sg()
|
||||
- I2O: Bugfixes to get I2O working again
|
||||
- Missed error checking for intent's filp in open_namei().
|
||||
- tmpfs: time granularity fix for [acm]time going backwards
|
||||
- USB: Whiteheat: fix firmware spurious errors
|
||||
- fs/namei.c: Call to file_permission() under a spinlock in do_lookup_path()
|
||||
* Add stable release 2.6.16.23:
|
||||
- revert PARPORT_SERIAL should depend on SERIAL_8250_PCI patch
|
||||
- NETFILTER: SCTP conntrack: fix crash triggered by packet without
|
||||
chunks (CVE-2006-2934)
|
||||
* Add stable release 2.6.16.24:
|
||||
- fix prctl privilege escalation and suid_dumpable (CVE-2006-2451)
|
||||
* Add stable release 2.6.16.25:
|
||||
- Fix nasty /proc vulnerability (CVE-2006-3626)
|
||||
* Relax /proc fix a bit (Linus Torvalds)
|
||||
|
||||
* [arm/nslu2] Unset CONFIG_USB_STORAGE_DEBUG. Closes: #377853.
|
||||
* [mips] SGI ip22 RTC was broken, fixed thanks to Julien Blache.
|
||||
* [mips] Fix SGI ip22 serial console, thanks to Julien Blache.
|
||||
|
||||
[ Bastian Blank ]
|
||||
* Fix vserver patch.
|
||||
|
||||
-- Bastian Blank <waldi@debian.org> Sat, 15 Jul 2006 17:18:49 +0200
|
||||
|
||||
linux-2.6.16 (2.6.16-16) unstable; urgency=low
|
||||
|
||||
[ Sven Luther ]
|
||||
|
|
|
|||
|
|
@ -143,8 +143,9 @@ class config_reader_arch(config_reader):
|
|||
|
||||
def _read_flavour(self, arch, subarch, flavour):
|
||||
if not self.has_key(('base', arch, subarch, flavour)):
|
||||
import warnings
|
||||
warnings.warn('No config entry for flavour %s, subarch %s, arch %s' % (flavour, subarch, arch), DeprecationWarning)
|
||||
if subarch == 'none':
|
||||
import warnings
|
||||
warnings.warn('No config entry for flavour %s, subarch none, arch %s' % (flavour, arch), DeprecationWarning)
|
||||
self['base', arch, subarch, flavour] = {}
|
||||
|
||||
def _read_subarch(self, arch, subarch):
|
||||
|
|
@ -167,6 +168,19 @@ class config_reader_arch(config_reader):
|
|||
for flavour in flavours:
|
||||
self._read_flavour(arch, subarch, flavour)
|
||||
|
||||
def merge(self, section, arch = None, subarch = None, flavour = None):
|
||||
ret = {}
|
||||
ret.update(self.get((section,), {}))
|
||||
if arch:
|
||||
ret.update(self.get((section, arch), {}))
|
||||
if flavour and subarch and subarch != 'none':
|
||||
ret.update(self.get((section, arch, 'none', flavour), {}))
|
||||
if subarch:
|
||||
ret.update(self.get((section, arch, subarch), {}))
|
||||
if flavour:
|
||||
ret.update(self.get((section, arch, subarch, flavour), {}))
|
||||
return ret
|
||||
|
||||
class config_parser(object):
|
||||
__slots__ = 'configs', 'schema'
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,25 @@ def read_changelog(dir = ''):
|
|||
return entries
|
||||
|
||||
def parse_version(version):
|
||||
ret = {
|
||||
'complete': version,
|
||||
'upstream': version,
|
||||
'debian': None,
|
||||
'linux': None,
|
||||
}
|
||||
try:
|
||||
i = len(version) - version[::-1].index('-')
|
||||
except ValueError:
|
||||
return ret
|
||||
ret['upstream'] = version[:i-1]
|
||||
ret['debian'] = version[i:]
|
||||
try:
|
||||
ret['linux'] = parse_version_linux(version)
|
||||
except ValueError:
|
||||
pass
|
||||
return ret
|
||||
|
||||
def parse_version_linux(version):
|
||||
version_re = ur"""
|
||||
^
|
||||
(?P<source>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,17 @@ class packages_list(sorted_dict):
|
|||
for package in packages:
|
||||
self[package['Package']] = package
|
||||
|
||||
class flags(dict):
|
||||
def __repr__(self):
|
||||
repr = super(flags, self).__repr__()
|
||||
return "%s(%s)" % (self.__class__.__name__, repr)
|
||||
|
||||
def __str__(self):
|
||||
return ' '.join(["%s='%s'" % i for i in self.iteritems()])
|
||||
|
||||
def copy(self):
|
||||
return self.__class__(super(flags, self).copy())
|
||||
|
||||
class gencontrol(object):
|
||||
makefile_targets = ('binary-arch', 'build', 'setup', 'source')
|
||||
|
||||
|
|
@ -38,7 +49,7 @@ class gencontrol(object):
|
|||
vars = self.vars.copy()
|
||||
vars.update(config_entry)
|
||||
|
||||
makeflags = {}
|
||||
makeflags = flags()
|
||||
extra = {}
|
||||
|
||||
self.do_main_setup(vars, makeflags, extra)
|
||||
|
|
@ -50,22 +61,18 @@ class gencontrol(object):
|
|||
|
||||
def do_main_setup(self, vars, makeflags, extra):
|
||||
makeflags.update({
|
||||
'MAJOR': self.version['major'],
|
||||
'VERSION': self.version['version'],
|
||||
'SOURCE_UPSTREAM': self.version['source_upstream'],
|
||||
'SOURCEVERSION': self.version['source'],
|
||||
'UPSTREAMVERSION': self.version['upstream'],
|
||||
'MAJOR': self.version['linux']['major'],
|
||||
'VERSION': self.version['linux']['version'],
|
||||
'UPSTREAMVERSION': self.version['linux']['upstream'],
|
||||
'ABINAME': self.abiname,
|
||||
})
|
||||
|
||||
def do_main_makefile(self, makefile, makeflags, extra):
|
||||
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
|
||||
|
||||
cmds_binary_indep = []
|
||||
cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % makeflags_string,))
|
||||
cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % makeflags,))
|
||||
makefile.append(("binary-indep:", cmds_binary_indep))
|
||||
|
||||
def do_main_packages(self, packages):
|
||||
def do_main_packages(self, packages, extra):
|
||||
pass
|
||||
|
||||
def do_extra(self, packages, makefile):
|
||||
|
|
@ -115,8 +122,6 @@ class gencontrol(object):
|
|||
for subarch in config_entry['subarches']:
|
||||
self.do_subarch(packages, makefile, arch, subarch, vars.copy(), makeflags.copy(), extra)
|
||||
|
||||
self.do_arch_packages_post(packages, makefile, arch, vars, makeflags, extra)
|
||||
|
||||
def do_arch_setup(self, vars, makeflags, arch, extra):
|
||||
pass
|
||||
|
||||
|
|
@ -129,9 +134,6 @@ class gencontrol(object):
|
|||
for i in self.makefile_targets:
|
||||
makefile.append("%s-%s-real:" % (i, arch))
|
||||
|
||||
def do_arch_packages_post(self, packages, makefile, arch, vars, makeflags, extra):
|
||||
pass
|
||||
|
||||
def do_subarch(self, packages, makefile, arch, subarch, vars, makeflags, extra):
|
||||
config_entry = self.config['base', arch, subarch]
|
||||
vars.update(config_entry)
|
||||
|
|
@ -160,7 +162,7 @@ class gencontrol(object):
|
|||
makefile.append("%s-%s-%s-real:" % (i, arch, subarch))
|
||||
|
||||
def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
|
||||
config_entry = self.config['base', arch, subarch, flavour]
|
||||
config_entry = self.config.merge('base', arch, subarch, flavour)
|
||||
vars.update(config_entry)
|
||||
|
||||
if not vars.has_key('class'):
|
||||
|
|
@ -178,7 +180,6 @@ class gencontrol(object):
|
|||
|
||||
def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
|
||||
for i in (
|
||||
('compiler', 'COMPILER'),
|
||||
('kernel-arch', 'KERNEL_ARCH'),
|
||||
('localversion', 'LOCALVERSION'),
|
||||
):
|
||||
|
|
@ -235,13 +236,13 @@ class gencontrol(object):
|
|||
entries.append(self.process_package(i, vars))
|
||||
return entries
|
||||
|
||||
def process_version(self, version):
|
||||
self.version = version
|
||||
self.vars = {
|
||||
'upstreamversion': version['upstream'],
|
||||
'version': version['version'],
|
||||
'source_upstream': version['source_upstream'],
|
||||
'major': version['major'],
|
||||
def process_version_linux(self, version, abiname):
|
||||
return {
|
||||
'upstreamversion': version['linux']['upstream'],
|
||||
'version': version['linux']['version'],
|
||||
'source_upstream': version['linux']['source_upstream'],
|
||||
'major': version['linux']['major'],
|
||||
'abiname': abiname,
|
||||
}
|
||||
|
||||
def substitute(self, s, vars):
|
||||
|
|
@ -251,7 +252,7 @@ class gencontrol(object):
|
|||
return s
|
||||
def subst(match):
|
||||
return vars[match.group(1)]
|
||||
return re.sub(r'@([a-z_]+)@', subst, s)
|
||||
return re.sub(r'@([-_a-z]+)@', subst, s)
|
||||
|
||||
def write_control(self, list):
|
||||
self.write_rfc822(file("debian/control", 'w'), list)
|
||||
|
|
|
|||
|
|
@ -53,8 +53,9 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
|||
|
||||
def process_config_version(self, config):
|
||||
entry = config['version',]
|
||||
self.process_version(parse_version(entry['source']))
|
||||
self.vars['abiname'] = self.abiname = entry['abiname']
|
||||
self.version = parse_version(entry['source'])
|
||||
self.abiname = entry['abiname']
|
||||
self.vars = self.process_version_linux(self.version, self.abiname)
|
||||
|
||||
if __name__ == '__main__':
|
||||
gencontrol(sys.path[0] + "/../arch")()
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ $(DIR_ORIG):
|
|||
fi
|
||||
|
||||
maintainerclean:
|
||||
-rm debian/control debian/control.md5sum debian/rules.gen
|
||||
-rm debian/control debian/control.md5sum debian/rules.gen debian/bin/patch-* debian/linux-*
|
||||
rm -rf $(filter-out debian .svn, $(wildcard * .[^.]*))
|
||||
|
||||
clean: debian/control
|
||||
|
|
|
|||
|
|
@ -43,12 +43,10 @@ endif
|
|||
ifdef KPKG_SUBARCH
|
||||
kpkg_image += --subarch '$(KPKG_SUBARCH)'
|
||||
endif
|
||||
setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION -u LOCALVERSION
|
||||
setup_makeflags =
|
||||
setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION -u LOCALVERSION -u MAKEFLAGS
|
||||
ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
|
||||
kpkg_image += --cross-compile='$(DEB_HOST_GNU_TYPE)'
|
||||
endif
|
||||
setup_env += MAKEFLAGS='$(setup_makeflags)'
|
||||
|
||||
ifdef DEBIAN_KERNEL_JOBS
|
||||
setup_env_kpkg_jobs = CONCURRENCY_LEVEL=$(DEBIAN_KERNEL_JOBS)
|
||||
|
|
@ -59,10 +57,10 @@ endif
|
|||
# Targets
|
||||
#
|
||||
binary-arch-arch: install-headers-$(ARCH)
|
||||
binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
|
||||
binary-arch-subarch: install-headers-$(ARCH)-$(SUBARCH)
|
||||
binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
|
||||
ifeq ($(MODULES),True)
|
||||
binary-arch-flavour: install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
|
||||
binary-arch-flavour: install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
|
||||
endif
|
||||
|
||||
binary-indep: install-doc
|
||||
|
|
@ -102,12 +100,12 @@ $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: $(STAMPS_DIR)/source
|
|||
rm -rf '$(DIR)'
|
||||
|
||||
define patch_cmd
|
||||
cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches' --overwrite-source='$(SOURCEVERSION)' --overwrite-revisions='$(REVISIONS)'
|
||||
cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/patch-apply' --overwrite-home='$(CURDIR)/debian/patches'
|
||||
endef
|
||||
|
||||
srcfiles := $(filter-out debian, $(wildcard * .[^.]*))
|
||||
$(STAMPS_DIR)/source: DIR=$(BUILD_DIR)/source
|
||||
$(STAMPS_DIR)/source: debian/bin/apply.py
|
||||
$(STAMPS_DIR)/source:
|
||||
rm -rf '$(DIR)'
|
||||
mkdir -p '$(DIR)'
|
||||
cp -al $(srcfiles) '$(DIR)'
|
||||
|
|
@ -226,12 +224,12 @@ install-headers-$(ARCH):
|
|||
dh_testroot
|
||||
$(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)'
|
||||
|
||||
install-header-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
|
||||
install-header-$(ARCH)-$(SUBARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
|
||||
install-header-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
|
||||
install-header-$(ARCH)-$(SUBARCH): SOURCE_DIR = $(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
|
||||
install-header-$(ARCH)-$(SUBARCH): DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
|
||||
install-header-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
|
||||
install-headers-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
|
||||
install-headers-$(ARCH)-$(SUBARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
|
||||
install-headers-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
|
||||
install-headers-$(ARCH)-$(SUBARCH): SOURCE_DIR = $(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
|
||||
install-headers-$(ARCH)-$(SUBARCH): DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
|
||||
install-headers-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k -d
|
||||
|
|
@ -255,17 +253,17 @@ install-header-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
|
|||
cpio -pd --preserve-modification-time $(DIR)
|
||||
$(MAKE) -f debian/rules.real install-base
|
||||
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME = linux-headers-$(REAL_VERSION)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_HEADERS = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR)
|
||||
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME = linux-headers-$(REAL_VERSION)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_HEADERS = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR)
|
||||
install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k -d
|
||||
|
|
@ -293,6 +291,8 @@ install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBA
|
|||
cp -a "${SOURCE_DIR}/arch/${KERNEL_ARCH}/include" "${DIR}/arch/${KERNEL_ARCH}/include" || :
|
||||
[ -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/kernel/asm-offsets.s" ] && \
|
||||
ln -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/kernel/asm-offsets.s" "${DIR}/arch/${KERNEL_ARCH}/kernel" || :
|
||||
[ -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/module.lds" ] && \
|
||||
ln -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/module.lds" "${DIR}/arch/${KERNEL_ARCH}" || :
|
||||
ln -s "../../../../${PACKAGE_NAME_HEADERS}/arch/${KERNEL_ARCH}/kernel/Makefile" "${DIR}/arch/${KERNEL_ARCH}/kernel"
|
||||
|
||||
cd ${SOURCE_DIR}; \
|
||||
|
|
@ -374,16 +374,18 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
|
|||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -d -k
|
||||
dh_installdirs 'boot'
|
||||
DH_OPTIONS= dh_installdirs -p$(PACKAGE_NAME) 'boot'
|
||||
DH_OPTIONS= dh_installdirs -p$(MODULES_PACKAGE_NAME) 'boot'
|
||||
cp $(DIR)/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
|
||||
cd $(DIR); $(setup_env) make modules_install ARCH=$(KERNEL_ARCH) INSTALL_MOD_PATH=$(MODULES_PACKAGE_DIR)
|
||||
cp $(DIR)/.config $(INSTALL_DIR)/config-$(REAL_VERSION)
|
||||
cp $(DIR)/System.map $(INSTALL_DIR)/System.map-$(REAL_VERSION)
|
||||
cp $(DIR)/.config $(MODULES_PACKAGE_DIR)/boot/config-$(REAL_VERSION)
|
||||
cp $(DIR)/System.map $(MODULES_PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
|
||||
rm $(MODULES_PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source}
|
||||
$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
|
||||
DH_OPTIONS= dh_installmodules -p$(MODULES_PACKAGE_NAME)
|
||||
$(MAKE) -f debian/rules.real install-base
|
||||
|
||||
install-patch: PACKAGE = linux-patch-debian-$(VERSION)
|
||||
install-patch: pbase := /usr/src/kernel-patches/all/$(SOURCE_UPSTREAM)
|
||||
install-patch: pbase := /usr/src/kernel-patches/all/$(UPSTREAM)
|
||||
install-patch: pfull := debian/$(PACKAGE)$(pbase)
|
||||
install-patch: ptchs := $(notdir $(wildcard debian/patches-arch/*))
|
||||
install-patch: DH_OPTIONS = -p$(PACKAGE)
|
||||
|
|
@ -393,13 +395,8 @@ install-patch:
|
|||
dh_clean -d -k $(DH_OPTIONS)
|
||||
dh_installdirs $(DH_OPTIONS) '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch'
|
||||
dh_install $(DH_OPTIONS) debian/patches/* '$(pbase)/debian'
|
||||
sed \
|
||||
-e 's,@home@,$(pbase)/debian,' \
|
||||
-e 's,@revisions@,$(REVISIONS),' \
|
||||
-e 's,@source@,$(SOURCEVERSION),' \
|
||||
debian/bin/apply.py > '$(pfull)/apply/debian'
|
||||
sed -e 's/@upstream@/$(SOURCE_UPSTREAM)/g' debian/bin/unpatch > '$(pfull)/unpatch/debian'
|
||||
chmod 755 '$(pfull)/apply/debian' '$(pfull)/unpatch/debian'
|
||||
install debian/bin/patch-apply '$(pfull)/apply/debian'
|
||||
install debian/bin/patch-unpatch '$(pfull)/unpatch/debian'
|
||||
chmod 644 '$(pfull)/debian/'*.patch
|
||||
bzip2 -9 '$(pfull)/debian/'*.patch
|
||||
$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
|
||||
|
|
|
|||
|
|
@ -1,282 +0,0 @@
|
|||
Package: kernel-image-2.6-generic
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: alpha
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-alpha-generic
|
||||
Description: Linux kernel 2.6 image on Alpha machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: alpha
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-alpha-smp
|
||||
Description: Linux kernel 2.6 image on Alpha SMP machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: linux-image-2.6-amd64-generic
|
||||
Architecture: amd64
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-amd64-k8
|
||||
Description: Linux kernel 2.6 image on all x86-64 machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-386
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: i386
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-486
|
||||
Description: Linux kernel 2.6 image on 486-class machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-686
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: i386
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-686
|
||||
Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-686-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: i386
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-686-smp
|
||||
Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 SMP machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: linux-image-2.6-686-smp
|
||||
Architecture: i386
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-686
|
||||
Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 SMP machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-k7
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: i386
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-k7
|
||||
Description: Linux kernel 2.6 image on AMD K7 machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-k7-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: i386
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-k7-smp
|
||||
Description: Linux kernel 2.6 image on AMD K7 SMP machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: linux-image-2.6-k7-smp
|
||||
Architecture: i386
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-k7
|
||||
Description: Linux kernel 2.6 image on AMD K7 SMP machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-itanium
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: ia64
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-itanium
|
||||
Description: Linux kernel 2.6 image on Itanium machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-itanium-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: ia64
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-itanium-smp
|
||||
Description: Linux kernel 2.6 image on multi-processor Itanium machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-mckinley
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: ia64
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-mckinley
|
||||
Description: Linux kernel 2.6 image on Itanium II machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-mckinley-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: ia64
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-mckinley-smp
|
||||
Description: Linux kernel 2.6 image on multi-processor Itanium II machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: linux-image-2.6-itanium-smp
|
||||
Architecture: ia64
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-itanium
|
||||
Description: Linux kernel 2.6 image on Itanium machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: linux-image-2.6-mckinley-smp
|
||||
Architecture: ia64
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-mckinley
|
||||
Description: Linux kernel 2.6 image on Itanium II machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-powerpc
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-powerpc
|
||||
Description: Linux kernel image on powerpc-class machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-powerpc
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-powerpc
|
||||
Description: Linux kernel 2.6 image on powerpc-class machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-powerpc-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-powerpc-smp
|
||||
Description: Linux kernel image on powerpc-smp-class machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-powerpc-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-powerpc-smp
|
||||
Description: Linux kernel 2.6 image on powerpc-smp-class machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-power3
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-powerpc64
|
||||
Description: linux kernel image on power3 - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-power3
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-powerpc64
|
||||
Description: linux kernel 2.6 image on power3 - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-power3-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-powerpc64
|
||||
Description: linux kernel image on power3 - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-power3-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-powerpc64
|
||||
Description: linux kernel 2.6 image on power3 - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-power4
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-powerpc64
|
||||
Description: linux kernel image on power4/G5 - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-power4
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-powerpc64
|
||||
Description: linux kernel 2.6 image on power4/G5 - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-power4-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-powerpc64
|
||||
Description: linux kernel image on power4/G5 - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-power4-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: powerpc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-powerpc64
|
||||
Description: linux kernel 2.6 image on SMP power4/G5 - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-s390
|
||||
Architecture: s390
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-s390
|
||||
Description: Linux kernel 2.6 image on IBM S/390 machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-s390x
|
||||
Architecture: s390
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-s390x
|
||||
Description: Linux kernel 2.6 image on IBM zSeries machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-sparc64
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: sparc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-sparc64
|
||||
Description: Linux kernel 2.6 image on uniprocessor 64-bit UltraSPARC class machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
Package: kernel-image-2.6-sparc64-smp
|
||||
X-Version-Overwrite-Epoch: 1
|
||||
Architecture: sparc
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-2.6-sparc64-smp
|
||||
Description: Linux kernel 2.6 image on multi-processor 64-bit UltraSPARC class machines - transition package
|
||||
This package is for transition only.
|
||||
|
||||
|
||||
|
|
@ -3,7 +3,7 @@ Section: devel
|
|||
Priority: optional
|
||||
Provides: linux-headers-@major@-all, linux-headers-@version@-all
|
||||
Depends: linux-headers-@upstreamversion@@abiname@-all-${kernel:Arch} (= ${Source-Version})
|
||||
Description: All header files for Linux kernel @version@
|
||||
Description: All header files for Linux @version@
|
||||
This package depends against all architecture-specific kernel header files
|
||||
for Linux kernel version @upstreamversion@, generally used for building out-of-tree
|
||||
kernel modules.
|
||||
|
|
@ -12,7 +12,7 @@ Package: linux-headers-@upstreamversion@@abiname@-all-@arch@
|
|||
Section: devel
|
||||
Priority: optional
|
||||
Provides: linux-headers-@major@-all-@arch@, linux-headers-@version@-all-@arch@
|
||||
Description: All header files for Linux kernel @version@
|
||||
Description: All header files for Linux @version@
|
||||
This package depends against all architecture-specific kernel header files
|
||||
for Linux kernel version @upstreamversion@, generally used for building out-of-tree
|
||||
kernel modules.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Section: devel
|
|||
Priority: optional
|
||||
Depends: linux-headers-@upstreamversion@@abiname@@localversion_headers@ (= ${Source-Version}), linux-kbuild-@version@
|
||||
Provides: linux-headers, linux-headers-@major@
|
||||
Description: Header files for Linux kernel @upstreamversion@ on @class@ machines
|
||||
Description: Header files for Linux @upstreamversion@ on @class@
|
||||
This package provides the architecture-specific kernel header files
|
||||
for Linux kernel @upstreamversion@ on @longclass@ machines, generally
|
||||
used for building out-of-tree kernel modules. These files are going to be
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
Package: linux-headers-@major@@localversion@
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Depends: linux-headers-@upstreamversion@@abiname@@localversion@ (= ${Source-Version})
|
||||
Provides: linux-headers, linux-headers-@major@
|
||||
Description: Header files for Linux kernel @major@ on @class@ machines
|
||||
This package depends on the architecture-specific header files for the latest
|
||||
Linux kernel @major@ on @longclass@ machines.
|
||||
|
||||
|
|
@ -2,7 +2,7 @@ Package: linux-headers-@upstreamversion@@abiname@@localversion_headers@
|
|||
Section: devel
|
||||
Priority: optional
|
||||
Provides: linux-headers, linux-headers-@major@
|
||||
Description: Common header files for Linux kernel @upstreamversion@
|
||||
Description: Common header files for Linux @upstreamversion@
|
||||
This package provides the (sub)architecture-specific common kernel header files
|
||||
for Linux kernel version @upstreamversion@, generally used for building out-of-tree
|
||||
kernel modules. To obtain a complete set of headers you also need to install
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
Package: linux-image@localversion@
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Depends: linux-image-@major@@localversion@ (= ${Source-Version})
|
||||
Description: Linux kernel image on @class@ machines
|
||||
This package depends on the latest binary image for Linux kernel on
|
||||
@longclass@ machines.
|
||||
|
||||
Package: linux-image-@major@@localversion@
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${Source-Version})
|
||||
Description: Linux kernel @major@ image on @class@ machines
|
||||
This package depends on the latest binary image for Linux kernel @major@
|
||||
on @longclass@ machines.
|
||||
|
|
@ -4,7 +4,7 @@ Priority: optional
|
|||
Provides: linux-image, linux-image-@major@
|
||||
Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${Source-Version})
|
||||
Suggests: linux-doc-@version@ | linux-source-@version@
|
||||
Description: Linux kernel @upstreamversion@ image on @class@ machines
|
||||
Description: Linux @upstreamversion@ image on @class@
|
||||
This package provides the binary image for
|
||||
Linux kernel @upstreamversion@ on @longclass@ machines.
|
||||
|
||||
|
|
@ -12,6 +12,6 @@ Package: linux-modules-@upstreamversion@@abiname@@localversion@
|
|||
Section: admin
|
||||
Priority: optional
|
||||
Depends: module-init-tools (>= 0.9.13)
|
||||
Description: Linux kernel modules @upstreamversion@ image on @class@ machines
|
||||
Description: Linux @upstreamversion@ modules on @class@
|
||||
This package provides pre-built loadable modules for
|
||||
Linux kernel @version@ on @longclass@ machines.
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
Package: linux-image-@upstreamversion@@abiname@@localversion@
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Provides: linux-image, linux-image-@major@
|
||||
Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
|
||||
Depends: module-init-tools (>= 0.9.13)
|
||||
Suggests: linux-doc-@version@ | linux-source-@version@
|
||||
Description: Linux kernel @upstreamversion@ image on @class@ machines
|
||||
Description: Linux @upstreamversion@ image on @class@
|
||||
This package provides the binary image and pre-built loadable modules for
|
||||
Linux kernel @upstreamversion@ on @longclass@ machines.
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ Section: admin
|
|||
Priority: optional
|
||||
Provides: linux-image, linux-image-@major@
|
||||
Suggests: linux-doc-@version@ | linux-source-@version@
|
||||
Description: Linux kernel @upstreamversion@ image on @class@ machines
|
||||
Description: Linux @upstreamversion@ image on @class@
|
||||
This package provides the binary image for
|
||||
Linux kernel @upstreamversion@ on @longclass@ machines.
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ Architecture: all
|
|||
Section: devel
|
||||
Priority: optional
|
||||
Depends: python2.4-minimal
|
||||
Description: Support files for Linux kernel @upstreamversion@
|
||||
Description: Support files for Linux @upstreamversion@
|
||||
This package provides support files for the Linux kernel build.
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
Package: xen-linux-system-@upstreamversion@@abiname@@localversion@
|
||||
Section: admin
|
||||
Priority: extra
|
||||
Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${Source-Version})
|
||||
Description: XEN system with Linux @upstreamversion@ image on @class@
|
||||
This package depends on the binary Linux image and the correct hypervisor.
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
if [ "$2" ]; then
|
||||
update-initramfs -u -k @upstreamversion@@abiname@@localversion@
|
||||
else
|
||||
update-initramfs -c -k @upstreamversion@@abiname@@localversion@
|
||||
command -v update-grub > /dev/null && update-grub
|
||||
fi
|
||||
;;
|
||||
|
||||
abort-upgrade|abort-remove|abort-deconfigure)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postinst called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
remove)
|
||||
command -v update-grub > /dev/null && update-grub
|
||||
;;
|
||||
|
||||
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
remove)
|
||||
update-initramfs -d -k @upstreamversion@@abiname@@localversion@ || true
|
||||
;;
|
||||
|
||||
upgrade|deconfigure|failed-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "prerm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
||||
|
||||
|
|
@ -37,11 +37,6 @@ class series(list):
|
|||
break
|
||||
else:
|
||||
raise RuntimeError, "Can't find patch %s for series %s" % (patchfile, name)
|
||||
elif operation in ('X',):
|
||||
backup = patch + ".bak"
|
||||
if not os.path.exists(patch) and not os.path.exists(backup):
|
||||
raise RuntimeError, "Can't find neither original nor backup file %s for series %s" % (patch, name)
|
||||
patchinfo = patch, backup
|
||||
else:
|
||||
raise RuntimeError, 'Undefined operation "%s" in series %s' % (operation, name)
|
||||
|
||||
|
|
@ -61,11 +56,6 @@ class series(list):
|
|||
self.patch_deapply(patch, patchinfo)
|
||||
elif operation == '-':
|
||||
self.patch_apply(patch, patchinfo)
|
||||
elif operation == 'X':
|
||||
os.rename(patchinfo[1], patchinfo[0])
|
||||
print """\
|
||||
(X) RESTORED %s\
|
||||
""" % patch
|
||||
print "--> %s fully unapplied." % self.name
|
||||
|
||||
else:
|
||||
|
|
@ -78,11 +68,6 @@ class series(list):
|
|||
self.patch_apply(patch, patchinfo)
|
||||
elif operation == '-':
|
||||
self.patch_deapply(patch, patchinfo)
|
||||
elif operation == 'X':
|
||||
os.rename(patchinfo[0], patchinfo[1])
|
||||
print """\
|
||||
(X) REMOVED %s\
|
||||
""" % patch
|
||||
print "--> %s fully applied." % self.name
|
||||
|
||||
def patch_apply(self, patch, patchinfo):
|
||||
|
|
@ -334,9 +319,12 @@ def main():
|
|||
return
|
||||
|
||||
current_index = revisions.index(current.revision)
|
||||
source_index = revisions.index(source.revision)
|
||||
target_index = revisions.index(target.revision)
|
||||
|
||||
if current_extra:
|
||||
if current_index != source_index:
|
||||
raise RuntimeError, "Can't patch from %s with options %s" % (current, ' '.join(current_extra))
|
||||
consider = revisions[current_index:0:-1]
|
||||
s = series_extra.read_all(consider, home, current_extra, reverse = True)
|
||||
vfile.begin()
|
||||
Loading…
Reference in New Issue