Commit d159a8e4 authored by Guido Gunther's avatar Guido Gunther

Merge branch 'debian-3.98' into 'librem5'

Debian 3.98

See merge request !8
parents e044b89f 8f6f8cd2
Pipeline #5788 passed with stages
in 1 minute and 20 seconds
......@@ -74,6 +74,13 @@ DTB-Id: sun8i-h3-bananapi-m2-plus.dtb
U-Boot-Script-Name: bootscr.sunxi
Required-Packages: u-boot-tools
Machine: Banana Pi M2 Berry
Kernel-Flavors: armmp armmp-lpae
Boot-Script-Path: /boot/boot.scr
DTB-Id: sun8i-v40-bananapi-m2-berry.dtb
U-Boot-Script-Name: bootscr.sunxi
Required-Packages: u-boot-tools
Machine: BA10 tvbox
Kernel-Flavors: armmp
Boot-Script-Path: /boot/boot.scr
......@@ -505,12 +512,6 @@ Boot-Script-Path: /boot/boot.scr
Required-Packages: u-boot-tools
Bootloader-Sets-Incorrect-Root: yes
Machine: GLAN Tank
Method: symlink
Kernel-Flavors: iop32x
Machine-Id: 1100
Bootloader-Sets-Incorrect-Root: yes
Machine: GTA02
Method: multi
Kernel-Flavors: s3c24xx
......@@ -887,15 +888,6 @@ DTB-Id: sun7i-a20-lamobo-r1.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
# Really: Intel SS4000-e and compatibles
Machine: Lanner EM7210
Method: redboot
Kernel-Flavors: iop32x
Machine-Id: 1212
Mtd-Kernel: zImage
Mtd-Initrd: ramdisk.gz
Bootloader-Sets-Incorrect-Root: yes
Machine: LeMaker Banana Pi
Kernel-Flavors: armmp armmp-lpae
Boot-Script-Path: /boot/boot.scr
......@@ -938,17 +930,6 @@ DTB-Id: sun7i-a20-pcduino3-nano.dtb
U-Boot-Script-Name: bootscr.sunxi
Required-Packages: u-boot-tools
Machine: Linksys NSLU2
Method: slug
Kernel-Flavors: ixp4xx
Mtd-Kernel: Kernel
Mtd-Initrd: Ramdisk
# firmware can be provided in other ways and is not always needed
Optional-Packages: ixp4xx-firmware
# nslu2-utils will call update-initramfs -u to include the firmware and to run
# the hook from flash-kernel
Required-Packages: apex-nslu2 nslu2-utils
Machine: Marvell DB-78x00-BP Development Board
U-Boot-Kernel-Address: 0x8000
U-Boot-Initrd-Address: 0x0
......@@ -1299,6 +1280,13 @@ DTB-Id: sun8i-a33-olinuxino.dtb
U-Boot-Script-Name: bootscr.sunxi
Required-Packages: u-boot-tools
Machine: Olimex A64 Teres-I
Kernel-Flavors: arm64
DTB-Id: sun50i-a64-teres-i.dtb
Boot-Script-Path: /boot/boot.scr
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Machine: OMAP4 Panda board
Method: generic
U-Boot-Kernel-Address: 0x80008000
......@@ -1339,6 +1327,13 @@ DTB-Id: sun4i-a10-mini-xplus.dtb
U-Boot-Script-Name: bootscr.sunxi
Required-Packages: u-boot-tools
Machine: Pine64 LTS
Kernel-Flavors: arm64
DTB-Id: allwinner/sun50i-a64-pine64-lts.dtb
Boot-Script-Path: /boot/boot.scr
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Machine: Pine64+
Kernel-Flavors: arm64
DTB-Id: allwinner/sun50i-a64-pine64-plus.dtb
......@@ -1346,6 +1341,13 @@ Boot-Script-Path: /boot/boot.scr
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Machine: Pine64 Rock64
Kernel-Flavors: arm64
DTB-Id: rockchip/rk3328-rock64.dtb
Boot-Script-Path: /boot/boot.scr
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Machine: PlatHome OpenBlocks AX3-4 board
Kernel-Flavors: armmp armmp-lpae
DTB-Id: armada-xp-openblocks-ax3-4.dtb
......@@ -1474,6 +1476,62 @@ Boot-Script-Path: /boot/boot.scr
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Machine: Raspberry Pi 1 Model A
Kernel-Flavors: rpi
DTB-Id: bcm2835-rpi-a.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Raspberry Pi 1 Model A+
Kernel-Flavors: rpi
DTB-Id: bcm2835-rpi-a-plus.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Raspberry Pi 1 Model B
Kernel-Flavors: rpi
DTB-Id: bcm2835-rpi-b.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Raspberry Pi 1 Model B+
Kernel-Flavors: rpi
DTB-Id: bcm2835-rpi-b-plus.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Raspberry Pi 1 Model B Rev2
Kernel-Flavors: rpi
DTB-Id: bcm2835-rpi-b-rev2.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Raspberry Pi 1 Compute Module
Kernel-Flavors: rpi
DTB-Id: bcm2835-rpi-cm1-io1.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Raspberry Pi Zero
Kernel-Flavors: rpi
DTB-Id: bcm2835-rpi-zero.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Raspberry Pi Zero W
Kernel-Flavors: rpi
DTB-Id: bcm2835-rpi-zero-w.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Raspberry Pi 2 Model B
Kernel-Flavors: armmp armmp-lpae
DTB-Id: bcm2836-rpi-2-b.dtb
......@@ -1495,6 +1553,13 @@ U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Raspberry Pi 3 Compute Module
Kernel-Flavors: arm64 armmp armmp-lpae
DTB-Id: broadcom/bcm2837-rpi-cm3-io3.dtb
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Boot-Script-Path: /boot/boot.scr
Machine: Rockchip RK3288 Tinker Board
Kernel-Flavors: armmp armmp-lpae
DTB-Id: rk3288-tinker.dtb
......@@ -1509,6 +1574,16 @@ Boot-Script-Path: /boot/boot.scr
U-Boot-Script-Name: bootscr.uboot-generic
Required-Packages: u-boot-tools
Machine: Seagate Blackarmor NAS220
Kernel-Flavors: kirkwood marvell
DTB-Id: kirkwood-blackarmor-nas220.dtb
DTB-Append: yes
Mtd-Kernel: uimage
Mtd-Initrd: rootfs
U-Boot-Kernel-Address: 0x00040000
U-Boot-Initrd-Address: 0x00800000
Required-Packages: u-boot-tools
Machine: Seagate FreeAgent Dockstar
Machine: Seagate FreeAgent DockStar
Kernel-Flavors: kirkwood marvell
......@@ -1586,14 +1661,6 @@ DTB-Id: sun6i-a31s-sinovoip-bpi-m2.dtb
U-Boot-Script-Name: bootscr.sunxi
Required-Packages: u-boot-tools
Machine: Thecus N2100
Method: redboot
Kernel-Flavors: iop32x
Machine-Id: 1101
Mtd-Kernel: kernel
Mtd-Initrd: ramdisk
Bootloader-Sets-Incorrect-Root: yes
Machine: Theobroma Systems RK3399-Q7 SoM
Kernel-Flavors: arm64
DTB-Id: rockchip/rk3399-puma-haikou.dtb
......
flash-kernel (3.98pureos+librem5.1) purple; urgency=medium
* Sync with Debian
-- Guido Günther <agx@sigxcpu.org> Tue, 09 Apr 2019 10:23:26 +0200
flash-kernel (3.98) unstable; urgency=medium
[ Vagrant Cascadian ]
* Add machine db entry for Rock64 (Closes: #906696). Thanks to Josua
Mayer.
* Add machine db entry for Banana Pi M2 Berry (Closes: #923483). Thanks
to Lucas Nussbaum.
[ Cyril Brulebois ]
* Drop support for arm*/ixp4xx and arm*/iop32x; support for those
platforms was removed from the Linux kernel and therefore d-i.
[ Heinrich Schuchardt ]
* Provide db entry for the Pine A64 LTS board (Closes: #923655).
[ Jonas Smedegaard ]
* Add an entry for Olimex A64 Teres-I (Closes: #926071).
[ Vagrant Cascadian ]
* Add entries for Raspberry Pi 1, Pi Zero and Pi 3 Compute Module
(Closes: #921518). Thanks to Alexandre GRIVEAUX.
[ Updated translations ]
* Indonesian (id.po) by Muhammad Rifqi Priyo Susanto
* Vietnamese (vi.po) by Trần Ngọc Quân
-- Holger Wansing <hwansing@mailbox.org> Thu, 04 Apr 2019 23:38:42 +0200
flash-kernel (3.97pureos+librem5.1) purple; urgency=medium
* Add support for the Librem5 dev kit.
-- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Fri, 01 Mar 2019 17:06:17 +0000
flash-kernel (3.97) UNRELEASED; urgency=medium
flash-kernel (3.97) unstable; urgency=medium
[ Vagrant Cascadian ]
* Add machine db entry for Odroid HC1 (Closes: #916980). Thanks to
Benjamin Drung.
-- Vagrant Cascadian <vagrant@debian.org> Thu, 20 Dec 2018 15:38:31 -0800
[ Karsten Merker ]
* Apply a patch from Hajo Noerenberg adding a machine db entry for
the Seagate Blackarmor NAS220 (Closes: #918193).
-- Karsten Merker <merker@debian.org> Fri, 04 Jan 2019 14:43:50 +0100
flash-kernel (3.96) unstable; urgency=medium
......
......@@ -32,7 +32,7 @@ Section: debian-installer
Priority: standard
Package-Type: udeb
Architecture: arm64 armel armhf
XB-Subarchitecture: iop32x ixp4xx kirkwood orion5x s3c24xx mx5 generic
XB-Subarchitecture: kirkwood orion5x s3c24xx mx5 generic
Provides: bootable-system
Depends: cdebconf-udeb, installed-base
XB-Installer-Menu-Item: 7300
......
......@@ -2,12 +2,6 @@
set -e
case "`archdetect`" in
arm*/iop32x)
exit 0
;;
arm*/ixp4xx)
exit 0
;;
arm*/kirkwood)
exit 0
;;
......
......@@ -18,6 +18,7 @@
# * Setyo Nugroho (setyo@gmx.net), 2004.
# * Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>, 2008-2011.
# * Al Qalit <qal.smith@gmail.com>, 2018.
# * Andika Triwidada <andika@gmail.com>, 2018.
#
# Translations from iso-codes:
# Alastair McKinstry <mckinstry@computer.org>, 2002.
......@@ -33,8 +34,9 @@ msgstr ""
"Project-Id-Version: debian-installer (level1)\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2008-06-29 08:15+0000\n"
"PO-Revision-Date: 2018-03-04 12:38+0000\n"
"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
"PO-Revision-Date: 2019-03-11 16:03+0000\n"
"Last-Translator: Muhammad Rifqi Priyo Susanto "
"<muhammadrifqipriyosusanto@gmail.com>\n"
"Language-Team: Debian Indonesia Translators <debian-l10n-indonesian@lists."
"debian.org>\n"
"Language: id\n"
......@@ -50,7 +52,7 @@ msgstr ""
#. :sl4:
#: ../flash-kernel-installer.templates:1001
msgid "Configuring flash memory to boot the system"
msgstr "Sedang mengonfigurasi memory flash untuk boot sistem"
msgstr "Sedang mengatur memori kilat untuk but sistem"
#. Type: text
#. Description
......@@ -59,7 +61,7 @@ msgstr "Sedang mengonfigurasi memory flash untuk boot sistem"
#. :sl4:
#: ../flash-kernel-installer.templates:2001
msgid "Making the system bootable"
msgstr "Membuat sistem dapat booting"
msgstr "Membuat sistem dapat but"
#. Type: text
#. Description
......@@ -68,7 +70,7 @@ msgstr "Membuat sistem dapat booting"
#. :sl4:
#: ../flash-kernel-installer.templates:3001
msgid "Preparing the system..."
msgstr "Menyiapkan sistem ..."
msgstr "Menyiapkan sistem..."
#. Type: text
#. Description
......@@ -77,7 +79,7 @@ msgstr "Menyiapkan sistem ..."
#. :sl4:
#: ../flash-kernel-installer.templates:4001
msgid "Writing the kernel to flash memory..."
msgstr "Menulis kernel ke memory flash ..."
msgstr "Menulis kernel ke memori kilat..."
#. Type: text
#. Description
......@@ -87,7 +89,7 @@ msgstr "Menulis kernel ke memory flash ..."
#. :sl4:
#: ../flash-kernel-installer.templates:5001
msgid "Generating boot image on disk..."
msgstr "Membuat citra boot pada harddisk ..."
msgstr "Membuat citra but pada diska..."
#. Type: text
#. Description
......@@ -98,4 +100,4 @@ msgstr "Membuat citra boot pada harddisk ..."
#. :sl4:
#: ../flash-kernel-installer.templates:6001
msgid "Make the system bootable"
msgstr "Buat sistem dapat boot"
msgstr "Buat sistem dapat but"
......@@ -9,16 +9,19 @@
# Jean Christophe André <progfou@gmail.com>
# Vũ Quang Trung <vu.quang.trung@auf.org>
# Trịnh Minh Thành <tmthanh@yahoo.com>
# Nguyễn Hùng Vũ <vuhung16@bigfoot.com>, 2001.
# Clytie Siddall <clytie@riverland.net.au>, 2005-2010
# Hai-Nam Nguyen <hainam@jcisio.com>, 2012
# Trần Ngọc Quân <vnwildman@gmail.com>, 2018, 2019.
#
msgid ""
msgstr ""
"Project-Id-Version: debian-installer Level 1\n"
"Project-Id-Version: debian-installer sublevel1\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2008-06-29 08:15+0000\n"
"PO-Revision-Date: 2010-09-28 18:01+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"PO-Revision-Date: 2019-02-27 14:34+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -32,7 +35,7 @@ msgstr ""
#. :sl4:
#: ../flash-kernel-installer.templates:1001
msgid "Configuring flash memory to boot the system"
msgstr "Đang cấu hình bộ nhớ khó phai để khởi động hệ thống"
msgstr "Đang cấu hình bộ nhớ flash để khởi động hệ thống"
#. Type: text
#. Description
......@@ -41,7 +44,7 @@ msgstr "Đang cấu hình bộ nhớ khó phai để khởi động hệ thống
#. :sl4:
#: ../flash-kernel-installer.templates:2001
msgid "Making the system bootable"
msgstr "Đang bật hệ thống có khả năng khởi động"
msgstr "Đang tạo hệ thống có khả năng khởi động"
#. Type: text
#. Description
......@@ -50,7 +53,7 @@ msgstr "Đang bật hệ thống có khả năng khởi động"
#. :sl4:
#: ../flash-kernel-installer.templates:3001
msgid "Preparing the system..."
msgstr "Đang chuẩn bị hệ thống..."
msgstr "Đang chuẩn bị hệ thống"
#. Type: text
#. Description
......@@ -59,7 +62,7 @@ msgstr "Đang chuẩn bị hệ thống..."
#. :sl4:
#: ../flash-kernel-installer.templates:4001
msgid "Writing the kernel to flash memory..."
msgstr "Đang ghi hạt nhân vào bộ nhớ khó phai..."
msgstr "Đang ghi hạt nhân vào bộ nhớ flash…"
#. Type: text
#. Description
......@@ -69,7 +72,7 @@ msgstr "Đang ghi hạt nhân vào bộ nhớ khó phai..."
#. :sl4:
#: ../flash-kernel-installer.templates:5001
msgid "Generating boot image on disk..."
msgstr "Đang tạo ảnh khởi động trên đĩa..."
msgstr "Đang tạo ảnh khởi động trên đĩa"
#. Type: text
#. Description
......@@ -80,4 +83,4 @@ msgstr "Đang tạo ảnh khởi động trên đĩa..."
#. :sl4:
#: ../flash-kernel-installer.templates:6001
msgid "Make the system bootable"
msgstr "Bật hệ thống có khả năng khởi động"
msgstr "Làm cho thống có khả năng khởi động"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment