Commit 386aab2a authored by Timo Teräs's avatar Timo Teräs

main/mkinitfs: upgrade to 3.0.6

fixes #6217
fixes #6469
fixes #6473
parent e3f10ac9
From e2aa461b2e6385ff5a38278425132dbb850bb3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Wed, 10 Aug 2016 15:16:06 +0200
Subject: [PATCH] group: sync with alpine-baselayout
---
group | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/group b/group
index 5a6cbcc..9559744 100644
--- a/group
+++ b/group
@@ -21,34 +21,28 @@ cdrom:x:19:
dialout:x:20:root
ftp:x:21:
sshd:x:22:
+input:x:23:
at:x:25:at
tape:x:26:root
video:x:27:root
netdev:x:28:
readproc:x:30:
squid:x:31:squid
-gdm:x:32:gdm
xfs:x:33:xfs
kvm:x:34:kvm
games:x:35:
-named:x:40:named
-mysql:x:60:
+shadow:x:42:
postgres:x:70:
cdrw:x:80:
-apache:x:81:
-nut:x:84:
usb:x:85:
-avahi:x:86:
vpopmail:x:89:
users:x:100:games
ntp:x:123:
nofiles:x:200:
-postfix:x:207:
-postdrop:x:208:
smmsp:x:209:smmsp
-distcc:x:240:
-slocate:x:245:
+locate:x:245:
abuild:x:300:
utmp:x:406:
+ping:x:999:
nogroup:x:65533:
nobody:x:65534:
--
2.9.1
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
From 46de24c44c1b1c3a5fe92e5c4d28c650798bd8d7 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 4 Aug 2016 13:24:46 +0200
Subject: [PATCH] init: dont use local in global scope
---
initramfs-init.in | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/initramfs-init.in b/initramfs-init.in
index 639826c..6b03fbb 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -479,12 +479,11 @@ fi
if [ "$KOPT_splash" != "no" ]; then
echo "IMAGE_ALIGN=CM" > /tmp/fbsplash.cfg
- local fbdev img
for fbdev in /dev/fb[0-9]; do
[ -e "$fbdev" ] || break
- local num="${fbdev#/dev/fb}"
+ num="${fbdev#/dev/fb}"
for img in /media/*/fbsplash$num.ppm; do
- local config="${img%.*}.cfg"
+ config="${img%.*}.cfg"
[ -e "$config" ] || config=/tmp/fbsplash.cfg
fbsplash -s "$img" -d "$fbdev" -i "$config"
break
@@ -498,7 +497,7 @@ fi
if [ -n "$fbsplash" ] && [ -e "$fbsplash" ]; then
ebegin "Starting bootsplash"
mkfifo $sysroot/$splashfile
- local config="${fbsplash%.*}.cfg"
+ config="${fbsplash%.*}.cfg"
[ -e "$config" ] || config=/tmp/fbsplash.cfg
setsid fbsplash -T 16 -s "$fbsplash" -i $config -f $sysroot/$splashfile &
eend 0
--
2.9.1
From 3e2519f2930a318ef06ffb8bac01bae6fc1ee218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Wed, 13 Jul 2016 14:49:28 +0000
Subject: [PATCH 1/4] mkinitfs: add -K flag to copy host keys to new initramfs
this is mainly to copy the developer keys present on build system
to the target initramfs. simplifies creating your own initramfs
and when your key is not packaged.
---
mkinitfs.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/mkinitfs.in b/mkinitfs.in
index 555bea8..d69ccc5 100755
--- a/mkinitfs.in
+++ b/mkinitfs.in
@@ -133,6 +133,7 @@ initfs_firmware() {
initfs_apk_keys() {
mkdir -p "$tmpdir"/etc/apk/keys
+ [ "$hostkeys" ] && cp "/etc/apk/keys/"* "$tmpdir"/etc/apk/keys/
cp "${basedir}etc/apk/keys/"* "$tmpdir"/etc/apk/keys/
}
@@ -148,7 +149,7 @@ initfs_cpio() {
usage() {
cat <<EOF
-usage: mkinitfs [-hkLl] [-b basedir] [-c configfile] [-F features] [-f fstab]
+usage: mkinitfs [-hkKLl] [-b basedir] [-c configfile] [-F features] [-f fstab]
[-i initfile ] [-o outfile] [-t tempdir] [kernelversion]"
options:
-b prefix files and kernel modules with basedir
@@ -158,6 +159,7 @@ options:
-h print this help
-i use initfile as init instead of $init
-k keep tempdir
+ -K copy also host keys to initramfs
-l only list files that would have been used
-L list available features
-o set another outfile
@@ -171,7 +173,7 @@ EOF
# main
-while getopts "b:c:f:F:hi:kLlo:qt:" opt; do
+while getopts "b:c:f:F:hi:kKLlo:qt:" opt; do
case "$opt" in
b) basedir="$OPTARG";;
c) config="$OPTARG";;
@@ -180,6 +182,7 @@ while getopts "b:c:f:F:hi:kLlo:qt:" opt; do
h) usage;;
i) init=$OPTARG;;
k) keeptmp=1;;
+ K) hostkeys=1;;
L) list_features=1;;
l) list_sources=1;;
o) outfile="$OPTARG";;
--
2.9.3
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mkinitfs
pkgver=3.0.5
pkgver=3.0.6
_ver=${pkgver%_git*}
pkgrel=4
pkgrel=0
pkgdesc="Tool to generate initramfs images for Alpine"
url="http://git.alpinelinux.org/cgit/mkinitfs"
makedepends_build=""
......@@ -12,10 +12,6 @@ depends="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
0001-init-dont-use-local-in-global-scope.patch
0001-group-sync-with-alpine-baselayout.patch
0001-mkinitfs-add-K-flag-to-copy-host-keys-to-new-initram.patch
"
arch="all"
license="GPL2"
......@@ -31,18 +27,6 @@ package() {
make install DESTDIR="$pkgdir" || return 1
}
md5sums="de3f95912a542dfabbf0573620549a29 mkinitfs-3.0.5.tar.xz
a4227598291fa7338ad1128bfef3720c 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch
a74631b5f40001dd259a2a6ebcaec544 0001-init-dont-use-local-in-global-scope.patch
db888a1a502fe281bbe0b1add81bf62f 0001-group-sync-with-alpine-baselayout.patch
a46eb97de6742400ca04777a0a8478b2 0001-mkinitfs-add-K-flag-to-copy-host-keys-to-new-initram.patch"
sha256sums="3f13619f161c506796b91f2db17644eba25c2ffc923aa0c8fff0213d1f660aa4 mkinitfs-3.0.5.tar.xz
17547dbc77bd19d940550ea6243b44212d21a6797aee4202e4e22c31143bf9e6 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch
7253cd8ebc1487e4bfb98d81edd68b24a4364e9fa8e48c73fc6903f2077b056e 0001-init-dont-use-local-in-global-scope.patch
17b8a04db505eea9e176da00f9389ca80f65ed88c0288f6785f9ab108164361a 0001-group-sync-with-alpine-baselayout.patch
8daccc844576f0b06fc9c15a30d750bfecda019b476a0be4cf9bcd7139e219cf 0001-mkinitfs-add-K-flag-to-copy-host-keys-to-new-initram.patch"
sha512sums="246f25ce3fb65ea19dbe611ad44a106930c28b2c7111908462d4a252433011280715b2cf87ee81cc6f0860679fd1d0a109d03040647498137e42b22ccc711662 mkinitfs-3.0.5.tar.xz
35b4cf3f74e394d87b321d335ec4dff6973bfd9a38cdc81609e21e025ee3fb9af7d2744cf9941531603df829af1f7fba433074915ba88a688d375cfe40dad07a 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch
ca1bd66bc6d366dc74da389397f3e0d81b3afa21a534269230ab33f415e633b19ce54327b78713847461b67d6d23a85019c79e1fbbf1a964ee0bd26013ddf33f 0001-init-dont-use-local-in-global-scope.patch
2736650e0c06d47f2cd0dcc4a9c3d575b2b5284ee8d1aa0cccd45b5855ff6704171f5b7761b8c88536c8dca84943810e9332db9f2e03681f6355c5068a3a3092 0001-group-sync-with-alpine-baselayout.patch
712038089d3b58a3937549f25412803291690c992bd8e3002f02a46fc9c24903c94086704b5def3aecb422d46d7c501beeaa665000bc7da6ec20965e52eca5a1 0001-mkinitfs-add-K-flag-to-copy-host-keys-to-new-initram.patch"
md5sums="738598b3d7c65be92662b6fbe81decaa mkinitfs-3.0.6.tar.xz"
sha256sums="49a2b1f94b086ca9b984614ec6e66768a6c49d10aab35cdc811d0b5688f2c26a mkinitfs-3.0.6.tar.xz"
sha512sums="f8bae2b934e6beb7f6d9538c1f30b05299c38a86b602675d5bba423f54f999552e906c371a9be7b35f4fd7eb0fe10798b5eb45411b1c6ddf790de3951dce1bbe mkinitfs-3.0.6.tar.xz"
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