Change to get common packages from 'config/*.packages

Signed-off-by: Dongjin Kim <tobetter@gmail.com> Change-Id: Ie22a6c70d76f1b9fc93a063af43735bce7ad8556
2025-12-19 01:58:41 +09:00 · 2020-11-20 22:01:54 +09:00
parent 7147538f8c
commit 4021644f94
9 changed files with 15 additions and 12 deletions
--- a/boards/odroidc2/packages
+++ b/boards/odroidc2/packages
@@ -1,2 +1 @@
 flash-kernel
-openssh-server
--- a/boards/odroidc4/packages
+++ b/boards/odroidc4/packages
@@ -1 +0,0 @@
-openssh-server
--- a/boards/odroidgo2/packages
+++ b/boards/odroidgo2/packages
@@ -1 +0,0 @@
-openssh-server
--- a/boards/odroidhc4/packages
+++ b/boards/odroidhc4/packages
@@ -1,2 +1 @@
-openssh-server
 odroid-homecloud-display
--- a/boards/odroidn2/packages
+++ b/boards/odroidn2/packages
@@ -1 +0,0 @@
-openssh-server
--- a/boards/odroidn2plus/packages
+++ b/boards/odroidn2plus/packages
@@ -1,2 +0,0 @@
-openssh-server
-neofetch
--- a/boards/odroidxu4/packages
+++ b/boards/odroidxu4/packages
@@ -1,3 +1,2 @@
 flash-kernel
 u-boot-exynos
-openssh-server
--- a/configs/groovy-server.packages
+++ b/configs/groovy-server.packages
@@ -0,0 +1,5 @@
+openssh-server
+neofetch
+fdisk
+parted
+vim
--- a/14
+++ b/14
@@ -81,11 +81,17 @@ get_kernel_cmdline_defaults() {
    echo ""
 }

+get_packages() {
+    [ -f ${1} ] && cat ${1}
+}
+
 get_flavour_packages() {
-    [ -f boards/${BOARD}/packages ] && \
-        DEFAULT_FLAVOUR_PACKAGES=`cat boards/${BOARD}/packages | \
-            sort | tr "\n" " "`
-    echo ${DEFAULT_FLAVOUR_PACKAGES}
+    local pkgs=""
+
+    pkgs="${pkgs} $(get_packages configs/${DISTRO}-${FLAVOUR}.packages)"
+    pkgs="${pkgs} $(get_packages boards/${BOARD}/packages)"
+
+    echo ${pkgs} | tr " " "\n" | sort | uniq | tr "\n" " "
 }

 get_lookback_device() {