[kernel] r13638 - in dists/trunk/linux-2.6: . debian debian/config/ia64 debian/config/m68k debian/config/sparc debian/patches/bugfix/all debian/patches/bugfix/arm debian/patches/bugfix/m68k/2.6.27 debian/patches/bugfix/sparc debian/patches/series debian/templates debian/templates/temp.image.plain
Bastian Blank
waldi at alioth.debian.org
Wed May 20 08:41:37 UTC 2009
Author: waldi
Date: Wed May 20 08:41:35 2009
New Revision: 13638
Log:
Merge /dists/sid/linux-2.6.
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/all/mvsdio-ignore-high-speed.patch
- copied unchanged from r13627, dists/sid/linux-2.6/debian/patches/bugfix/all/mvsdio-ignore-high-speed.patch
dists/trunk/linux-2.6/debian/patches/bugfix/arm/sata_mv_increase_timeout.patch
- copied, changed from r13627, dists/sid/linux-2.6/debian/patches/bugfix/arm/sata_mv_increase_timeout.patch
dists/trunk/linux-2.6/debian/patches/bugfix/sparc/arch-zimage-target.patch
- copied unchanged from r13627, dists/sid/linux-2.6/debian/patches/bugfix/sparc/arch-zimage-target.patch
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/m68k/2.6.27/
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/ia64/config
dists/trunk/linux-2.6/debian/config/m68k/config.atari
dists/trunk/linux-2.6/debian/config/sparc/config
dists/trunk/linux-2.6/debian/patches/series/base
dists/trunk/linux-2.6/debian/rules.real
dists/trunk/linux-2.6/debian/templates/patch.apply.in
dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Tue May 19 19:09:56 2009 (r13637)
+++ dists/trunk/linux-2.6/debian/changelog Wed May 20 08:41:35 2009 (r13638)
@@ -47,6 +47,240 @@
-- maximilian attems <maks at debian.org> Mon, 30 Mar 2009 14:40:26 +0200
+linux-2.6 (2.6.29-5) unstable; urgency=low
+
+ [ dann frazier ]
+ * [ia64] Backport rtc-efi driver from mainline
+
+ [ maximilian attems ]
+ * qla1280: Fix off-by-some error in firmware loading. (closes: #527265)
+
+ [ Martin Michlmayr ]
+ * Broadcom SB: fix locking in set_irq_affinity.
+ * mmc: load mvsdio automatically when it's a platform device.
+ * mmc: mvsdio: ignore high speed timing requests from the core
+ * USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug.
+
+ [ Bastian Blank ]
+ * Add stable release 2.6.29.3:
+ - ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling
+ - tracing: x86, mmiotrace: fix range test
+ - sched: account system time properly
+ - rndis_wlan: fix initialization order for workqueue&workers
+ - mm: fix Committed_AS underflow on large NR_CPUS environment
+ - Ignore madvise(MADV_WILLNEED) for hugetlbfs-backed regions
+ - clockevents: prevent endless loop in tick_handle_periodic()
+ - intel-iommu: Avoid panic() for DRHD at address zero.
+ - intel-iommu: Fix oops in device_to_iommu() when devices not found.
+ - intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges.
+ - cs5536: define dma_sff_read_status() method
+ - proc: avoid information leaks to non-privileged processes
+ - ath5k: fix buffer overrun in rate debug code
+ - mv643xx_eth: OOM handling fixes
+ - mv643xx_eth: 64bit mib counter read fix
+ - check_unsafe_exec: s/lock_task_sighand/rcu_read_lock/
+ - do_execve() must not clear fs->in_exec if it was set by another thread
+ - check_unsafe_exec() doesn't care about signal handlers sharing
+ - New locking/refcounting for fs_struct
+ - Take fs_struct handling to new file (fs/fs_struct.c)
+ - Get rid of bumping fs_struct refcount in pivot_root(2)
+ - Kill unsharing fs_struct in __set_personality()
+ - Annotate struct fs_struct's usage count restriction
+ - fix setuid sometimes wouldn't
+ - fix setuid sometimes doesn't
+ - compat_do_execve should unshare_files
+ - powerpc: Sanitize stack pointer in signal handling code
+ - ACPI: Revert conflicting workaround for BIOS w/ mangled PRT entries
+ - USB: serial: fix lifetime and locking problems
+ - ptrace: ptrace_attach: fix the usage of ->cred_exec_mutex
+ - kbuild: fix Module.markers permission error under cygwin
+ - pagemap: require aligned-length, non-null reads of /proc/pid/pagemap
+ - drm/i915: allow tiled front buffers on 965+
+ - bio: fix memcpy corruption in bio_copy_user_iov()
+ - PCI quirk: disable MSI on VIA VT3364 chipsets
+ - ASoC: Fix offset of freqmode in WM8580 PLL configuration
+ - x86/PCI: don't call e820_all_mapped with -1 in the mmconfig case
+ - x86-64: fix FPU corruption with signals and preemption
+ - drm/i915: add support for G41 chipset
+ - unreached code in selinux_ip_postroute_iptables_compat() (CVE-2009-1184)
+ - PCI: fix incorrect mask of PM No_Soft_Reset bit
+ - exit_notify: kill the wrong capable(CAP_KILL) check (CVE-2009-1337)
+ - crypto: ixp4xx - Fix handling of chained sg buffers
+ - block: include empty disks in /proc/diskstats
+ - b44: Use kernel DMA addresses for the kernel DMA API
+ - virtio-rng: Remove false BUG for spurious callbacks
+ - USB: Unusual Device support for Gold MP3 Player Energy
+ - KVM: x86: release time_page on vcpu destruction
+ - KVM: Fix overlapping check for memory slots
+ - KVM: MMU: disable global page optimization
+ - KVM: MMU: Fix off-by-one calculating large page count
+ - mac80211: fix basic rate bitmap calculation
+ - ALSA: us122l: add snd_us122l_free()
+ - thinkpad-acpi: fix LED blinking through timer trigger
+ - b43: Refresh RX poison on buffer recycling
+ - b43: Poison RX buffers
+ - mac80211: Fix bug in getting rx status for frames pending in reorder
+ buffer
+ - forcedeth: Fix resume from hibernation regression.
+ * Ignore ABI change.
+
+ [ Jurij Smakov ]
+ * [sparc] Fix build
+
+ -- Bastian Blank <waldi at debian.org> Sun, 17 May 2009 12:45:13 +0200
+
+linux-2.6 (2.6.29-4) unstable; urgency=low
+
+ [ maximilian attems ]
+ * drm/i915: allow tiled front buffers on 965+.
+
+ [ Martin Michlmayr ]
+ * Extend erase timeout in M25P80 SPI Flash driver (Peter Horton).
+ * Add driver for GMT G760A fan speed PWM controller chip.
+ * [arm/orion5x] Enable SENSORS_G760A.
+ * Add patches from git.marvell.com:
+ - allow for alternative __copy_to_user/__clear_user implementations
+ - alternative copy_to_user/clear_user implementation copy_user
+ * [arm/orion5x, armel/kirkwood] Enable UACCESS_WITH_MEMCPY.
+ * [MMC] give Sandisk/Kingston SDHC cards some slack before the SWITCH
+ command.
+
+ [ dann frazier ]
+ * [parisc] Fix macro expansion in atomic.h fixing PHONET compilation issue
+ * [parisc] reenable PHONET
+ * Btrfs: fix __ucmpdi2 compile bug on 32 bit builds
+
+ [ Stephen R. Marenka ]
+ * [m68k] Add 2.6.29 patches.
+ * [m68k] Enable RTC for aranym (2.6.29 solution).
+
+ [ Bastian Blank ]
+ * Add stable release 2.6.29.2:
+ - Bonding: fix zero address hole bug in arp_ip_target list
+ - skge: fix occasional BUG during MTU change
+ - scsi: mpt: suppress debugobjects warning
+ - hugetlbfs: return negative error code for bad mount option
+ - NFS: Fix the XDR iovec calculation in nfs3_xdr_setaclargs
+ - gso: Fix support for linear packets
+ - agp: zero pages before sending to userspace
+ - virtio: fix suspend when using virtio_balloon
+ - Revert "console ASCII glyph 1:1 mapping"
+ - Input: gameport - fix attach driver code
+ - x86, PAT: Remove page granularity tracking for vm_insert_pfn maps
+ - KVM: is_long_mode() should check for EFER.LMA
+ - KVM: VMX: Update necessary state when guest enters long mode
+ - KVM: fix kvm_vm_ioctl_deassign_device
+ - KVM: MMU: handle compound pages in kvm_is_mmio_pfn
+ - KVM: Reset PIT irq injection logic when the PIT IRQ is unmasked
+ - KVM: Interrupt mask notifiers for ioapic
+ - KVM: Add CONFIG_HAVE_KVM_IRQCHIP
+ - KVM: Fix missing smp tlb flush in invlpg
+ - USB: usb-storage: augment unusual_devs entry for Simple Tech/Datafab
+ - USB: fix oops in cdc-wdm in case of malformed descriptors
+ - USB: ftdi_sio: add vendor/project id for JETI specbos 1201 spectrometer
+ - usb gadget: fix ethernet link reports to ethtool
+ - x86: disable X86_PTRACE_BTS for now
+ - SCSI: sg: fix q->queue_lock on scsi_error_handler path
+ - SCSI: sg: avoid blk_put_request/blk_rq_unmap_user in interrupt
+ - SCSI: sg: fix races with ioctl(SG_IO)
+ - SCSI: sg: fix races during device removal
+ - mm: pass correct mm when growing stack
+ - pata_hpt37x: fix HPT370 DMA timeouts
+ - hpt366: fix HPT370 DMA timeouts
+ - powerpc: Fix data-corrupting bug in __futex_atomic_op
+ - ALSA: hda - Fix the cmd cache keys for amp verbs
+ - sfc: Match calls to netif_napi_add() and netif_napi_del()
+ - tty: Fix leak in ti-usb
+ - spi: spi_write_then_read() bugfixes
+ - add some long-missing capabilities to fs_mask
+ - hrtimer: fix rq->lock inversion (again)
+ - x86: fix broken irq migration logic while cleaning up multiple vectors
+ - sched: do not count frozen tasks toward load
+ - dm kcopyd: fix callback race
+ - dm kcopyd: prepare for callback race fix
+ - posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)
+ - posix-timers: fix RLIMIT_CPU && fork()
+ - posixtimers, sched: Fix posix clock monotonicity
+ - cap_prctl: don't set error to 0 at 'no_change'
+ - SCSI: libiscsi: fix iscsi pool error path
+ - SCSI: libiscsi: fix iscsi pool error path
+ - sparc64: Fix bug in ("sparc64: Flush TLB before releasing pages.")
+ - ALSA: hda - add missing comma in ad1884_slave_vols
+ - splice: fix deadlock in splicing to file
+ - netfilter: {ip, ip6, arp}_tables: fix incorrect loop detection
+ - kprobes: Fix locking imbalance in kretprobes
+ - acer-wmi: Blacklist Acer Aspire One
+ - crypto: shash - Fix unaligned calculation with short length
+ - net/netrom: Fix socket locking
+ - af_rose/x25: Sanity check the maximum user frame size
+ - dm table: fix upgrade mode race
+ - dm: path selector use module refcount directly
+ - dm target: use module refcount directly
+ - dm snapshot: avoid having two exceptions for the same chunk
+ - dm snapshot: avoid dropping lock in __find_pending_exception
+ - dm snapshot: refactor __find_pending_exception
+ - dm io: make sync_io uninterruptible
+ - dm raid1: switch read_record from kmalloc to slab to save memory
+ - vfs: skip I_CLEAR state inodes
+ - dm: preserve bi_io_vec when resubmitting bios
+ - ixgbe: Fix potential memory leak/driver panic issue while setting up Tx &
+ Rx ring parameters
+ - mm: do_xip_mapping_read: fix length calculation
+ - mm: define a UNIQUE value for AS_UNEVICTABLE flag
+ - sysctl: fix suid_dumpable and lease-break-time sysctls
+ - cpumask: fix slab corruption caused by alloc_cpumask_var_node()
+ - ide-atapi: start DMA after issuing a packet command
+ - ide: drivers/ide/ide-atapi.c needs <linux/scatterlist.h>
+ - V4L/DVB (10943): cx88: Prevent general protection fault on rmmod
+ - r8169: Reset IntrStatus after chip reset
+ - md/raid1 - don't assume newly allocated bvecs are initialised.
+ - SCSI: sg: fix iovec bugs introduced by the block layer conversion
+ - drm/i915: fix TV mode setting in property change
+ - drm/i915: only set TV mode when any property changed
+ - drm: Use pgprot_writecombine in GEM GTT mapping to get the right bits for
+ !PAT.
+ - drm/i915: check for -EINVAL from vm_insert_pfn
+ - drm/i915: Check for dev->primary->master before dereference.
+ - drm/i915: Sync crt hotplug detection with intel video driver
+ - drm/i915: Read the right SDVO register when detecting SVDO/HDMI.
+ - drm/i915: Change DCC tiling detection case to cover only mobile parts.
+ - dock: fix dereference after kfree()
+ - ACPI: cap off P-state transition latency from buggy BIOSes
+ - x86, setup: mark %esi as clobbered in E820 BIOS call
+ - tracing/core: fix early free of cpumasks
+ - rt2x00: Fix SLAB corruption during rmmod
+ - ext4: fix locking typo in mballoc which could cause soft lockup hangs
+ - ext4: fix typo which causes a memory leak on error path
+ - MIPS: Compat: Zero upper 32-bit of offset_high and offset_low.
+ - PCI/x86: detect host bridge config space size w/o using quirks
+ - ide: Fix code dealing with sleeping devices in do_ide_request()
+ - fbdev: fix info->lock deadlock in fbcon_event_notify()
+ - fbmem: fix fb_info->lock and mm->mmap_sem circular locking dependency
+ - security/smack: fix oops when setting a size 0 SMACK64 xattr
+ * Bump ABI to 2.
+ * [sparc] Make the kernels again 64bit. (closes: #525926)
+
+ -- Bastian Blank <waldi at debian.org> Sun, 03 May 2009 09:38:42 +0200
+
+linux-2.6 (2.6.29-3) unstable; urgency=low
+
+ [ maximilian attems ]
+ * [powerpc] Pipe mkimage postinst call to stderr for debconf.
+ Thanks Jordi Mallach <jordi at debian.org> for the patch. (closes: #518231)
+ * [parisc] Disable PHONET.
+ * [sparc] Disable BTRFS.
+
+ [ Bastian Blank ]
+ * [alpha] Fix location of kernel image.
+ * Add source link to headers packages. (closes: #523726)
+
+ [ Martin Michlmayr ]
+ * Add some sata_mv fixes for Kirkwood from Marvell:
+ - use new sata phy register settings for new devices
+ - increate the IORDY timeout for the soc controllers
+
+ -- maximilian attems <maks at debian.org> Fri, 17 Apr 2009 10:36:03 +0200
+
linux-2.6 (2.6.29-2) unstable; urgency=low
[ Martin Michlmayr ]
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config Tue May 19 19:09:56 2009 (r13637)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Wed May 20 08:41:35 2009 (r13638)
@@ -91,7 +91,6 @@
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
-CONFIG_EFI_RTC=y
CONFIG_DTLK=m
CONFIG_APPLICOM=m
CONFIG_RAW_DRIVER=m
@@ -594,6 +593,11 @@
CONFIG_I82092=m
##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_EFI=y
+
+##
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI_ARCMSR=m
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari Tue May 19 19:09:56 2009 (r13637)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari Wed May 20 08:41:35 2009 (r13638)
@@ -224,3 +224,7 @@
CONFIG_NFCON=y
CONFIG_NFETH=y
+# RTC for 2.6.29
+CONFIG_RTC_CLASS=n
+CONFIG_GEN_RTC=m
+CONFIG_RTC=m
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config Tue May 19 19:09:56 2009 (r13637)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Wed May 20 08:41:35 2009 (r13638)
@@ -1,6 +1,7 @@
##
## file: arch/sparc/Kconfig
##
+CONFIG_64BIT=y
CONFIG_SECCOMP=y
CONFIG_SUN_LDOMS=y
CONFIG_PCI=y
Copied: dists/trunk/linux-2.6/debian/patches/bugfix/all/mvsdio-ignore-high-speed.patch (from r13627, dists/sid/linux-2.6/debian/patches/bugfix/all/mvsdio-ignore-high-speed.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/mvsdio-ignore-high-speed.patch Wed May 20 08:41:35 2009 (r13638, copy of r13627, dists/sid/linux-2.6/debian/patches/bugfix/all/mvsdio-ignore-high-speed.patch)
@@ -0,0 +1,40 @@
+From: Nicolas Pitre <nico at cam.org>
+Date: Fri, 15 May 2009 00:59:47 +0000 (-0400)
+Subject: [MMC] mvsdio: ignore high speed timing requests from the core
+X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=9154da39b1da931b60ff380d3172d797ccaed71e
+
+[MMC] mvsdio: ignore high speed timing requests from the core
+
+Empirical evidences show that this is causing far more problems than it
+solves when this mode is enabled in the host hardware. Amongst those
+cards that are known to be non functional when this bit is set are:
+
+ A-Data "Speedy" 2GB SD card
+ Kodak 512MB SD card
+ Ativa 1GB MicroSD card
+ Marvell 8688 (WIFI/Bluetooth) SDIO card
+
+Signed-off-by: Nicolas Pitre <nico at marvell.com>
+
+
+--- a/drivers/mmc/host/mvsdio.c~ 2009-05-16 08:48:15.000000000 +0000
++++ b/drivers/mmc/host/mvsdio.c 2009-05-16 08:48:17.000000000 +0000
+@@ -617,9 +617,18 @@
+ if (ios->bus_width == MMC_BUS_WIDTH_4)
+ ctrl_reg |= MVSD_HOST_CTRL_DATA_WIDTH_4_BITS;
+
++ /*
++ * The HI_SPEED_EN bit is causing trouble with many (but not all)
++ * high speed SD, SDHC and SDIO cards. Not enabling that bit
++ * makes all cards work. So let's just ignore that bit for now
++ * and revisit this issue if problems for not enabling this bit
++ * are ever reported.
++ */
++#if 0
+ if (ios->timing == MMC_TIMING_MMC_HS ||
+ ios->timing == MMC_TIMING_SD_HS)
+ ctrl_reg |= MVSD_HOST_CTRL_HI_SPEED_EN;
++#endif
+
+ host->ctrl = ctrl_reg;
+ mvsd_write(MVSD_HOST_CTRL, ctrl_reg);
Copied and modified: dists/trunk/linux-2.6/debian/patches/bugfix/arm/sata_mv_increase_timeout.patch (from r13627, dists/sid/linux-2.6/debian/patches/bugfix/arm/sata_mv_increase_timeout.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/sata_mv_increase_timeout.patch Sun May 17 10:45:58 2009 (r13627, copy source)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/sata_mv_increase_timeout.patch Wed May 20 08:41:35 2009 (r13638)
@@ -14,8 +14,8 @@
ZERO(0x024); /* respq outp */
ZERO(0x020); /* respq inp */
ZERO(0x02c); /* test control */
-- writel(0xbc, port_mmio + EDMA_IORDY_TMOUT_OFS);
-+ writel(0x800, port_mmio + EDMA_IORDY_TMOUT_OFS);
+- writel(0xbc, port_mmio + EDMA_IORDY_TMOUT);
++ writel(0x800, port_mmio + EDMA_IORDY_TMOUT);
}
#undef ZERO
Copied: dists/trunk/linux-2.6/debian/patches/bugfix/sparc/arch-zimage-target.patch (from r13627, dists/sid/linux-2.6/debian/patches/bugfix/sparc/arch-zimage-target.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/sparc/arch-zimage-target.patch Wed May 20 08:41:35 2009 (r13638, copy of r13627, dists/sid/linux-2.6/debian/patches/bugfix/sparc/arch-zimage-target.patch)
@@ -0,0 +1,25 @@
+diff -urpN linux-source-2.6.29.orig/arch/sparc/boot/Makefile linux-source-2.6.29/arch/sparc/boot/Makefile
+--- linux-source-2.6.29.orig/arch/sparc/boot/Makefile 2009-03-23 17:12:14.000000000 -0600
++++ linux-source-2.6.29/arch/sparc/boot/Makefile 2009-05-15 16:14:09.000000000 -0600
+@@ -79,6 +79,9 @@ $(obj)/image: vmlinux FORCE
+ $(call if_changed,strip)
+ @echo ' kernel: $@ is ready'
+
++$(obj)/zImage: $(obj)/image
++ $(call if_changed,gzip)
++
+ $(obj)/tftpboot.img: vmlinux $(obj)/piggyback_64 System.map $(ROOT_IMG) FORCE
+ $(call if_changed,elftoaout)
+ $(call if_changed,piggy)
+diff -urpN linux-source-2.6.29.orig/arch/sparc/Makefile linux-source-2.6.29/arch/sparc/Makefile
+--- linux-source-2.6.29.orig/arch/sparc/Makefile 2009-03-23 17:12:14.000000000 -0600
++++ linux-source-2.6.29/arch/sparc/Makefile 2009-05-15 16:14:44.000000000 -0600
+@@ -91,6 +91,8 @@ endif
+
+ boot := arch/sparc/boot
+
++all: zImage
++
+ image zImage tftpboot.img vmlinux.aout: vmlinux
+ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
+
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Tue May 19 19:09:56 2009 (r13637)
+++ dists/trunk/linux-2.6/debian/patches/series/base Wed May 20 08:41:35 2009 (r13638)
@@ -30,3 +30,6 @@
+ bugfix/all/mvsdio-platform.patch
+ bugfix/all/mmc-sd-udelay-switch.patch
+ features/arm/kirkwood-cpu-idle.patch
++ bugfix/arm/sata_mv_increase_timeout.patch
++ bugfix/sparc/arch-zimage-target.patch
++ bugfix/all/mvsdio-ignore-high-speed.patch
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real Tue May 19 19:09:56 2009 (r13637)
+++ dists/trunk/linux-2.6/debian/rules.real Wed May 20 08:41:35 2009 (r13638)
@@ -256,6 +256,7 @@
mkdir -p $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)
ln -s /usr/src/$(PACKAGE_NAME) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/build
+ ln -s /usr/src/$(PACKAGE_NAME_COMMON) $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/source
+$(MAKE_SELF) install-base
@@ -331,7 +332,9 @@
install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/bzImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-install-image_alpha_$(FEATURESET)_$(FLAVOUR)_plain_image \
+install-image_alpha_$(FEATURESET)_$(FLAVOUR)_plain_image:
+ install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+
install-image_ia64_$(FEATURESET)_$(FLAVOUR)_plain_image \
install-image_m68k_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
Modified: dists/trunk/linux-2.6/debian/templates/patch.apply.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/patch.apply.in Tue May 19 19:09:56 2009 (r13637)
+++ dists/trunk/linux-2.6/debian/templates/patch.apply.in Wed May 20 08:41:35 2009 (r13638)
@@ -30,6 +30,8 @@
match_arch.append(i[5:])
elif i.startswith("featureset="):
match_featureset.append(i[11:])
+ else:
+ raise RuntimeError('Ignored unknown modifier: %s' % i)
ret_arch = ret_featureset = False
Modified: dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst Tue May 19 19:09:56 2009 (r13637)
+++ dists/trunk/linux-2.6/debian/templates/temp.image.plain/postinst Wed May 20 08:41:35 2009 (r13638)
@@ -983,7 +983,7 @@
my $initrd_path = $realimageloc . "initrd.img-$version";
my $ret = system("$ramdisk_cmd " .
($mkimage ? "-m '$mkimage' " : "") .
- "-c -t -k $version");
+ "-c -t -k $version >&2");
if ($ret) {
warn "$ramdisk_cmd failed to create initrd image.\n";
} else {
More information about the Kernel-svn-changes
mailing list