From b8f08bc8e25bd7c69627596bcba54455f613f0c7 Mon Sep 17 00:00:00 2001
From: Maximilian Schmidt <maximilian.schmidt@tuhh.de>
Date: Thu, 9 Jan 2025 00:16:51 +0100
Subject: [PATCH] create standalone distro, fork from poky (#21)

* create standalone distro, fork from poky

* specify SDK_VERSION

* Bump distro version

* remote todo

* add TCLIBAPPEND

* interleave uploads

---------

Co-authored-by: Julian Schuler <julianschuler@users.noreply.github.com>
---
 .github/workflows/cicd.yml             |  8 +++----
 kas/base.yml                           |  1 -
 meta-hulks/conf/distro/HULKs-OS.conf   |  4 ++--
 meta/conf/distro/nao-core-minimal.conf | 32 +++++++++++++++-----------
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 1cb1fc8..337c0b2 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -26,20 +26,20 @@ jobs:
         run: mkdir -p meta-nao/meta/recipes-support/aldebaran/aldebaran-binaries/ && cp /aldebaran_binaries.tar.gz meta-nao/meta/recipes-support/aldebaran/aldebaran-binaries/
       - name: Build NAO image
         run: kas build --target nao-image --cmd build meta-nao/kas/base.yml:meta-nao/kas/hulks.yml
-      - name: Build SDK (x86_64)
-        run: kas build --target nao-image --cmd populate_sdk meta-nao/kas/base.yml:meta-nao/kas/hulks.yml
-      - name: Build SDK (aarch64)
-        run: kas build --target nao-image --cmd populate_sdk meta-nao/kas/base.yml:meta-nao/kas/hulks.yml:meta-nao/kas/aarch64.yml
       - name: Upload image artifact
         uses: actions/upload-artifact@v4
         with:
           name: image
           path: build/tmp/deploy/images/nao-v6/nao-image-HULKs-OS-${{ env.version }}.ext3.gz.opn
+      - name: Build SDK (x86_64)
+        run: kas build --target nao-image --cmd populate_sdk meta-nao/kas/base.yml:meta-nao/kas/hulks.yml
       - name: Upload x86_64 SDK artifact
         uses: actions/upload-artifact@v4
         with:
           name: sdk-x86_64
           path: build/tmp/deploy/sdk/HULKs-OS-x86_64-toolchain-${{ env.version }}.sh
+      - name: Build SDK (aarch64)
+        run: kas build --target nao-image --cmd populate_sdk meta-nao/kas/base.yml:meta-nao/kas/hulks.yml:meta-nao/kas/aarch64.yml
       - name: Upload aarch64 SDK artifact
         uses: actions/upload-artifact@v4
         with:
diff --git a/kas/base.yml b/kas/base.yml
index e5cdedb..136bd63 100644
--- a/kas/base.yml
+++ b/kas/base.yml
@@ -8,7 +8,6 @@ target: nao-image
 local_conf_header:
   meta-nao: |
     CONF_VERSION = "2"
-    PACKAGE_CLASSES ?= "package_ipk"
     EXTRA_IMAGE_FEATURES += "allow-empty-password"
     CLANGSDK = "1"
 
diff --git a/meta-hulks/conf/distro/HULKs-OS.conf b/meta-hulks/conf/distro/HULKs-OS.conf
index a132e3e..7b66150 100644
--- a/meta-hulks/conf/distro/HULKs-OS.conf
+++ b/meta-hulks/conf/distro/HULKs-OS.conf
@@ -1,8 +1,8 @@
 require conf/distro/nao-core-minimal.conf
 
-SUMMARY = "HULKs flavoured Poky"
+SUMMARY = "HULKs flavoured Nao"
 
 DISTRO = "HULKs-OS"
 DISTRO_NAME = "HULKs-OS"
-DISTRO_VERSION = "7.5.8"
+DISTRO_VERSION = "7.5.9"
 SDKIMAGE_FEATURES:remove = "dbg-pkgs src-pkgs"
diff --git a/meta/conf/distro/nao-core-minimal.conf b/meta/conf/distro/nao-core-minimal.conf
index be60e9e..d02a332 100644
--- a/meta/conf/distro/nao-core-minimal.conf
+++ b/meta/conf/distro/nao-core-minimal.conf
@@ -1,31 +1,35 @@
-require conf/distro/poky.conf
-
 SUMMARY = "A small image just capable of allowing a device to boot."
 
 DISTRO = "nao-core-minimal"
 DISTRO_NAME = "nao-core-minimal"
-DISTRO_VERSION = "2.0"
-SDK_NAME = "${DISTRO}-${SDKMACHINE}"
+DISTRO_VERSION = "3.0"
 TARGET_VENDOR = "-aldebaran"
+IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO}-${DISTRO_VERSION}${IMAGE_VERSION_SUFFIX}"
+IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${DISTRO}-${DISTRO_VERSION}"
+SDK_NAME = "${DISTRO}-${SDKMACHINE}"
 SDK_VENDOR = "-naosdk"
+SDK_VERSION = "${DISTRO_VERSION}"
 SDK_ARCHIVE_TYPE = "tar.zst"
 MAINTAINER = "Team HULKs <hulks@tuhh.de>"
 
-hostname:pn-base-files = "nao"
+DISTRO_FEATURES ?= "alsa ext2 ipv4 usbgadget usbhost wifi xattr pci vfat pam polkit pulseaudio ldconfig"
+
+DISTRO_EXTRA_RDEPENDS += "packagegroup-core-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-intel-rt"
+
 PREFERRED_PROVIDER_cgos-mod = "linux-intel-rt"
+KERNEL_MODULE_AUTOLOAD:append = " cgosdrv"
 
-IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO}-${DISTRO_VERSION}${IMAGE_VERSION_SUFFIX}"
-IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${DISTRO}-${DISTRO_VERSION}"
+TCLIBCAPPEND = ""
 
-DISTRO_FEATURES:remove = "x11 wayland 3g nfs nfc opengl vulkan bluetooth pcmcia"
+PACKAGE_CLASSES ?= "package_ipk"
 
-DISTRO_FEATURES:append = " pam polkit"
+require conf/distro/include/no-static-libs.inc
 
-KERNEL_MODULE_AUTOLOAD:append = " cgosdrv"
+BB_SIGNATURE_HANDLER ?= "OEEquivHash"
+BB_HASHSERVE ??= "auto"
+
+INIT_MANAGER = "systemd"
 
-DISTRO_FEATURES:append = " systemd usrmerge"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
-VIRTUAL-RUNTIME_initscripts = ""
+hostname:pn-base-files = "nao"