Refactor directory structure referring build materials

New directory: distro/<DISTRO>/<FLAVOUR> DISTRO bionic, focal, buster, bullseye, ... FLAVOUR server, gnome-desktop, mate-desktop, ... Signed-off-by: Dongjin Kim <tobetter@gmail.com> Change-Id: I41482356e958fc5c7591bedee651376dc6e903aa
2025-12-19 01:48:42 +09:00 · 2022-03-06 01:06:30 +09:00
parent 60d20f79c8
commit 2a81214a53
34 changed files with 51 additions and 15 deletions
--- a/configs/bionic-gnome-desktop
+++ b/configs/bionic-gnome-desktop
--- a/configs/bionic-mate-desktop
+++ b/configs/bionic-mate-desktop
--- a/configs/bionic-server
+++ b/configs/bionic-server
--- a/configs/bionic-xfce4-desktop
+++ b/configs/bionic-xfce4-desktop
--- a/configs/bookworm-server.packages
+++ b/configs/bookworm-server.packages
@@ -1 +0,0 @@
-buster-server.packages
--- a/configs/bullseye-server.packages
+++ b/configs/bullseye-server.packages
@@ -1 +0,0 @@
-buster-server.packages
--- a/configs/disco-gnome-desktop
+++ b/configs/disco-gnome-desktop
--- a/configs/disco-mate-desktop
+++ b/configs/disco-mate-desktop
--- a/configs/disco-server
+++ b/configs/disco-server
--- a/configs/disco-xfce4-desktop
+++ b/configs/disco-xfce4-desktop
--- a/configs/focal-server.packages
+++ b/configs/focal-server.packages
@@ -1 +0,0 @@
-groovy-server.packages
--- a/distro/bionic/gnome-desktop/functions
+++ b/distro/bionic/gnome-desktop/functions
--- a/distro/bionic/gnome-desktop/overlay/etc/default/desktop
+++ b/distro/bionic/gnome-desktop/overlay/etc/default/desktop
--- a/distro/bionic/gnome-desktop/packages
+++ b/distro/bionic/gnome-desktop/packages
@@ -1,7 +1,5 @@
+ubuntu-desktop^
 openssh-server
 neofetch
-fdisk
-parted
-vim
 net-tools
 netplan.io
--- a/distro/bionic/kde-desktop/functions
+++ b/distro/bionic/kde-desktop/functions
@@ -0,0 +1,7 @@
+allow_root_login() {
+    echo true
+}
+
+get_default_apt_options() {
+	echo "-y"
+}
--- a/configs/focal-gnome-desktop.packages
+++ b/configs/focal-gnome-desktop.packages
@@ -1,4 +1,4 @@
-ubuntu-gnome-desktop
+kubuntu-desktop^
 openssh-server
 neofetch
 net-tools
