From e055270cef83a3d46734254b2c53fe916e5d6c86 Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Wed, 6 Jul 2022 22:20:42 +0200
Subject: [PATCH] Switch from submodules to KAS

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 .gitmodules       | 12 ------------
 README            | 17 +++++++++++------
 init.sh           | 19 -------------------
 kaktus.yml        | 32 ++++++++++++++++++++++++++++++++
 meta-openembedded |  1 -
 meta-raspberrypi  |  1 -
 poky              |  1 -
 7 files changed, 43 insertions(+), 40 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 100755 init.sh
 create mode 100644 kaktus.yml
 delete mode 160000 meta-openembedded
 delete mode 160000 meta-raspberrypi
 delete mode 160000 poky

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 578397d..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,12 +0,0 @@
-[submodule "meta-openembedded"]
-	path = meta-openembedded
-	url = git://git.openembedded.org/meta-openembedded
-	branch = kirkstone
-[submodule "poky"]
-	path = poky
-	url = git://git.yoctoproject.org/poky
-	branch = kirkstone
-[submodule "meta-raspberrypi"]
-	path = meta-raspberrypi
-	url = git://git.yoctoproject.org/meta-raspberrypi
-	branch = kirkstone
diff --git a/README b/README
index a219c7c..4e1da90 100644
--- a/README
+++ b/README
@@ -38,18 +38,23 @@ $ docker build --build-arg UID=$(id -u) -t kaktus_builder .
 $ docker run -it -v /path/to/yocto-rpi-example:/home/builder/yocto kaktus_builder
 container$ cd /home/builder/yocto/
 
+Installing KAS
+--------------
+
+$ git clone https://github.com/siemens/kas.git
+$ cd kas
+$ git checkout 3.0.2
+$ sudo pip3 install .
+
 Building
 --------
 
-Open init.sh and set MACHINE either to raspberrypi4-64 or raspberrypi3-64.
+Open kaktus.yml and set machine: either to raspberrypi4-64 or raspberrypi3-64.
 Other variants should work too, but are untested.
 
-Source the init.sh script and use bitbake
-
-$ . init.sh
-$ bitbake kaktus-image
+$ kas build kaktus.yml
 
-The final image will be builddir/tmp/deploy/images/raspberrypi3-64/kaktus-image-raspberrypi3-64.wic.bz2
+The final image will be build/tmp/deploy/images/raspberrypi3-64/kaktus-image-raspberrypi3-64.wic.bz2
 
 You can flash it into you SDCard using dd. e.g
 $ bzcat kaktus-image-raspberrypi3-64.wic.bz2 | dd of=/dev/mmcblk0 bs=32M
diff --git a/init.sh b/init.sh
deleted file mode 100755
index 6418e59..0000000
--- a/init.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-BASE="$(pwd)"
-
-export TEMPLATECONF="$(pwd)/meta-kaktus/conf/"
-
-mkdir -p ${BASE}/downloads
-mkdir -p ${BASE}/sstate
-
-. poky/oe-init-build-env builddir
-
-cat << EOF > conf/auto.conf
-MACHINE = "raspberrypi3-64"
-DISTRO = "kaktus"
-KERNEL_MODULE_AUTOLOAD += " brcmfmac"
-DL_DIR = "${BASE}/downloads"
-SSTATE_DIR = "${BASE}/sstate"
-CMDLINE_SERIAL = "console=serial0,115200"
-RPI_EXTRA_CONFIG = "dtoverlay=disable-bt\n"
-#BB_NO_NETWORK = "1"
-EOF
diff --git a/kaktus.yml b/kaktus.yml
new file mode 100644
index 0000000..a4b59fe
--- /dev/null
+++ b/kaktus.yml
@@ -0,0 +1,32 @@
+header:
+  version: 11
+machine: raspberrypi3-64
+distro: kaktus
+target: kaktus-image
+repos:
+  meta-kaktus:
+    layers:
+      meta-kaktus:
+  poky:
+    url: "https://git.yoctoproject.org/git/poky"
+    refspec: kirkstone
+    layers:
+      meta:
+      meta-poky:
+      meta-yocto-bsp:
+  openembedded:
+    url: "git://git.openembedded.org/meta-openembedded"
+    refspec: kirkstone
+    layers:
+      meta-oe:
+      meta-networking:
+      meta-multimedia:
+      meta-python:
+  raspberry:
+    url: "git://git.yoctoproject.org/meta-raspberrypi"
+    refspec: kirkstone
+local_conf_header:
+  meta-kaktus: |
+    KERNEL_MODULE_AUTOLOAD += " brcmfmac"
+    CMDLINE_SERIAL = "console=serial0,115200"
+    RPI_EXTRA_CONFIG = "dtoverlay=disable-bt\n"
diff --git a/meta-openembedded b/meta-openembedded
deleted file mode 160000
index fcc7d7e..0000000
--- a/meta-openembedded
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fcc7d7eae82be4c180f2e8fa3db90a8ab3be07b7
diff --git a/meta-raspberrypi b/meta-raspberrypi
deleted file mode 160000
index 0135a02..0000000
--- a/meta-raspberrypi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0135a02ea577bd39dd552236ead2c5894d89da1d
diff --git a/poky b/poky
deleted file mode 160000
index a5ea426..0000000
--- a/poky
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a5ea426b1da472fc8549459fff3c1b8c6e02f4b5
-- 
2.50.1