diff --git a/debian/changelog b/debian/changelog index 1350b08d1..b7871ae10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -124,6 +124,241 @@ linux (3.15~rc5-1~exp1) experimental; urgency=medium -- maximilian attems Fri, 16 May 2014 14:33:57 +0200 +linux (3.14.13-1) unstable; urgency=medium + + * New upstream stable update: + https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.14.13 + - iio: ti_am335x_adc: Fix: Use same step id at FIFOs both ends + (regression in 3.11) + - [hppa] Do not hardcode maximum userspace stack size (regression in 3.14) + - workqueue: fix dev_set_uevent_suppress() imbalance (regression in 3.10) + - workqueue: zero cpumask of wq_numa_possible_cpumask on init + (regression in 3.10) + - i8k: Fix non-SMP operation (regression in 3.14) + - Revert "ACPI / AC: Remove AC's proc directory." (regression in 3.13) + - ACPI / resources: only reject zero length resources based at address zero + (regression in 3.14) + - ACPI / EC: Avoid race condition related to advance_transaction() + - ACPI / EC: Fix race condition in ec_transaction_completed() + - [x86] crypto: sha512_ssse3 - fix byte count to bit count conversion + - [arm64] implement TASK_SIZE_OF + - phy: core: Fix error path in phy_create() + - dm io: fix a race condition in the wake up code for sync_io + - [x86] intel_pstate: Fix setting VID (regression in 3.14.6) + - PCI: Fix unaligned access in AF transaction pending test + (regression in 3.14) + - ext4: fix unjournalled bg descriptor while initializing inode bitmap + - ext4: fix a potential deadlock in __ext4_es_shrink() + - drm/radeon: stop poisoning the GART TLB + - [x86] drm/i915: Don't clobber the GTT when it's within stolen memory + + [ Ian Campbell ] + * [armel] Remove drivers/net/phy configs which are redundant with toplevel. + * [armhf] Add MMC and NIC modules for BeagleBone Black to udebs. + (Closes: #754491) + * [arm64] Add xfs-modules udeb and add xen-netfront to nic-modules udeb. + * aufs: Fix build on arm64. + + [ Aurelien Jarno ] + * [mips,mipsel] Add a debconf note to warn users that they have to + configure the system bootloader to load initramfs. + * Update Polish debconf template translations (Łukasz Dulny). + * Update Czech debconf template translations (Michal Simunek) (Closes: + #755060). + * Update Russian debconf template translations (Yuri Kozlov) (Closes: + #755085). + * Update Portuguese debconf template translations (Américo Monteiro) + (Closes: #755100). + * Update Swedish debconf template translations (Martin Bagge) (Closes: + #755145). + * Update Slovak debconf template translation (Slavko) (Closes: #755152). + * Update Turkish debconf template translation (Mert Dirik) (Closes: + #755223). + * Update Danish debconf template translation (Joe Dalton) (Closes: + #755400). + * [mips,mipsel] Cleanup configuration files. + * [mips,mipsel] Move common MIPS kernel config files to kernelarch-mips. + * [mips,mipsel] Clean mipsel installer by using symlinks to the mips + versions. + * [mipsel] Backport Loongson 3A/3B support from 3.15 and add the + corresponding flavour. + * [mips,mipsel] Remove the sb1a-bcm91480b flavour. + * [mips,mipsel] Add mips64 and mips64el support (Closes: #749688). + * [mips/octeon] Backport from upstream PCIe2 support and interface + mode detection for Octeon. + * [mips/sb1-91250a] Backport from upstream additional build flags + to fix excessive kernel warnings. + * [mips/malta] Backport from upstream power management support for + Malta. + * [mipsel/loongson3] Add support for Loongson 3 LS3A RS780E 1-way + boards. + + [ Ben Hutchings ] + * net/l2tp: don't fall back on UDP [get|set]sockopt (CVE-2014-4943) + * Bump ABI to 2 (Closes: #754902) + * [powerpc/powerpc64] Re-enable JUMP_LABEL + * [powerpc/powerpc64,ppc64] Enable PPC_TRANSACTIONAL_MEM + * Enable DYNAMIC_DEBUG (except for armel/orion5x) (Closes: #694884) + * [rt] Update to 3.14.12-rt9 (no functional changes) + * udeb: Add sdhci-acpi to mmc-modules (Closes: #747284) + + -- Ben Hutchings Mon, 21 Jul 2014 14:02:14 +0100 + +linux (3.14.12-1) unstable; urgency=medium + + * New upstream stable update: + https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.14.11 + - iscsi-target: Avoid rejecting incorrect ITT for Data-Out + - iscsi-target: Explicily clear login response PDU in exception path + (regression in 3.10) + - iscsi-target: fix iscsit_del_np deadlock on unload (regression in 3.13) + - Input: synaptics - fix resolution for manually provided min/max + (regression in 3.14) + - [mips] MSC: Prevent out-of-bounds writes to MIPS SC ioremap'd region + - UBIFS: fix an mmap and fsync race condition + - UBIFS: Remove incorrect assertion in shrink_tnc() + - IB/ipath: Translate legacy diagpkt into newer extended diagpkt + - IB/srp: Fix a sporadic crash triggered by cable pulling + - IB/umad: Fix error handling + - IB/umad: Fix use-after-free on close + - nfsd4: fix FREE_STATEID lockowner leak (regression in 3.14.6) + - nfsd: getattr for FATTR4_WORD0_FILES_AVAIL needs the statfs buffer + - NFS: Don't declare inode uptodate unless all attributes were checked + - nfs: Fix cache_validity check in nfs_write_pageuptodate() + - [powerpc] mm: Check paca psize is up to date for huge mappings + - [powerpc] perf: Ensure all EBB register state is cleared on fork() + - xfs: xfs_readsb needs to check for magic numbers (regression in 3.14) + - reiserfs: call truncate_setsize under tailpack mutex + - ipvs: Fix panic due to non-linear skb + - tracing: Fix syscall_*regfunc() vs copy_process() race + - ALSA: usb-audio: Fix races at disconnection and PCM closing + https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.14.12 + - [powerpc] ibmvscsi: Abort init sequence during error recovery + - [powerpc] ibmvscsi: Add memory barriers for send / receive + - virtio-scsi: avoid cancelling uninitialized work items + - scsi_error: fix invalid setting of host byte + - virtio-scsi: fix various bad behavior on aborted requests + - xhci: Use correct SLOT ID when handling a reset device command + (regression in 3.13) + - usb: chipidea: udc: delete td from req's td list at ep_dequeue + - mtd: eLBC NAND: fix subpage write support (regression in 3.10) + - mtd: nand: omap: fix BCHx ecc.correct to return detected bit-flips in + erased-page + - [x86] drm/i915: Avoid div-by-zero when pixel_multiplier is zero + (regression in 3.13) + - [x86] drm/i915: set backlight duty cycle after backlight enable for gen4 + (regression in 3.14) + - Bluetooth: Fix SSP acceptor just-works confirmation without MITM + - Bluetooth: Fix check for connection encryption + - rbd: use reference counts for image requests + - rbd: handle parent_overlap on writes correctly + - mac80211: fix a memory leak on sta rate selection table + (regression in 3.10) + - hugetlb: fix copy_hugetlb_page_range() to handle migration/hwpoisoned + entry + - [arm64] mm: Make icache synchronisation logic huge page aware + - [arm64] Bug fix in stack alignment exception + - fs/cifs: fix regression in cifs_create_mf_symlink() (regression in 3.14) + - blkcg: fix use-after-free in __blkg_release_rcu() by making + blkcg_gq refcnt an atomic_t + - ext4: Fix buffer double free in ext4_alloc_branch() + - ext4: Fix hole punching for files with indirect blocks + - [x86] KVM: preserve the high 32-bits of the PAT register + - [x86] kvm: fix wrong address when writing Hyper-V tsc page + - nfsd: fix rare symlink decoding bug + - tracing: Remove ftrace_stop/start() from reading the trace file + - md: flush writes before starting a recovery. + - mlx4_core: Fix incorrect FLAGS1 bitmap test in mlx4_QUERY_FUNC_CAP + (regression in 3.14) + - netfilter: nf_nat: fix oops on netns removal + - brcmfmac: Fix brcmf_chip_ai_coredisable not applying reset bits to + BCMA_IOCTL (regression in 3.14) + - mmc: rtsx: add R1-no-CRC mmc command type handle (regression in 3.13) + - aio: block io_destroy() until all context requests are completed + (regression in 3.11) + - audit: remove superfluous new- prefix in AUDIT_LOGIN messages + (regression in 3.14) + - mm/numa: Remove BUG_ON() in __handle_mm_fault() (regression in 3.13) + - slab: fix oops when reading /proc/slab_allocators + - sym53c8xx_2: Set DID_REQUEUE return code when aborting squeue + - mm: fix crashes from mbind() merging vmas + + [ Ben Hutchings ] + * [rt] Update to 3.14.10-rt7: + - rtmutex: Resolve conflicts with changes in 3.14.10 + - sched: Do not clear PF_NO_SETAFFINITY flag in select_fallback_rq() + - workqueue: Prevent deadlock/stall on RT + * [rt] random: Restore interrupt randomness dropped in 3.14.10-rt6 + * [s390,s390x] Ignore ABI change in lowcore structure (fixes FTBFS) + * [m68k] block: Change IOSCHED_CFQ to built-in and make it the default + I/O scheduler, consistent with other architectures + + -- Ben Hutchings Fri, 11 Jul 2014 17:56:20 +0100 + +linux (3.14.10-1) unstable; urgency=high + + * New upstream stable update: + https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.14.10 + - [s390] af_iucv: wrong mapping of sent and confirmed skbs + - Staging: rtl8188eu: overflow in update_sta_support_rate() + - USB: option: fix runtime PM handling + - hugetlb: restrict hugepage_migration_support() to x86_64 + - kthread: fix return value of kthread_create() upon SIGKILL. + - mm/memory-failure.c-failure: send right signal code to correct thread + - mm/memory-failure.c: don't let collect_procs() skip over processes for + MF_ACTION_REQUIRED + - ptrace: fix fork event messages across pid namespaces + - idr: fix overflow bug during maximum ID calculation at maximum height + - [s390] time: cast tv_nsec to u64 prior to shift in update_vsyscall + (regression in 3.13) + - [s390] lowcore: reserve 96 bytes for IRB in lowcore + - ext4: fix data integrity sync in ordered mode + - ext4: fix zeroing of page during writeback + - ext4: fix wrong assert in ext4_mb_normalize_request() + - USB: usb_wwan: fix race between write and resume + - USB: usb_wwan: fix write and suspend race + - USB: usb_wwan: fix urb leak at shutdown + - USB: sierra: fix use after free at suspend/resume + - USB: sierra: fix remote wakeup + - USB: serial: fix potential runtime pm imbalance at device remove + - media: stk1160: Avoid stack-allocated buffer for control URBs + - rtmutex: Detect changes in the pi lock chain + - rtmutex: Handle deadlock detection smarter + - rtmutex: Plug slow unlock race + - media: uvcvideo: Fix clock param realtime setting + - media: saa7134: fix regression with tvtime (regression in 3.14) + - Bluetooth: Fix L2CAP deadlock + - Target/iser: Wait for proper cleanup before unloading + - target: Set CMD_T_ACTIVE bit for Task Management Requests + - target: Use complete_all for se_cmd->t_transport_stop_comp + - iscsi-target: Fix ABORT_TASK + connection reset iscsi_queue_req memory + leak + - target: Explicitly clear ramdisk_mcp backend pages + - [x86] x86-32, espfix: Remove filter for espfix32 due to race + - aio: fix aio request leak when events are reaped by userspace + - aio: fix kernel memory disclosure in io_getevents() introduced in v3.10 + (CVE-2014-0206) + - CIFS: Fix memory leaks in SMB2_open + - Btrfs: fix double free in find_lock_delalloc_range + - Btrfs: make sure there are not any read requests before stopping workers + - Btrfs: mark mapping with error flag to report errors to userspace + - Btrfs: set right total device count for seeding support + - fs: btrfs: volumes.c: Fix for possible null pointer dereference + - Btrfs: don't check nodes for extent items + - Btrfs: fix scrub_print_warning to handle skinny metadata extents + - btrfs: fix use of uninit "ret" in end_extent_writepage() + - btrfs: allocate raid type kobjects dynamically + - lz4: fix another possible overrun + - epoll: fix use-after-free in eventpoll_release_file + - builddeb: use $OBJCOPY variable instead of objcopy (regression in 3.12) + - [i386] efi-pstore: Fix an overflow on 32-bit builds + + [ Ben Hutchings ] + * [amd64] ptrace,x86: force IRET path after a ptrace_stop() (CVE-2014-4699) + * shmem: fix faulting into a hole while it's punched (CVE-2014-4171) + + -- Ben Hutchings Mon, 07 Jul 2014 09:54:10 +0100 + linux (3.14.9-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index 01c752096..ffb24dfdd 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -1,3 +1,7 @@ +[abi] +ignore-changes: + module:arch/x86/kvm/* + [base] featuresets: none diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced index d722c43ba..ab933d948 100644 --- a/debian/config/armel/config-reduced +++ b/debian/config/armel/config-reduced @@ -31,6 +31,11 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y ## # CONFIG_FTRACE is not set +## +## file: lib/Kconfig.debug +## +# CONFIG_DYNAMIC_DEBUG is not set + ## ## file: mm/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 0708096cd..1333e0465 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -461,16 +461,6 @@ CONFIG_IXP4XX_ETH=m ## # CONFIG_HIPPI is not set -## -## file: drivers/net/phy/Kconfig -## -CONFIG_PHYLIB=m -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m - ## ## file: drivers/net/wan/Kconfig ## diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index c183e2fec..ced6c0756 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -453,11 +453,6 @@ CONFIG_MVMDIO=m ## # CONFIG_VIA_VELOCITY is not set -## -## file: drivers/net/phy/Kconfig -## -CONFIG_MARVELL_PHY=m - ## ## file: drivers/net/wireless/mwifiex/Kconfig ## diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 305c5c797..b290c3307 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -407,11 +407,6 @@ CONFIG_MVMDIO=m ## # CONFIG_VIA_VELOCITY is not set -## -## file: drivers/net/phy/Kconfig -## -CONFIG_MARVELL_PHY=m - ## ## file: drivers/pcmcia/Kconfig ## diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index a4930f9a5..ea21209f1 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -305,21 +305,6 @@ CONFIG_VIA_RHINE=m ## # CONFIG_HIPPI is not set -## -## file: drivers/net/phy/Kconfig -## -CONFIG_PHYLIB=m -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m -CONFIG_ICPLUS_PHY=m -# CONFIG_MDIO_BITBANG is not set - ## ## file: drivers/pci/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 7a00727de..be7060bfa 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4921,7 +4921,7 @@ CONFIG_CORDIC=m CONFIG_PRINTK_TIME=y CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_BOOT_PRINTK_DELAY=y -# CONFIG_DYNAMIC_DEBUG is not set +CONFIG_DYNAMIC_DEBUG=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_INFO_REDUCED is not set CONFIG_ENABLE_WARN_DEPRECATED=y diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 1c14fd869..a0ea566e7 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -1,3 +1,7 @@ +[abi] +ignore-changes: + module:arch/x86/kvm/* + [base] featuresets: none diff --git a/debian/config/m68k/config b/debian/config/m68k/config index b5e7b5ca5..870801af3 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -65,7 +65,6 @@ CONFIG_Q40=y ## file: block/Kconfig.iosched ## CONFIG_IOSCHED_DEADLINE=m -CONFIG_IOSCHED_CFQ=m ## ## file: block/partitions/Kconfig diff --git a/debian/installer/arm64/modules/arm64/nic-modules b/debian/installer/arm64/modules/arm64/nic-modules index 83a95ea84..816ec1dd1 100644 --- a/debian/installer/arm64/modules/arm64/nic-modules +++ b/debian/installer/arm64/modules/arm64/nic-modules @@ -1,2 +1,3 @@ smc91x smsc911x +xen-netfront diff --git a/debian/installer/arm64/modules/arm64/xfs-modules b/debian/installer/arm64/modules/arm64/xfs-modules new file mode 100644 index 000000000..98374e2bb --- /dev/null +++ b/debian/installer/arm64/modules/arm64/xfs-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/armhf/modules/armhf-armmp/mmc-modules index d317a88eb..4ca43bd0c 100644 --- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules +++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules @@ -1,4 +1,5 @@ #include sdhci-esdhc-imx mmci +omap_hsmmc sunxi-mmc diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-modules b/debian/installer/armhf/modules/armhf-armmp/nic-modules index 3b3f35ba7..5c2235675 100644 --- a/debian/installer/armhf/modules/armhf-armmp/nic-modules +++ b/debian/installer/armhf/modules/armhf-armmp/nic-modules @@ -5,3 +5,6 @@ smsc911x stmmac sun4i-emac xgmac +ti_cpsw +davinci_mdio +davinci_cpdma diff --git a/debian/installer/modules/mmc-modules b/debian/installer/modules/mmc-modules index 636ceda62..373994720 100644 --- a/debian/installer/modules/mmc-modules +++ b/debian/installer/modules/mmc-modules @@ -1,5 +1,6 @@ mmc_block sdhci sdhci-pci ? +sdhci-acpi ? ricoh_mmc ? tifm_sd ? diff --git a/debian/patches/bugfix/mips/MIPS-ZBOOT-add-missing-linux-string.h-include.patch b/debian/patches/bugfix/mips/MIPS-ZBOOT-add-missing-linux-string.h-include.patch new file mode 100644 index 000000000..22f51cd8d --- /dev/null +++ b/debian/patches/bugfix/mips/MIPS-ZBOOT-add-missing-linux-string.h-include.patch @@ -0,0 +1,49 @@ +From: Aurelien Jarno +Date: Sun, 20 Jul 2014 19:25:33 +0200 +Subject: MIPS: ZBOOT: add missing include +Forwarded: http://www.linux-mips.org/archives/linux-mips/2014-07/msg00377.html + +Commit dc4d7b37 (MIPS: ZBOOT: gather string functions into string.c) +moved the string related functions into a separate file, which might +cause the following build error, depending on the configuration: + +| CC arch/mips/boot/compressed/decompress.o +| In file included from linux/arch/mips/boot/compressed/../../../../lib/decompress_unxz.c:234:0, +| from linux/arch/mips/boot/compressed/decompress.c:67: +| linux/arch/mips/boot/compressed/../../../../lib/xz/xz_dec_stream.c: In function 'fill_temp': +| linux/arch/mips/boot/compressed/../../../../lib/xz/xz_dec_stream.c:162:2: error: implicit declaration of function 'memcpy' [-Werror=implicit-function-declaration] +| cc1: some warnings being treated as errors +| linux/scripts/Makefile.build:308: recipe for target 'arch/mips/boot/compressed/decompress.o' failed +| make[6]: *** [arch/mips/boot/compressed/decompress.o] Error 1 +| linux/arch/mips/Makefile:308: recipe for target 'vmlinuz' failed + +It does not fail with the standard configuration, as when +CONFIG_DYNAMIC_DEBUG is not enabled gets included in +include/linux/dynamic_debug.h. There might be other ways for it to +get indirectly included. + +We can't add the include directly in xz_dec_stream.c as some +architectures might want to use a different version for the boot/ +directory (see for example arch/x86/boot/string.h). + +Cc: stable@vger.kernel.org +Signed-off-by: Aurelien Jarno +--- + arch/mips/boot/compressed/decompress.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c +index c00c4dd..5244cec 100644 +--- a/arch/mips/boot/compressed/decompress.c ++++ b/arch/mips/boot/compressed/decompress.c +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include + +-- +2.0.0 + diff --git a/debian/patches/debian/alsa-avoid-abi-change-for-cve-2014-4652-fix.patch b/debian/patches/debian/alsa-avoid-abi-change-for-cve-2014-4652-fix.patch deleted file mode 100644 index 8543612ac..000000000 --- a/debian/patches/debian/alsa-avoid-abi-change-for-cve-2014-4652-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Ben Hutchings -Date: Sun, 29 Jun 2014 02:05:57 +0100 -Subject: ALSA: Avoid ABI change for CVE-2014-4652 fix -Forwarded: not-needed - -Move the new member snd_card::user_ctl_lock to the end of the structure -and hide it from genksyms. struct snd_card is always allocated by -snd_card_create() in sound/core/init.c and user_ctl_lock is used in -sound/core/control.c, and these are part of the same module so they -are sure to be consistent. - ---- a/include/sound/core.h -+++ b/include/sound/core.h -@@ -121,8 +121,6 @@ struct snd_card { - int user_ctl_count; /* count of all user controls */ - struct list_head controls; /* all controls for this card */ - struct list_head ctl_files; /* active control files */ -- struct mutex user_ctl_lock; /* protects user controls against -- concurrent access */ - - struct snd_info_entry *proc_root; /* root for soundcard specific files */ - struct snd_info_entry *proc_id; /* the card id */ -@@ -149,6 +147,10 @@ struct snd_card { - struct snd_mixer_oss *mixer_oss; - int mixer_oss_change_count; - #endif -+#ifndef __GENKSYMS__ -+ struct mutex user_ctl_lock; /* protects user controls against -+ concurrent access */ -+#endif - }; - - #ifdef CONFIG_PM diff --git a/debian/patches/features/all/aufs3/aufs3-remove-circular-includes.patch b/debian/patches/features/all/aufs3/aufs3-remove-circular-includes.patch new file mode 100644 index 000000000..f6bea9ec2 --- /dev/null +++ b/debian/patches/features/all/aufs3/aufs3-remove-circular-includes.patch @@ -0,0 +1,222 @@ +From: Ian Campbell +Date: Sun, 20 Jul 2014 16:13:35 +0100 +Subject: aufs3: remove include of linux/fs.h from linux/mm.h +Forwarded: http://sourceforge.net/p/aufs/mailman/message/32628514/ + +This include is added by aufs3-mmap.patch but causes circular dependencies on +arm64 as seen with the Debian kernel packages in http://buildd.debian-ports.org/status/fetch.php?pkg=linux&arch=arm64&ver=3.14.12-1&stamp=1405234443 which contains: + +In file included from /«PKGBUILDDIR»/include/linux/mm.h:23:0, + from /«PKGBUILDDIR»/include/linux/pid_namespace.h:6, + from /«PKGBUILDDIR»/include/linux/ptrace.h:9, + from /«PKGBUILDDIR»/arch/arm64/include/asm/compat.h:26, + from /«PKGBUILDDIR»/arch/arm64/include/asm/stat.h:23, + from /«PKGBUILDDIR»/include/linux/stat.h:5, + from /«PKGBUILDDIR»/include/linux/module.h:10, + from /«PKGBUILDDIR»/init/main.c:15: +/«PKGBUILDDIR»/include/linux/fs.h:1575:64: warning: 'struct kstat' declared inside parameter list [enabled by default] + int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *); + +According to http://article.gmane.org/gmane.linux.ports.arm.kernel/342042 +> The added mm.h->fs.h looks like a mistake, it should not be there, and we have +> in the past worked hard to separate mm.h, sched.h and fs.h from one another. + +Move all of the static inline functions added to mm.h by +aufs3-mmap.patch into a new file, mm/aufs_mmap.c, instead to avoid the +new includes in mm.h. + +Signed-off-by: Ian Campbell + +--- a/include/linux/mm.h ++++ b/include/linux/mm.h +@@ -18,9 +18,6 @@ + #include + #include + #include +-#include +-#include +-#include + + struct mempolicy; + struct anon_vma; +@@ -1187,83 +1184,17 @@ static inline int fixup_user_fault(struc + } + #endif + +-/* +- * Mainly for aufs which mmap(2) diffrent file and wants to print different path +- * in /proc/PID/maps. +- */ +-/* #define AUFS_DEBUG_MMAP */ +-static inline void aufs_trace(struct file *f, struct file *pr, +- const char func[], int line, const char func2[]) +-{ +-#ifdef AUFS_DEBUG_MMAP +- if (pr) +- pr_info("%s:%d: %s, %p\n", func, line, func2, +- f ? (char *)f->f_dentry->d_name.name : "(null)"); +-#endif +-} +- +-static inline struct file *vmr_do_pr_or_file(struct vm_region *region, +- const char func[], int line) +-{ +- struct file *f = region->vm_file, *pr = region->vm_prfile; +- +- aufs_trace(f, pr, func, line, __func__); +- return (f && pr) ? pr : f; +-} +- +-static inline void vmr_do_fput(struct vm_region *region, +- const char func[], int line) +-{ +- struct file *f = region->vm_file, *pr = region->vm_prfile; +- +- aufs_trace(f, pr, func, line, __func__); +- fput(f); +- if (f && pr) +- fput(pr); +-} +- +-static inline void vma_do_file_update_time(struct vm_area_struct *vma, +- const char func[], int line) +-{ +- struct file *f = vma->vm_file, *pr = vma->vm_prfile; +- +- aufs_trace(f, pr, func, line, __func__); +- file_update_time(f); +- if (f && pr) +- file_update_time(pr); +-} +- +-static inline struct file *vma_do_pr_or_file(struct vm_area_struct *vma, +- const char func[], int line) +-{ +- struct file *f = vma->vm_file, *pr = vma->vm_prfile; +- +- aufs_trace(f, pr, func, line, __func__); +- return (f && pr) ? pr : f; +-} +- +-static inline void vma_do_get_file(struct vm_area_struct *vma, +- const char func[], int line) +-{ +- struct file *f = vma->vm_file, *pr = vma->vm_prfile; +- +- aufs_trace(f, pr, func, line, __func__); +- get_file(f); +- if (f && pr) +- get_file(pr); +-} +- +-static inline void vma_do_fput(struct vm_area_struct *vma, +- const char func[], int line) +-{ +- struct file *f = vma->vm_file, *pr = vma->vm_prfile; +- +- aufs_trace(f, pr, func, line, __func__); +- fput(f); +- if (f && pr) +- fput(pr); +-} +- ++extern struct file *vmr_do_pr_or_file(struct vm_region *region, ++ const char func[], int line); ++extern void vmr_do_fput(struct vm_region *region, const char func[], int line); ++extern void vma_do_file_update_time(struct vm_area_struct *vma, ++ const char func[], int line); ++extern struct file *vma_do_pr_or_file(struct vm_area_struct *vma, ++ const char func[], int line); ++extern void vma_do_get_file(struct vm_area_struct *vma, ++ const char func[], int line); ++extern void vma_do_fput(struct vm_area_struct *vma, const char func[], int line); ++ + #define vmr_pr_or_file(region) vmr_do_pr_or_file(region, __func__, \ + __LINE__) + #define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__) +--- a/mm/Makefile ++++ b/mm/Makefile +@@ -21,6 +21,7 @@ obj-y := filemap.o mempool.o oom_kill. + iov_iter.o $(mmu-y) + + obj-y += init-mm.o ++obj-y += aufs_mmap.o + + ifdef CONFIG_NO_BOOTMEM + obj-y += nobootmem.o +--- /dev/null ++++ b/mm/aufs_mmap.c +@@ -0,0 +1,73 @@ ++#include ++#include ++#include ++ ++/* ++ * Mainly for aufs which mmap(2) diffrent file and wants to print different path ++ * in /proc/PID/maps. ++ */ ++/* #define AUFS_DEBUG_MMAP */ ++static inline void aufs_trace(struct file *f, struct file *pr, ++ const char func[], int line, const char func2[]) ++{ ++#ifdef AUFS_DEBUG_MMAP ++ if (pr) ++ pr_info("%s:%d: %s, %p\n", func, line, func2, ++ f ? (char *)f->f_dentry->d_name.name : "(null)"); ++#endif ++} ++ ++#ifndef CONFIG_MMU ++struct file *vmr_do_pr_or_file(struct vm_region *region, ++ const char func[], int line) ++{ ++ struct file *f = region->vm_file, *pr = region->vm_prfile; ++ aufs_trace(f, pr, func, line, __func__); ++ return (f && pr) ? pr : f; ++} ++ ++void vmr_do_fput(struct vm_region *region, const char func[], int line) ++{ ++ struct file *f = region->vm_file, *pr = region->vm_prfile; ++ aufs_trace(f, pr, func, line, __func__); ++ fput(f); ++ if (f && pr) ++ fput(pr); ++} ++#endif ++ ++void vma_do_file_update_time(struct vm_area_struct *vma, ++ const char func[], int line) ++{ ++ struct file *f = vma->vm_file, *pr = vma->vm_prfile; ++ aufs_trace(f, pr, func, line, __func__); ++ file_update_time(f); ++ if (f && pr) ++ file_update_time(pr); ++} ++ ++struct file *vma_do_pr_or_file(struct vm_area_struct *vma, ++ const char func[], int line) ++{ ++ struct file *f = vma->vm_file, *pr = vma->vm_prfile; ++ aufs_trace(f, pr, func, line, __func__); ++ return (f && pr) ? pr : f; ++} ++ ++void vma_do_get_file(struct vm_area_struct *vma, const char func[], int line) ++{ ++ struct file *f = vma->vm_file, *pr = vma->vm_prfile; ++ aufs_trace(f, pr, func, line, __func__); ++ get_file(f); ++ if (f && pr) ++ get_file(pr); ++} ++ ++void vma_do_fput(struct vm_area_struct *vma, const char func[], int line) ++{ ++ struct file *f = vma->vm_file, *pr = vma->vm_prfile; ++ aufs_trace(f, pr, func, line, __func__); ++ fput(f); ++ if (f && pr) ++ fput(pr); ++} diff --git a/debian/patches/features/all/rt/fix-latency-histogram-after-hrtimer-set-expiry-time-before-switch_hrtimer_base.patch b/debian/patches/features/all/rt/fix-latency-histogram-after-hrtimer-set-expiry-time-before-switch_hrtimer_base.patch deleted file mode 100644 index 25156e95a..000000000 --- a/debian/patches/features/all/rt/fix-latency-histogram-after-hrtimer-set-expiry-time-before-switch_hrtimer_base.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Ben Hutchings -Date: Sat, 28 Jun 2014 23:34:48 +0100 -Subject: Fix latency histogram after "hrtimer: Set expiry time before switch_hrtimer_base()" -Forwarded: http://mid.gmane.org/1403994888.23472.116.camel@deadeye.wl.decadent.org.uk - -In an rt-kernel with CONFIG_MISSED_TIMER_OFFSETS_HIST enabled, -__hrtimer_start_range_ns() now crashes, as new_base is not assigned -before it is used. - -Signed-off-by: Ben Hutchings -Tested-by: Carsten Emde -Cc: stable-rt@vger.kernel.org ---- ---- a/kernel/hrtimer.c -+++ b/kernel/hrtimer.c -@@ -1106,6 +1106,11 @@ int __hrtimer_start_range_ns(struct hrti - #endif - } - -+ hrtimer_set_expires_range_ns(timer, tim, delta_ns); -+ -+ /* Switch the timer base, if necessary: */ -+ new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED); -+ - #ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST - { - ktime_t now = new_base->get_time(); -@@ -1117,11 +1122,6 @@ int __hrtimer_start_range_ns(struct hrti - } - #endif - -- hrtimer_set_expires_range_ns(timer, tim, delta_ns); -- -- /* Switch the timer base, if necessary: */ -- new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED); -- - timer_stats_hrtimer_set_start_info(timer); - - leftmost = enqueue_hrtimer(timer, new_base); diff --git a/debian/patches/features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch b/debian/patches/features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch new file mode 100644 index 000000000..fb0fbc888 --- /dev/null +++ b/debian/patches/features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch @@ -0,0 +1,67 @@ +From: Aurelien Jarno +Date: Sun, 20 Jul 2014 19:16:31 +0200 +Subject: MIPS: Loongson 3: Add Loongson LS3A RS780E 1-way machine definition +Forwarded: not yet + +Add a Loongson LS3A RS780E 1-way machine definition, which only differs +from other Loongson 3 based machines by the UART base clock speed. + +Signed-off-by: Aurelien Jarno +--- + arch/mips/include/asm/bootinfo.h | 1 + + arch/mips/loongson/common/machtype.c | 1 + + arch/mips/loongson/common/serial.c | 1 + + arch/mips/loongson/common/uart_base.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h +index 1f7ca8b..c3efea0 100644 +--- a/arch/mips/include/asm/bootinfo.h ++++ b/arch/mips/include/asm/bootinfo.h +@@ -74,6 +74,7 @@ enum loongson_machine_type { + MACH_LEMOTE_A1101, + MACH_LEMOTE_A1201, + MACH_LEMOTE_A1205, ++ MACH_LOONGSON_3A780E1W, + MACH_LOONGSON_END + }; + +diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c +index 1a47979..3b88f88 100644 +--- a/arch/mips/loongson/common/machtype.c ++++ b/arch/mips/loongson/common/machtype.c +@@ -31,6 +31,7 @@ static const char *system_types[] = { + [MACH_LEMOTE_A1101] "lemote-3a-itx-a1101", + [MACH_LEMOTE_A1201] "lemote-2gq-notebook-a1201", + [MACH_LEMOTE_A1205] "lemote-2gq-aio-a1205", ++ [MACH_LOONGSON_3A780E1W] "loongson-ls3a-rs780e-1w", + [MACH_LOONGSON_END] NULL, + }; + +diff --git a/arch/mips/loongson/common/serial.c b/arch/mips/loongson/common/serial.c +index bd2b709..f1cc859 100644 +--- a/arch/mips/loongson/common/serial.c ++++ b/arch/mips/loongson/common/serial.c +@@ -51,6 +51,7 @@ static struct plat_serial8250_port uart8250_data[][2] = { + [MACH_LEMOTE_A1101] {PORT_M(2, 25000000), {} }, + [MACH_LEMOTE_A1201] {PORT_M(2, 25000000), {} }, + [MACH_LEMOTE_A1205] {PORT_M(2, 25000000), {} }, ++ [MACH_LOONGSON_3A780E1W] {PORT_M(2, 33177600), {} }, + [MACH_LOONGSON_END] {}, + }; + +diff --git a/arch/mips/loongson/common/uart_base.c b/arch/mips/loongson/common/uart_base.c +index 1e1eeea..406cb24 100644 +--- a/arch/mips/loongson/common/uart_base.c ++++ b/arch/mips/loongson/common/uart_base.c +@@ -42,6 +42,7 @@ void prom_init_loongson_uart_base(void) + case MACH_LEMOTE_A1101: + case MACH_LEMOTE_A1201: + case MACH_LEMOTE_A1205: ++ case MACH_LOONGSON_3A780E1W: + /* The CPU provided serial port (CPU) */ + loongson_uart_base = LOONGSON_REG_BASE + 0x1e0; + break; +-- +2.0.0 + diff --git a/debian/patches/series b/debian/patches/series index 5b1458912..0771d7fe8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,6 +25,7 @@ features/all/aufs3/aufs3-mmap.patch features/all/aufs3/aufs3-standalone.patch features/all/aufs3/aufs3-add.patch # Debian-specific changes +features/all/aufs3/aufs3-remove-circular-includes.patch debian/aufs3-mark-as-staging.patch # Change some defaults for security reasons @@ -58,6 +59,7 @@ bugfix/arm/omap-musb-choice.patch bugfix/mips/disable-advansys.patch bugfix/arm/ixp4xx_iobe.patch bugfix/m68k/ethernat-kconfig.patch +bugfix/mips/MIPS-ZBOOT-add-missing-linux-string.h-include.patch # Miscellaneous bug fixes bugfix/all/misc-bmp085-Enable-building-as-a-module.patch @@ -67,4 +69,4 @@ bugfix/all/disable-some-marvell-phys.patch # Miscellaneous features features/all/x86-memtest-WARN-if-bad-RAM-found.patch features/all/efi-autoload-efivars.patch - +features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.plain.postinst.in index 82c92fd68..37f253014 100755 --- a/debian/templates/image.plain.postinst.in +++ b/debian/templates/image.plain.postinst.in @@ -5,6 +5,7 @@ use warnings; use Cwd 'abs_path'; use Debconf::Client::ConfModule qw(:all); use POSIX (); +use File::stat; version('2.0'); my $capb = capb('backup', 'escape'); @@ -12,6 +13,7 @@ $|=1; # Predefined values: my $version = "@abiname@@localversion@"; +my $arch = "@arch@"; my $link_in_boot = ""; my $no_symlink = ""; my $do_symlink = "Yes"; # target machine defined @@ -546,6 +548,53 @@ else { } } +# This routine detects chroots by checking if the devicenumber/inode pair +# of / are the same as that of /sbin/init. This may fail if not running as +# root or if /proc is not mounted, in which case 2 is returned. +sub detect_chroot { + my $st1 = stat("/") or return 2; + my $st2 = stat("/proc/1/root") or return 2; + return ($st1->dev != $st2->dev) || ($st1->ino != $st2->ino); +} + +sub is_package_installed { + my ($package) = @_; + for (`dpkg-query 2>/dev/null --showformat '\${status}\\n' -W '$package'`) { + return 1 if / installed\n$/; + } + return 0; +} + +# On mips and mipsel warn users if they need to configure their boot loader +# to load initramfs. mips64 and mips64el are ignored as they always had an +# initramfs. For that look if the current kernel is booted using initramfs. +# We ignore the chroot case, and we also ignore the GRUB case, as +# update-grub will automatically add the initramfs to grub.cfg. +if (($arch eq "mips" || $arch eq "mipsel") + && !is_package_installed("grub-yeeloong") + && detect_chroot() == 0) { + if (-r "/proc/cmdline" && -f "/proc/cmdline") { + if (open(CMDLINE, "/proc/cmdline")) { + if ( !~ m/rd_start=/) { + my $ret; + my $seen; + my $question = "${package_name}/postinst/mips-initrd-$version"; + + ($ret,$seen) = input('critical', "$question"); + if ($ret && $ret != 30 ) { + die "Error setting debconf question $question: $seen"; + } + + ($ret,$seen) = go(); + if ($ret && $ret != 30 ) { + die "Error asking debconf question $question: $seen"; + } + } + close CMDLINE; + } + } +} + # set the env var stem $ENV{'STEM'} = "linux"; sub run_hook { diff --git a/debian/templates/image.plain.templates.in b/debian/templates/image.plain.templates.in index 7d5271f86..e4dde3a5a 100644 --- a/debian/templates/image.plain.templates.in +++ b/debian/templates/image.plain.templates.in @@ -36,3 +36,18 @@ _Description: Abort kernel removal? . It is highly recommended to abort the kernel removal unless you are prepared to fix the system after removal. + +Template: linux-image-@abiname@@localversion@/postinst/mips-initrd-@abiname@@localversion@ +Type: note +_Description: Boot loader configuration must be updated to load initramfs + This kernel package will build an "initramfs" file + (/boot/initrd.img-@abiname@@localversion@) for the system's boot loader + to use in addition to the kernel itself. This method, formerly + unsupported on MIPS, enables a more flexible boot process, and future + kernel versions may require a corresponding initrd.img to boot. + . + The currently running kernel was booted without an initramfs. You + should reconfigure the boot loader to load the initramfs for Linux + version @abiname@, and for each later version. This is probably + most easily accomplished by using the initrd.img symbolic link + maintained by the kernel package. diff --git a/debian/templates/po/POTFILES.in b/debian/templates/po/POTFILES.in index cff14fdf9..7c102fe72 100644 --- a/debian/templates/po/POTFILES.in +++ b/debian/templates/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] templates/temp.image.plain/templates +[type: gettext/rfc822deb] image.plain.templates.in diff --git a/debian/templates/po/ca.po b/debian/templates/po/ca.po index bd22be83d..9d9e30068 100644 --- a/debian/templates/po/ca.po +++ b/debian/templates/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2013-08-15 13:20+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -95,3 +95,31 @@ msgid "" msgstr "" "És molt recomanable que avorteu la supressió del nucli si no esteu preparat " "per a reparar el sistema després de la supressió." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" diff --git a/debian/templates/po/cs.po b/debian/templates/po/cs.po index e3979832b..26e9606c1 100644 --- a/debian/templates/po/cs.po +++ b/debian/templates/po/cs.po @@ -1,14 +1,14 @@ # Czech PO debconf template translation of linux. # Copyright (C) 2010 Michal Simunek # This file is distributed under the same license as the linux package. -# Michal Simunek , 2010 - 2012. +# Michal Simunek , 2010 - 2014. # msgid "" msgstr "" -"Project-Id-Version: linux 3.2.21-3\n" +"Project-Id-Version: linux 3.14.12-2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" -"PO-Revision-Date: 2012-06-30 13:02+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" +"PO-Revision-Date: 2014-07-17 11:02+0200\n" "Last-Translator: Michal Simunek \n" "Language-Team: Czech \n" "Language: cs\n" @@ -90,3 +90,40 @@ msgid "" msgstr "" "Je silně doporučeno přerušit odstraňování jádra, pokud nejste připraveni " "opravovat systém po jeho odstranění." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "Pro nahrávání initramfs musí být aktualizováno nastavení zavaděče" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" +"Jaderný balíček vytvoří pro zavaděč systému soubor \"initramfs\" (/boot/" +"initrd.img-@abiname@@localversion@), aby jej používal vedle samotného jádra. " +"Tento způsob, dříve nepodporovaný na architektuře MIPS, umožňuje pružnější " +"proces zavádění, budoucí verze jádra mohou k zavedení potřebovat " +"odpovídající obraz initrd.img." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" +"Aktuálně běžící jádro bylo zavedeno bez initramfs. U verze Linuxu @abiname@, " +"a u každé pozdější verze, byste měli přenastavit zavaděč, aby nahrával " +"initramfs. Pravděpodobně nejsnáze toho dosáhnete používáním symbolického " +"odkazu na initrd.img spravovaného balíčkem kernel." diff --git a/debian/templates/po/da.po b/debian/templates/po/da.po index 95a050549..74fa86f65 100644 --- a/debian/templates/po/da.po +++ b/debian/templates/po/da.po @@ -1,14 +1,14 @@ # Danish translation linux. -# Copyright (C) 2011 Joe Hansen. +# Copyright (C) 2014 the linux team. # This file is distributed under the same license as the linux package. -# Joe Hansen , 2010, 2011. +# Joe Hansen , 2010, 2011, 2014. # msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" -"PO-Revision-Date: 2011-07-03 05:26+0100\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" +"PO-Revision-Date: 2014-07-20 05:26+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" @@ -93,3 +93,43 @@ msgid "" msgstr "" "Det anbefales stærkt, at afbryde kernefjernelsen med mindre du er forberedt " "på at rette systemet op efter fjernelsen." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" +"Konfigurationen for opstartsindlæseren skal opdateres for at indlæse " +"initramfs" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" +"Denne kernepakke vil bygge en »initramfs«-fil (/boot/initrd.img-" +"@abiname@@localversion@) for systemets opstartsindlæser til brug udover " +"selve kernen. Denne metode, tidligere ikke understøttet på MIPS, aktiverer " +"en mere fleksibel opstartsmetode, og fremtidige kerneversioner kan kræve en " +"tilsvarende initrd.img for at starte op." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" +"Den nuværende kørende kerne blev opstartet uden en initramfs. Du skal " +"konfigurere opstartsindlæseren om til at indlæse initramfs'en for Linux " +"version @abiname@, og for hver senere version. Dette opnås sandsynligvis " +"bedst ved at bruge initrd-img's symbolske henvisning vedligeholdt af " +"kernepakken." diff --git a/debian/templates/po/de.po b/debian/templates/po/de.po index db8e1e1ef..2b5c2a2fe 100644 --- a/debian/templates/po/de.po +++ b/debian/templates/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.0.0-3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2011-09-13 20:41+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -96,3 +96,31 @@ msgstr "" "Es wird dringend empfohlen, das Entfernen des Kernels abzubrechen, " "ausgenommen Sie sind darauf vorbereitet, das System nach der Entfernung " "wieder instandzusetzen." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" diff --git a/debian/templates/po/es.po b/debian/templates/po/es.po index a860b65da..e4ae8c32a 100644 --- a/debian/templates/po/es.po +++ b/debian/templates/po/es.po @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32+5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2011-07-16 17:59+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -125,3 +125,31 @@ msgid "" msgstr "" "Se recomienda encarecidamente cancelar la eliminación del núcleo, a menos " "que esté preparado para arreglar el sistema después de la eliminación." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" diff --git a/debian/templates/po/et.po b/debian/templates/po/et.po index 809d4308d..75ab82a11 100644 --- a/debian/templates/po/et.po +++ b/debian/templates/po/et.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: linux 2.6.32-11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2013-08-15 13:20+0200\n" "Last-Translator: mihkel \n" "Language-Team: Estonian \n" @@ -96,3 +96,31 @@ msgid "" msgstr "" "On äärmiselt soovituslik katkestada tuuma eemaldamine, kui sa just pole " "valmistunud süsteemi ise parandama." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" diff --git a/debian/templates/po/fr.po b/debian/templates/po/fr.po index 8e4e9c213..069fc27bf 100644 --- a/debian/templates/po/fr.po +++ b/debian/templates/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.39-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2011-05-22 08:48-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" @@ -97,3 +97,31 @@ msgid "" msgstr "" "Il est fortement recommandé d'interrompre la suppression du noyau à moins " "d'être ensuite prêt à réparer le système." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" diff --git a/debian/templates/po/it.po b/debian/templates/po/it.po index 7ffc9166b..82286582a 100644 --- a/debian/templates/po/it.po +++ b/debian/templates/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-27\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2013-08-15 13:21+0200\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian \n" @@ -95,3 +95,31 @@ msgid "" msgstr "" "Si consiglia vivamente di interrompere la rimozione del kernel a meno che " "non si sia preparati a riparare il sistema in seguito." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" diff --git a/debian/templates/po/ja.po b/debian/templates/po/ja.po index 18396c233..b2fd6594d 100644 --- a/debian/templates/po/ja.po +++ b/debian/templates/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2013-08-15 13:21+0200\n" "Last-Translator: Nobuhiro Iwamatsu \n" "Language-Team: Japanese \n" @@ -96,3 +96,31 @@ msgid "" msgstr "" "削除後でもシステムに問題がないような準備を済ませるまで、カーネルの削除を中止" "することを強くお勧めします。" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" diff --git a/debian/templates/po/nl.po b/debian/templates/po/nl.po index 535362605..eadb97623 100644 --- a/debian/templates/po/nl.po +++ b/debian/templates/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2012-02-04 12:27+0100\n" "Last-Translator: willem kuyn \n" "Language-Team: Debian-Dutch \n" @@ -95,3 +95,31 @@ msgstr "" "Het wordt ten sterkste aanbevolen om het verwijderen van de kernel af te " "breken tenzij u bent voorbereid om het systeem te repareren na het " "verwijderen." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" diff --git a/debian/templates/po/pl.po b/debian/templates/po/pl.po index 9fffc4094..b2f2f1831 100644 --- a/debian/templates/po/pl.po +++ b/debian/templates/po/pl.po @@ -3,19 +3,20 @@ # This file is distributed under the same license as the linux package. # # Michał Kułach , 2012. +# Łukasz Dulny , 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" -"PO-Revision-Date: 2012-02-05 18:38+0100\n" -"Last-Translator: Michał Kułach \n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" +"PO-Revision-Date: 2014-07-17 13:34+0200\n" +"Last-Translator: Łukasz Dulny \n" "Language-Team: Polish \n" -"Language: \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -98,3 +99,43 @@ msgid "" msgstr "" "Jest wysoce zalecane, aby przerwać usuwanie jądra, chyba że użytkownik jest " "przygotowany do naprawy systemu po usunięciu." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" +"Konfiguracja programu rozruchowego musi być zaktualizowana, aby wczytać " +"initramfs" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" +"Ten pakiet jądra zbuduje plik \"initramfs\" (/boot/initrd.img-" +"@abiname@@localversion@) dla programu rozruchowego systemu poza samym " +"jądrem. Ta metoda, wcześniej niewspierana na architekturze MIPS, pozwala na " +"bardziej elastyczny proces uruchamiania i przyszłe wersje jądra mogą wymagać " +"odpowiedniego pliku initrd.img do uruchomienia." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" +"Obecnie działające jądro zostało uruchomione bez initramfs. Należy ponownie " +"skonfigurować program rozruchowy, aby wczytać initramfs dla wersji Linuksa " +"@abiname@ i dla każdej późniejszej wersji. Prawdopodobnie najłatwiej " +"osiągnąć to przy użyciu dowiązania symbolicznego initrd.img utrzymywanego " +"przez pakiet jądra." diff --git a/debian/templates/po/pt.po b/debian/templates/po/pt.po index b6b667f8d..8b36b0d44 100644 --- a/debian/templates/po/pt.po +++ b/debian/templates/po/pt.po @@ -1,21 +1,21 @@ # Translation of linux debconf messages to Portuguese -# Copyright (C) 2010 Américo Monteiro +# Copyright (C) 2010 the linux's copyright holder # This file is distributed under the same license as the linux package. # -# Américo Monteiro , 2010, 2011. +# Américo Monteiro , 2010, 2011, 2014. msgid "" msgstr "" -"Project-Id-Version: linux 2.6.39.1\n" +"Project-Id-Version: linux 3.14.12-2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" -"PO-Revision-Date: 2011-05-22 23:53+0100\n" -"Last-Translator: Américo Monteiro \n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" +"PO-Revision-Date: 2014-07-17 19:45+0100\n" +"Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: boolean @@ -96,3 +96,43 @@ msgid "" msgstr "" "É altamente recomendado abortar a remoção do kernel a menos que esteja " "preparado para corrigir o sistema após a remoção." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" +"A configuração do gestor de arranque (boot loader) tem de ser actualizada " +"para carregar initramfs" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" +"Este pacote de kernel irá compilar um ficheiro \"initramfs\" (/boot/initrd." +"img-@abiname@@localversion@) para o gestor de arranque do sistema usar " +"adicionalmente ao próprio kernel. Este método, antes não suportado no MIPS, " +"activa um processo de arranque mais flexível, e as versões futuras de kernel " +"podem requerer uma nitrd.img correspondente para arrancar." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" +"O kernel presentemente em funcionamento foi arrancado sem um nitramfs. Você " +"deve reconfigurar o gestor de arranque para carregar a initramfs para a " +"versão Linux @abiname@, e para cada versão posterior. Provavelmente a " +"maneira mais fácil de conseguir isto é usar o link simbólico initrd.img " +"mantido pelo pacote do kernel." diff --git a/debian/templates/po/pt_BR.po b/debian/templates/po/pt_BR.po index 3370129d5..2d49d3f59 100644 --- a/debian/templates/po/pt_BR.po +++ b/debian/templates/po/pt_BR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: linux 3.10.3-1\n" -"Report-Msgid-Bugs-To: linux@packages.debian.org\n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2013-08-17 14:29+0200\n" "Last-Translator: Fernando Ike de Oliveira (fike) \n" "Language-Team: Brazilian Portuguese , 2010, 2011. +# Yuri Kozlov , 2010, 2011, 2014. msgid "" msgstr "" -"Project-Id-Version: linux-2.6 3.1.6-1\n" +"Project-Id-Version: linux 3.14.12-2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" -"PO-Revision-Date: 2011-12-30 18:35+0400\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" +"PO-Revision-Date: 2014-07-17 19:28+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -94,3 +94,42 @@ msgid "" msgstr "" "Настоятельно рекомендуется прервать удаление ядра, если вы не готовы чинить " "систему после его удаления." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" +"Для загрузки initramfs требуется обновление настроек системного загрузчика" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" +"Данный пакет с ядром будет собирать файл «initramfs» (/boot/initrd.img-" +"@abiname@@localversion@) для системного загрузчика, чтобы использовать его " +"вместе с ядром. Данный метод, прежде не поддерживаемый на MIPS, обеспечивает " +"более гибкий процесс загрузки, и будущие версии ядер могу требовать " +"соответствующего initrd.img для запуска." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" +"Работающая в данный момент версия ядра была загружена без initramfs. Вы " +"должен перенастроить системный загрузчик, чтобы он загружал initramfs для " +"Linux версии @abiname@ и для каждой будущей версии. Это, вероятно, проще " +"всего сделать с помощью символической ссылки initrd.img, настраиваемой из " +"пакета ядра." diff --git a/debian/templates/po/sk.po b/debian/templates/po/sk.po index bb1f73e57..4566ec441 100644 --- a/debian/templates/po/sk.po +++ b/debian/templates/po/sk.po @@ -2,21 +2,26 @@ # Slovenské preklady pre balík linux. # Copyright (C) 2011 Slavko # This file is distributed under the same license as the linux package. -# Slavko , 2011. +# Slavko , 2011, 2014. # msgid "" msgstr "" -"Project-Id-Version: linux-2.6 2.6.32-29\n" +"Project-Id-Version: linux 3.14.12-2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" -"PO-Revision-Date: 2011-07-10 09:19+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" +"PO-Revision-Date: 2014-07-18 12:28+0200\n" "Last-Translator: Slavko \n" -"Language-Team: Slovak \n" +"Language-Team: slovenčina \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Gtranslator 2.91.6\n" +"X-POFile-SpellExtra: CORE depmod img- lib dep boot SIGNAL img modules\n" +"X-POFile-SpellExtra: initrd initramfs modulesbase running exitvalue\n" +"X-POFile-SpellExtra: version zavádzača abiname MIPS vmlinuz-\n" +"X-POFile-SpellExtra: localversion\n" #. Type: boolean #. Description @@ -93,3 +98,41 @@ msgid "" msgstr "" "Dôrazne odporúčame prerušiť odstraňovanie jadra, ak nie ste pripravený na " "opravu systému po jeho odstránení." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" +"Je potrebné aktualizovať nastavenie zavádzača tak, aby načítal initramfs" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" +"Tento balík jadra zostaví súbor „initramfs” (/boot/initrd.img-" +"@abiname@@localversion@) pre zavádzač systému, na použitie ako doplnok k " +"samotnému jadru. Táto metóda, predtým nepodporovaná na MIPS, poskytuje oveľa " +"flexibilnejší proces zavádzania a budúce verzie jadra môžu na zavedenie " +"vyžadovať príslušný initrd.img." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" +"Aktuálne bežiace jadro bolo zavedené bez initramfs. Mali by ste nastaviť " +"zavádzač tak, aby načítal initramfs pre Linux verzie @abiname@ a pre každú " +"novšiu verziu. Asi najjednoduchšie to môžete docieliť pomocou symbolického " +"odkazu initrd.img, ktorý je spravovaný balíkom jadra." diff --git a/debian/templates/po/sv.po b/debian/templates/po/sv.po index b81103a50..e8eeb4280 100644 --- a/debian/templates/po/sv.po +++ b/debian/templates/po/sv.po @@ -1,22 +1,21 @@ # Translation of linux debconf template to Swedish -# Copyright (C) 2010 Martin Bagge +# Copyright (C) 2014 Martin Bagge # This file is distributed under the same license as the linux package. # -# Martin Bagge , 2010 +# Martin Bagge , 2010, 2014 msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" -"PO-Revision-Date: 2011-06-02 14:52+0100\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" +"PO-Revision-Date: 2014-07-18 11:09+0100\n" "Last-Translator: Martin Bagge / brother \n" "Language-Team: Swedish \n" -"Language: sv\n" +"Language: Swedish\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Swedish\n" -"X-Poedit-Country: Sweden\n" +"X-Generator: Poedit 1.5.4\n" #. Type: boolean #. Description @@ -95,3 +94,40 @@ msgid "" msgstr "" "Det rekomenderas starkt att du avbryter raderingen av kärnan om du inte är " "beredd på att laga systemet efter raderingen." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "Uppstartshanteraren behöver uppdateras för att läsa in initramfs" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" +"Kärnans paket kommer att bygga en initramfs-fil (/boot/initrd.img-" +"@abiname@@localversion@) för systemets uppstartshanterare för att användas " +"upptill kärnan själv. Denna metod, tidigare utan stöd på MIPS, aktiverar en " +"mer flexibel uppstartsprocess och framtida kärnversioner kan komma att kräva " +"en motsvarande initrd.img för att starta." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" +"Kärnan som används startades utan initramfs. Du bör ställa in " +"uppstartshanteraren att läsa in initramfs för Linux version @abiname@ och " +"senare. Detta är troligen enklast att åstadkomma genom att använda den " +"symboliska länken som hanteras av kärnans paket." diff --git a/debian/templates/po/templates.pot b/debian/templates/po/templates.pot index 45a604592..a87ec2e2e 100644 --- a/debian/templates/po/templates.pot +++ b/debian/templates/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -79,3 +79,31 @@ msgid "" "It is highly recommended to abort the kernel removal unless you are prepared " "to fix the system after removal." msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" diff --git a/debian/templates/po/tr.po b/debian/templates/po/tr.po index e3e3f41f7..f9f0aa8ec 100644 --- a/debian/templates/po/tr.po +++ b/debian/templates/po/tr.po @@ -7,14 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.2.4-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:43+0200\n" -"PO-Revision-Date: 2012-02-12 22:36+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" +"PO-Revision-Date: 2014-07-19 00:28+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian L10n Turkish \n" -"Language: \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" #. Type: boolean #. Description @@ -94,3 +95,42 @@ msgid "" msgstr "" "Kaldırma işlemi sonrasında sistemi düzeltmeye hazır olmadığınız takdirde " "kaldırma işleminden vazgeçmeniz şiddetle tavsiye edilir." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "initramfs'i yüklemek için açılış önyükleyicisi güncellenmeli" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" +"Çekirdek paketi, sistem ön yükleyicinin kullanması için çekirdeğe ek olarak " +"bir de \"initramfs\" dosyası (/boot/initrd.img-@abiname@@localversion@) " +"oluşturacak. MIPS mimarisinde eskiden desteklenmeyen bu yöntem, daha esnek " +"bir ön yükleme sürecine imkan tanır. Gelecekte yayımlanacak olan yeni " +"çekirdek sürümleri kendilerine uyumlu olan yeni initrd.img dosyaları " +"gerektirebilir." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr "" +"Şu an kullanımda olan çekirdek initramfs olmadan başlatıldı. Açılış " +"önyükleyicisini Linux @abiname@ ve daha sonraki her sürümün initramfs'lerini " +"yükleyecek şekilde yeniden yapılandırmanız gerekmektedir. Bunu yapmanın en " +"kolay yolu genelde çekirdek paketi tarafından idare edilen initrd.img " +"sembolik bağlantısını kullanmaktır." diff --git a/debian/templates/po/vi.po b/debian/templates/po/vi.po index 6c130e167..454b071f9 100644 --- a/debian/templates/po/vi.po +++ b/debian/templates/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2014-07-20 22:37+0200\n" "PO-Revision-Date: 2013-08-15 13:21+0200\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -92,3 +92,31 @@ msgid "" msgstr "" "Rất khuyên bạn hủy bỏ tiến trình gỡ bỏ hạt nhân, nếu bạn không sẵn sàng sửa " "chữa hệ thống sau khi gỡ bỏ." + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "Boot loader configuration must be updated to load initramfs" +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"This kernel package will build an \"initramfs\" file (/boot/initrd.img-" +"@abiname@@localversion@) for the system's boot loader to use in addition to " +"the kernel itself. This method, formerly unsupported on MIPS, enables a more " +"flexible boot process, and future kernel versions may require a " +"corresponding initrd.img to boot." +msgstr "" + +#. Type: note +#. Description +#: ../image.plain.templates.in:4001 +msgid "" +"The currently running kernel was booted without an initramfs. You should " +"reconfigure the boot loader to load the initramfs for Linux version " +"@abiname@, and for each later version. This is probably most easily " +"accomplished by using the initrd.img symbolic link maintained by the kernel " +"package." +msgstr ""