--- a/distro/bionic/lxde-desktop/functions
+++ b/distro/bionic/lxde-desktop/functions
@@ -0,0 +1,3 @@
+allow_root_login() {
+    echo true
+}
--- a/distro/bionic/lxde-desktop/packages
+++ b/distro/bionic/lxde-desktop/packages
@@ -0,0 +1,5 @@
+lubuntu-desktop^
+openssh-server
+neofetch
+net-tools
+netplan.io
--- a/distro/bionic/mate-desktop/functions
+++ b/distro/bionic/mate-desktop/functions
@@ -0,0 +1,3 @@
+allow_root_login() {
+    echo true
+}
--- a/distro/bionic/mate-desktop/packages
+++ b/distro/bionic/mate-desktop/packages
@@ -0,0 +1,5 @@
+ubuntu-mate-desktop^
+openssh-server
+neofetch
+net-tools
+netplan.io
--- a/distro/bionic/server/functions
+++ b/distro/bionic/server/functions
@@ -0,0 +1,3 @@
+allow_root_login() {
+    echo true
+}
--- a/configs/groovy-server.packages
+++ b/configs/groovy-server.packages
--- a/distro/bionic/xfce-desktop/functions
+++ b/distro/bionic/xfce-desktop/functions
@@ -0,0 +1,3 @@
+allow_root_login() {
+    echo true
+}
--- a/distro/bionic/xfce-desktop/packages
+++ b/distro/bionic/xfce-desktop/packages
@@ -0,0 +1,5 @@
+xubuntu-desktop^
+openssh-server
+neofetch
+net-tools
+netplan.io
--- a/distro/bookworm
+++ b/distro/bookworm
@@ -0,0 +1 @@
+buster
--- a/distro/bullseye
+++ b/distro/bullseye
@@ -0,0 +1 @@
+buster
--- a/configs/buster-server.packages
+++ b/configs/buster-server.packages
--- a/distro/disco
+++ b/distro/disco
@@ -0,0 +1 @@
+bionic
--- a/distro/focal
+++ b/distro/focal
@@ -0,0 +1 @@
+bionic
--- a/distro/groovy
+++ b/distro/groovy
@@ -0,0 +1 @@
+bionic
--- a/distro/hirsute
+++ b/distro/hirsute
@@ -0,0 +1 @@
+bionic
--- a/8
+++ b/8
@@ -114,9 +114,9 @@ get_packages() {
 get_flavour_packages() {
    local pkgs=""

-    pkgs="${pkgs} $(get_packages configs/${DISTRO}-${FLAVOUR}.packages)"
+    pkgs="${pkgs} $(get_packages distro/${DISTRO}/${FLAVOUR}/packages)"
    pkgs="${pkgs} $(get_packages boards/${BOARD}/packages)"
-    pkgs="${pkgs} $(get_packages boards/${BOARD}/${DISTRO}-${FLAVOUR}.packages)"
+    pkgs="${pkgs} $(get_packages boards/${BOARD}/distro/${DISTRO}/${FLAVOUR}/packages)"
    [ -f custom/${CUSTOMOS}/packages ] &&
        pkgs="${pkgs} $(get_packages custom/${CUSTOMOS}/packages)"

@@ -434,8 +434,8 @@ do_run_fixups() {

    [ -d ${TOPDIR}/overlay ] && rsync -a ${TOPDIR}/overlay/* ${rootfs_mnt}/overlay/
    [ -d ${WORKDIR}/overlay ] && rsync -a ${WORKDIR}/overlay/* ${rootfs_mnt}/overlay/
-    [ -d ${TOPDIR}/flavour/${DISTRO}/${FLAVOUR}/overlay ] \
-        && rsync -a ${TOPDIR}/flavour/${DISTRO}/${FLAVOUR}/overlay/* ${rootfs_mnt}/overlay
+    [ -d ${TOPDIR}/distro/${DISTRO}/${FLAVOUR}/overlay ] \
+        && rsync -a ${TOPDIR}/distro/${DISTRO}/${FLAVOUR}/overlay/* ${rootfs_mnt}/overlay
    [ -d ${TOPDIR}/custom/${CUSTOMOS}/overlay ] \
        && rsync -a ${TOPDIR}/custom/${CUSTOMOS}/overlay/* ${rootfs_mnt}/overlay/

--- a/5
+++ b/5
@@ -1,7 +1,7 @@
 do_finish() {
    echo ${BOARD}
    echo ${DISTRO}-${FLAVOUR}
-    if [ ! -f configs/${DISTRO}-${FLAVOUR} ]; then
+    if [ ! -f distro/${DISTRO}/${FLAVOUR} ]; then
        echo XXX
    fi
    exit 0
@@ -87,9 +87,10 @@ do_menu_flavour() {
            --menu "X" 15 70 10 \
            "server" "Server" \
            "gnome-desktop" "GNOME" \
+            "kde-desktop" "KDE Plasma" \
            "lxde-desktop" "LXDE" \
            "mate-desktop" "MATE" \
-            "xfce4-desktop" "XFCE" \
+            "xfce-desktop" "XFCE" \
            2>&1 >/dev/tty)

    ret=$?
--- a/4
+++ b/4
@@ -73,8 +73,8 @@ fi
 [ "x${IMAGE_FILE}" = "x" ] && IMAGE_FILE=$(image_file ${DISTRO} ${FLAVOUR} ${BOARD})
 OUTFILE=${out_dir}/${IMAGE_FILE}

-[ -f ${TOPDIR}/configs/${DISTRO}-${FLAVOUR} ] && \
-	. ${TOPDIR}/configs/${DISTRO}-${FLAVOUR}
+[ -f ${TOPDIR}/distro/${DISTRO}/${FLAVOUR}/functions ] && \
+	. ${TOPDIR}/distro/${DISTRO}/${FLAVOUR}/functions
 . ${TOPDIR}/boards/${BOARD}/functions
 if [ -f ${TOPDIR}/custom/${CUSTOMOS}/functions ]; then
 	. ${TOPDIR}/custom/${CUSTOMOS}/functions