From 758fef99c96d8fddce66572ce0f425468ef7c8a7 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Wed, 11 Mar 2020 20:01:45 +0100
Subject: [PATCH] [all] add post-installs and change order of packages
---
devices/n5x | 18 ------------------
devices/oc2 | 7 ++++---
devices/on2 | 5 +++--
devices/pbpro | 5 +++--
devices/pine64 | 6 +++---
devices/{sopine => pine64-lts} | 7 +++----
devices/pinebook | 6 +++---
devices/rock64 | 7 ++++---
devices/rockpi4 | 5 +++--
devices/rockpro64 | 5 +++--
devices/rpi3 | 7 ++++---
devices/rpi3-fta | 7 ++++---
devices/rpi4 | 5 +++--
devices/vim1 | 7 ++++---
devices/vim2 | 7 ++++---
devices/vim3 | 5 +++--
16 files changed, 51 insertions(+), 58 deletions(-)
delete mode 100644 devices/n5x
rename devices/{sopine => pine64-lts} (89%)
diff --git a/devices/n5x b/devices/n5x
deleted file mode 100644
index 65dc3682..00000000
--- a/devices/n5x
+++ /dev/null
@@ -1,18 +0,0 @@
-## Maintained by: Dodgejcr ##
-
-# Kernels and bootloader
-
-# Other firmware and stuff
-
-# Video and other drivers
-
-# Android packages
-#android-headers
-#lxc-android-git
-#xf86-video-hwcomposer
-#drihybris
-#glamor-hybris
-#libhybris-xorg
-#libhybris
-#hybris-android-headers-7
-#hybris-usb
diff --git a/devices/oc2 b/devices/oc2
index 76899ed4..03effda1 100644
--- a/devices/oc2
+++ b/devices/oc2
@@ -6,9 +6,10 @@ uboot-odroid-c2-mainline
bootsplash-theme-manjaro
bootsplash-systemd
+# Video driver
+xf86-video-fbturbo-git
+
# Other device specific packages
fbset
amlogic
-
-# Video driver
-xf86-video-fbturbo-git
+oc2-post-install
diff --git a/devices/on2 b/devices/on2
index 5e423a79..7d35c7a8 100644
--- a/devices/on2
+++ b/devices/on2
@@ -6,7 +6,8 @@ uboot-odroid-n2
bootsplash-theme-manjaro
bootsplash-systemd
+# Video driver
+
# Other device specific packages
fbset
-
-# Video driver
+on2-post-install
diff --git a/devices/pbpro b/devices/pbpro
index 61fd6678..b21e53d6 100644
--- a/devices/pbpro
+++ b/devices/pbpro
@@ -6,9 +6,10 @@ uboot-pinebookpro
bootsplash-theme-manjaro
bootsplash-systemd
+# Video drivers
+
# Other device specific packages
ap6256-firmware
wpa_supplicant
+pinebookpro-audio
pinebookpro-post-install
-
-# Video drivers
diff --git a/devices/pine64 b/devices/pine64
index db5ecb95..a514e1b7 100644
--- a/devices/pine64
+++ b/devices/pine64
@@ -6,9 +6,9 @@ uboot-pine64-git
bootsplash-theme-manjaro
bootsplash-systemd
-# Other device specific packages
-pinebook-post-install
-
# Video drivers
xf86-video-fbturbo-git
+
+# Other device specific packages
+pinebook-post-install
diff --git a/devices/sopine b/devices/pine64-lts
similarity index 89%
rename from devices/sopine
rename to devices/pine64-lts
index a401ae7e..c4298d38 100644
--- a/devices/sopine
+++ b/devices/pine64-lts
@@ -6,9 +6,8 @@ uboot-pine64-git
bootsplash-theme-manjaro
bootsplash-systemd
-# Other device specific packages
-pinebook-post-install
-
-
# Video drivers
+xf86-video-fbturbo-git
+# Other device specific packages
+pinebook-post-install
diff --git a/devices/pinebook b/devices/pinebook
index d4047387..e9285c22 100644
--- a/devices/pinebook
+++ b/devices/pinebook
@@ -7,11 +7,11 @@ uboot-pine64-git
bootsplash-theme-manjaro
bootsplash-systemd
+# Video drivers
+xf86-video-fbturbo-git
+
# Other device specific packages
dkms-rtl8723cs
rtl8723bt-firmware
wpa_supplicant
pinebook-post-install
-
-# Video drivers
-xf86-video-fbturbo-git
diff --git a/devices/rock64 b/devices/rock64
index c2436415..d8b63bd6 100644
--- a/devices/rock64
+++ b/devices/rock64
@@ -6,7 +6,8 @@ uboot-rock64
bootsplash-theme-manjaro
bootsplash-systemd
-# Other device specific packages
-
# Video drivers
-xf86-video-fbturbo-git #needed because lima/panfrost is not working properly yet
+xf86-video-fbturbo-git
+
+# Other device specific packages
+rock64-post-install
diff --git a/devices/rockpi4 b/devices/rockpi4
index 9afc987d..987daf8b 100644
--- a/devices/rockpi4
+++ b/devices/rockpi4
@@ -6,8 +6,9 @@ uboot-rockpi4
bootsplash-theme-manjaro
bootsplash-systemd
+# Video drivers
+
# Other device specific packages
ap6256-firmware
wpa_supplicant
-
-# Video drivers
+rockpi4-post-install
diff --git a/devices/rockpro64 b/devices/rockpro64
index aface8e3..13bc96b9 100644
--- a/devices/rockpro64
+++ b/devices/rockpro64
@@ -6,6 +6,7 @@ uboot-rockpro64
bootsplash-theme-manjaro
bootsplash-systemd
-# Other device specific packages
-
# Video drivers
+
+# Other device specific packages
+rockpro64-post-install
diff --git a/devices/rpi3 b/devices/rpi3
index 846d0094..1d9e81bf 100644
--- a/devices/rpi3
+++ b/devices/rpi3
@@ -6,10 +6,11 @@ raspberrypi-bootloader
bootsplash-theme-manjaro
bootsplash-systemd
+# Video driver
+xf86-video-fbturbo-git
+
# Other device specific packages
firmware-raspberrypi
pi-bluetooth
wpa_supplicant
-
-# Video driver
-xf86-video-fbturbo-git
+rpi3-post-install
diff --git a/devices/rpi3-fta b/devices/rpi3-fta
index f428dec2..dcaef55d 100644
--- a/devices/rpi3-fta
+++ b/devices/rpi3-fta
@@ -9,11 +9,12 @@ raspberrypi-bootloader
bootsplash-theme-manjaro
bootsplash-systemd
+# Video driver
+#xf86-video-fbturbo-git
+
# Other device specific packages
firmware-raspberrypi
#pi-bluetooth
wpa_supplicant
#brcm-patchram-plus
-
-# Video driver
-#xf86-video-fbturbo-git
+rpi3-post-install
diff --git a/devices/rpi4 b/devices/rpi4
index f93650db..c62beb48 100644
--- a/devices/rpi4
+++ b/devices/rpi4
@@ -7,10 +7,11 @@ raspberrypi-bootloader
bootsplash-theme-manjaro
bootsplash-systemd
+# Video driver
+
# Other device specific packages
firmware-raspberrypi
pi-bluetooth
wpa_supplicant
brcm-patchram-plus #fixes bluetooth
-
-# Video driver
+rpi4-post-install
diff --git a/devices/vim1 b/devices/vim1
index f1830617..fc9ed071 100644
--- a/devices/vim1
+++ b/devices/vim1
@@ -6,10 +6,11 @@ boot-vim1
bootsplash-theme-manjaro
bootsplash-systemd
+# Video driver
+xf86-video-fbturbo-git
+
# Other device specific packages
#bluetooth-vim3
khadas-utils
fbset
-
-# Video driver
-xf86-video-fbturbo-git
+vim3-post-install
diff --git a/devices/vim2 b/devices/vim2
index 70385ea7..632c76cc 100644
--- a/devices/vim2
+++ b/devices/vim2
@@ -6,10 +6,11 @@ boot-vim2
bootsplash-theme-manjaro
bootsplash-systemd
+# Video driver
+xf86-video-fbturbo-git
+
# Other device specific packages
#bluetooth-vim3'
khadas-utils
fbset
-
-# Video driver
-xf86-video-fbturbo-git
+vim3-post-install
diff --git a/devices/vim3 b/devices/vim3
index ad61a890..b54cfad8 100644
--- a/devices/vim3
+++ b/devices/vim3
@@ -6,10 +6,11 @@ boot-vim3
bootsplash-theme-manjaro
bootsplash-systemd
+# Video driver
+
# Other device specific packages
ap6398s-firmware
bluetooth-vim3
khadas-utils
fbset
-
-# Video driver
+vim3-post-install
--
GitLab