aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Riomar <henrik.riomar@gmail.com>2019-12-22 10:54:53 +0100
committerLeo <thinkabit.ukim@gmail.com>2019-12-25 13:00:32 +0100
commita3fff1a0e73fec7b59e70ba30a42d4243c9b2e29 (patch)
tree1cd952d8e76c172b0557c5a48ce1837e1fbbf409
parent27b3948601965509fee472f606c59626221f5398 (diff)
downloadaports-a3fff1a0e73fec7b59e70ba30a42d4243c9b2e29.tar.gz
aports-a3fff1a0e73fec7b59e70ba30a42d4243c9b2e29.tar.bz2
aports-a3fff1a0e73fec7b59e70ba30a42d4243c9b2e29.tar.xz
main/mkinitfs: backport rpirtc support
Backport rpirtc fix
-rw-r--r--main/mkinitfs/APKBUILD6
-rw-r--r--main/mkinitfs/add-feature-rpirtc.patch44
2 files changed, 48 insertions, 2 deletions
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 92c7deaf5b..aa130af24e 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -2,7 +2,7 @@
pkgname=mkinitfs
pkgver=3.4.1
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
pkgdesc="Tool to generate initramfs images for Alpine"
url="https://git.alpinelinux.org/cgit/mkinitfs"
arch="all"
@@ -17,6 +17,7 @@ subpackages="$pkgname-doc"
install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
triggers="$pkgname.trigger=/usr/share/kernel/*"
source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
+ add-feature-rpirtc.patch
"
builddir="$srcdir/$pkgname-$_ver"
@@ -31,4 +32,5 @@ package() {
make install DESTDIR="$pkgdir"
}
-sha512sums="3839f3ec4ca9f7318a611397c7190d19ae2267f31ffa97bb3777a024940799bccef3db7374d3c840b95290c493b2d3795ed2d03d72eb984c202de00c182eef77 mkinitfs-3.4.1.tar.xz"
+sha512sums="3839f3ec4ca9f7318a611397c7190d19ae2267f31ffa97bb3777a024940799bccef3db7374d3c840b95290c493b2d3795ed2d03d72eb984c202de00c182eef77 mkinitfs-3.4.1.tar.xz
+52a53a936cbe3771c5316cf5c40ef14eca31556f5559af98389955d1924509db65c550f07eaa9af2afe294dc79eaeb916499b8c9e7386646c40419d868b32d28 add-feature-rpirtc.patch"
diff --git a/main/mkinitfs/add-feature-rpirtc.patch b/main/mkinitfs/add-feature-rpirtc.patch
new file mode 100644
index 0000000000..b011427d66
--- /dev/null
+++ b/main/mkinitfs/add-feature-rpirtc.patch
@@ -0,0 +1,44 @@
+From 9750fe09a0c322f3d669a31179c87ffade7b1dd7 Mon Sep 17 00:00:00 2001
+From: Henrik Riomar <henrik.riomar@gmail.com>
+Date: Tue, 15 Oct 2019 12:59:43 +0200
+Subject: [PATCH] add feature rpirtc
+
+Add new feature rpi rtc allowing a hw rtc to be used.
+
+The init script in Alpine Linux since v3.9 looks for /dev/rtc, if
+not found it will switch to swclock.
+
+To make this check work on a Rasberry PI with a mounted rtc and
+the following in usercfg.txt
+ dtoverlay=i2c-rtc,ds3231
+we must have rtc drivers available already initramfs.
+
+(cherry picked from commit 89f9c4fb0dd3a69dea4cb7ecead55692c9732e06)
+---
+ Makefile | 1 +
+ features.d/rpirtc.modules | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 features.d/rpirtc.modules
+
+diff --git a/Makefile b/Makefile
+index c48c568..ae1d1ce 100644
+--- a/Makefile
++++ b/Makefile
+@@ -43,6 +43,7 @@ CONF_FILES := mkinitfs.conf \
+ features.d/raid.files \
+ features.d/raid.modules \
+ features.d/reiserfs.modules \
++ features.d/rpirtc.modules \
+ features.d/scsi.modules \
+ features.d/squashfs.modules \
+ features.d/ubifs.modules \
+diff --git a/features.d/rpirtc.modules b/features.d/rpirtc.modules
+new file mode 100644
+index 0000000..91c8ad3
+--- /dev/null
++++ b/features.d/rpirtc.modules
+@@ -0,0 +1 @@
++kernel/drivers/rtc/rtc-ds1307.ko
+--
+2.24.1
+