From 9f07a980bfe4bf407261e64ec5d77f317e528a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 28 Sep 2020 22:17:22 +0200
Subject: pkgs-root: expand and fix raspberry pi 2

---
 pkgs-root/APKBUILD | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs-root/APKBUILD b/pkgs-root/APKBUILD
index 4725429..0d61e0b 100644
--- a/pkgs-root/APKBUILD
+++ b/pkgs-root/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Karel Kočí <cynerd@email.cz>
 # Maintainer: Karel Kočí <cynerd@email.cz>
 pkgname=pkgs-root
-pkgver=0.3.14
+pkgver=0.3.15
 pkgrel=1
 pkgdesc="Personal root package"
 url="https://git.cynerd.cz/alpine-personal-pkgs/"
@@ -12,7 +12,9 @@ options="!check"
 subpackages="
 	$pkgname-base:base
 	$pkgname-virtual:virtual
+	$pkgname-rpi-common:rpi_common
 	$pkgname-rpi:rpi
+	$pkgname-rpi2:rpi2
 	$pkgname-rpi-wireless:rpi_wireless
 	$pkgname-mpd:mpd
 	$pkgname-kodi:kodi
@@ -29,7 +31,7 @@ base() {
 	depends="
 		alpine-base
 		personal-repo
-		acct-cynerd
+		acct acct-cynerd
 
 		chrony
 		openssh
@@ -41,6 +43,7 @@ base() {
 		util-linux
 		rsync curl file tree findutils
 		vim htop ncdu
+		parted
 	"
 	mkdir -p "$pkgdir-base"
 }
@@ -54,17 +57,32 @@ virtual() {
 	mkdir -p "$pkgdir-virtual"
 }
 
-rpi() {
+rpi_common() {
 	depends="
 		$pkgname-base
 		btrfs-progs
-		linux-rpi raspberrypi-bootloader mesa-dri-vc4
-		raspberrypi
+		raspberrypi raspberrypi-bootloader
 		zram-init-openrc
 	"
+	mkdir -p "$pkgdir-rpi-common"
+}
+
+rpi() {
+	depends="
+		$pkgname-rpi-common
+		linux-rpi mesa-dri-vc4
+	"
 	mkdir -p "$pkgdir-rpi"
 }
 
+rpi2() {
+	depends="
+		$pkgname-rpi-common
+		linux-rpi2
+	"
+	mkdir -p "$pkgdir-rpi2"
+}
+
 rpi_wireless() {
 	depends="
 		$pkgname-rpi
@@ -139,7 +157,7 @@ host_public() {
 
 host_mpd_home() {
 	depends="
-		$pkgname-rpi
+		$pkgname-rpi2
 		$pkgname-mpd
 	"
 	mkdir -p "$pkgdir-host-mpd-home"
-- 
cgit v1.2.3