diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-20 14:42:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-20 14:46:09 +0000 |
| commit | 1b0a3e1c91915514f56293cb07768be638846185 (patch) | |
| tree | 1a2daf61960190ec54e1520305987213a2e141b4 /main | |
| parent | e504f0a528f8a21d954593a74579facfb72df72b (diff) | |
| download | aports-1b0a3e1c91915514f56293cb07768be638846185.tar.bz2 aports-1b0a3e1c91915514f56293cb07768be638846185.tar.xz | |
main/mkinitfs: fix ttyMFD/ttyUSB serial consoles and use 115200 speed
ref #5759
Diffstat (limited to 'main')
| -rw-r--r-- | main/mkinitfs/0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch | 28 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 12 |
2 files changed, 36 insertions, 4 deletions
diff --git a/main/mkinitfs/0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch b/main/mkinitfs/0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch new file mode 100644 index 0000000000..1df20a507a --- /dev/null +++ b/main/mkinitfs/0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch @@ -0,0 +1,28 @@ +From 77a16e989a53d39a122c16f690b896bed97707a0 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 20 Jun 2016 14:29:19 +0000 +Subject: [PATCH] init: add support for ttyMFD and ttyUSB serial console + +and set default speed to 115200. +--- + initramfs-init.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 10bc3ea..8a3014f 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -112,8 +112,8 @@ setup_inittab_console(){ + local line= + local term= + case "$tty" in +- ttyS*) +- [ "$speed" = "$1" ] && speed=9600 ++ ttyS*|ttyMFD*|ttyUSB*) ++ [ "$speed" = "$1" ] && speed=115200 + term=vt100 + line=-L + ;; +-- +2.9.0 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 4d0f3fd2ce..1c538b0f33 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=3.0.5 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url="http://git.alpinelinux.org/cgit/mkinitfs" makedepends="kmod-dev util-linux-dev cryptsetup-dev linux-headers" @@ -10,6 +10,7 @@ depends="acct busybox apk-tools>=2.0 lddtree>=1.25" install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz + 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch " arch="all" license="GPL2" @@ -35,6 +36,9 @@ package() { cd "$_builddir" make install DESTDIR="$pkgdir" || return 1 } -md5sums="de3f95912a542dfabbf0573620549a29 mkinitfs-3.0.5.tar.xz" -sha256sums="3f13619f161c506796b91f2db17644eba25c2ffc923aa0c8fff0213d1f660aa4 mkinitfs-3.0.5.tar.xz" -sha512sums="246f25ce3fb65ea19dbe611ad44a106930c28b2c7111908462d4a252433011280715b2cf87ee81cc6f0860679fd1d0a109d03040647498137e42b22ccc711662 mkinitfs-3.0.5.tar.xz" +md5sums="de3f95912a542dfabbf0573620549a29 mkinitfs-3.0.5.tar.xz +a4227598291fa7338ad1128bfef3720c 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch" +sha256sums="3f13619f161c506796b91f2db17644eba25c2ffc923aa0c8fff0213d1f660aa4 mkinitfs-3.0.5.tar.xz +17547dbc77bd19d940550ea6243b44212d21a6797aee4202e4e22c31143bf9e6 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch" +sha512sums="246f25ce3fb65ea19dbe611ad44a106930c28b2c7111908462d4a252433011280715b2cf87ee81cc6f0860679fd1d0a109d03040647498137e42b22ccc711662 mkinitfs-3.0.5.tar.xz +35b4cf3f74e394d87b321d335ec4dff6973bfd9a38cdc81609e21e025ee3fb9af7d2744cf9941531603df829af1f7fba433074915ba88a688d375cfe40dad07a 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch" |