diff mbox series

[oe-layersetup,master] configs: Add arago-master-luks

Message ID 20260326144948.2130523-1-reatmon@ti.com
State Under Review
Delegated to: Ryan Eatmon
Headers show
Series [oe-layersetup,master] configs: Add arago-master-luks | expand

Commit Message

Ryan Eatmon March 26, 2026, 2:49 p.m. UTC
Add new config to show how to build with the luks disk encryption.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 ...ig.conf.json => arago-master-luks-config.conf.json} | 10 +++++-----
 ...p-10x-config.conf => arago-master-luks-config.conf} |  6 +++---
 ...-master-config.txt => arago-master-luks-config.txt} |  3 +++
 ...selinux-config.yml => arago-master-luks-config.yml} | 10 ++++++----
 ...-master-config.xml => arago-master-luks-config.xml} |  9 +++++++++
 5 files changed, 26 insertions(+), 12 deletions(-)
 copy bitbake-setup/{arago-master-selinux-config.conf.json => arago-master-luks-config.conf.json} (85%)
 copy conf/fragments/localconf/configs/{arago-scarthgap-10x-config.conf => arago-master-luks-config.conf} (61%)
 copy configs/{arago-master-config.txt => arago-master-luks-config.txt} (90%)
 copy kas/{arago-master-selinux-config.yml => arago-master-luks-config.yml} (90%)
 copy src/configs/{arago-master-config.xml => arago-master-luks-config.xml} (91%)
diff mbox series

Patch

diff --git a/bitbake-setup/arago-master-selinux-config.conf.json b/bitbake-setup/arago-master-luks-config.conf.json
similarity index 85%
copy from bitbake-setup/arago-master-selinux-config.conf.json
copy to bitbake-setup/arago-master-luks-config.conf.json
index 29e7a19..df33a0e 100644
--- a/bitbake-setup/arago-master-selinux-config.conf.json
+++ b/bitbake-setup/arago-master-luks-config.conf.json
@@ -35,16 +35,16 @@ 
       },
       "path": "meta-arago"
     },
-    "meta-selinux": {
+    "meta-security": {
       "git-remote": {
         "remotes": {
           "origin": {
-            "uri": "https://git.yoctoproject.org/meta-selinux"
+            "uri": "https://git.yoctoproject.org/meta-security"
           }
         },
         "rev": "master"
       },
-      "path": "meta-selinux"
+      "path": "meta-security"
     },
     "meta-qt6": {
       "git-remote": {
@@ -118,8 +118,8 @@ 
       {
         "name": "arago",
         "description": "TI Arago distro build",
-        "bb-layers": [ "meta-arago/meta-arago-distro","meta-arago/meta-arago-extras","meta-arago/meta-arago-test","meta-selinux","meta-qt6","meta-virtualization","meta-openembedded/meta-networking","meta-openembedded/meta-python","meta-openembedded/meta-oe","meta-openembedded/meta-gnome","meta-openembedded/meta-filesystems","meta-openembedded/meta-multimedia","meta-ti/meta-ti-extras","meta-ti/meta-beagle","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","oe-layersetup" ],
-        "oe-fragments": [ "oe-layersetup/localconf/local-arago64-v3", "oe-layersetup/localconf/configs/arago-master-selinux-config.conf" ],
+        "bb-layers": [ "meta-arago/meta-arago-distro","meta-arago/meta-arago-extras","meta-arago/meta-arago-test","meta-security/meta-tpm","meta-qt6","meta-virtualization","meta-openembedded/meta-networking","meta-openembedded/meta-python","meta-openembedded/meta-oe","meta-openembedded/meta-gnome","meta-openembedded/meta-filesystems","meta-openembedded/meta-multimedia","meta-ti/meta-ti-extras","meta-ti/meta-beagle","meta-ti/meta-ti-bsp","meta-arm/meta-arm","meta-arm/meta-arm-toolchain","oe-core/meta","oe-layersetup" ],
+        "oe-fragments": [ "oe-layersetup/localconf/local-arago64-v3", "oe-layersetup/localconf/configs/arago-master-luks-config.conf" ],
         "oe-fragments-one-of": {
           "machine": {
             "description": "Available target machines",
diff --git a/conf/fragments/localconf/configs/arago-scarthgap-10x-config.conf b/conf/fragments/localconf/configs/arago-master-luks-config.conf
similarity index 61%
copy from conf/fragments/localconf/configs/arago-scarthgap-10x-config.conf
copy to conf/fragments/localconf/configs/arago-master-luks-config.conf
index 6f4bf47..fed0c94 100644
--- a/conf/fragments/localconf/configs/arago-scarthgap-10x-config.conf
+++ b/conf/fragments/localconf/configs/arago-master-luks-config.conf
@@ -1,4 +1,4 @@ 
-BB_CONF_FRAGMENT_SUMMARY = "Config specific overrides for arago-scarthgap-10x-config"
-BB_CONF_FRAGMENT_DESCRIPTION = "Config specific overrides for arago-scarthgap-10x-config"
+BB_CONF_FRAGMENT_SUMMARY = "Config specific overrides for arago-master-luks-config"
+BB_CONF_FRAGMENT_DESCRIPTION = "Config specific overrides for arago-master-luks-config"
 
-TI_PREFERRED_BSP = "ti-6_6"
+DISTRO_FEATURES:append = " tpm luks"
diff --git a/configs/arago-master-config.txt b/configs/arago-master-luks-config.txt
similarity index 90%
copy from configs/arago-master-config.txt
copy to configs/arago-master-luks-config.txt
index 132a505..c68d49e 100644
--- a/configs/arago-master-config.txt
+++ b/configs/arago-master-luks-config.txt
@@ -6,6 +6,7 @@  meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago
 #meta-flutter,https://github.com/meta-flutter/meta-flutter.git,master,HEAD,layers=.:meta-flutter-apps
 #meta-browser,https://github.com/OSSystems/meta-browser.git,master,e252b51fd261a4cb05be932f0143ac444693a1ea,layers=meta-chromium
 #meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers=
+meta-security,https://git.yoctoproject.org/meta-security,master,HEAD,layers=meta-tpm
 meta-qt6,https://code.qt.io/yocto/meta-qt6.git,dev,HEAD,layers=
 meta-virtualization,https://git.yoctoproject.org/meta-virtualization,master,HEAD,layers=
 meta-openembedded,https://git.openembedded.org/meta-openembedded,master,HEAD,layers=meta-networking:meta-python:meta-oe:meta-gnome:meta-filesystems:meta-multimedia
@@ -16,3 +17,5 @@  oe-core,https://git.openembedded.org/openembedded-core,master,HEAD,layers=meta
 OECORELAYERCONF=./sample-files/bblayers.conf.sample
 OECORELOCALCONF=./sample-files/local-arago64-v3.conf.sample
 BITBAKE_INCLUSIVE_VARS=yes
+
+LOCALCONF:DISTRO_FEATURES:append = " tpm luks"
diff --git a/kas/arago-master-selinux-config.yml b/kas/arago-master-luks-config.yml
similarity index 90%
copy from kas/arago-master-selinux-config.yml
copy to kas/arago-master-luks-config.yml
index 65a1925..8446a16 100644
--- a/kas/arago-master-selinux-config.yml
+++ b/kas/arago-master-luks-config.yml
@@ -24,10 +24,12 @@  repos:
       meta-arago-extras:
       meta-arago-test:
 
-  meta-selinux:
-    url: "https://git.yoctoproject.org/meta-selinux"
+  meta-security:
+    url: "https://git.yoctoproject.org/meta-security"
     branch: "master"
-    path: "sources/meta-selinux"
+    path: "sources/meta-security"
+    layers:
+      meta-tpm:
 
   meta-qt6:
     url: "https://code.qt.io/yocto/meta-qt6.git"
@@ -77,4 +79,4 @@  repos:
 
 local_conf_header:
   oe-layersetup-local-conf-config-specific: |
-    DISTRO_FEATURES:append = " acl xattr pam selinux"
+    DISTRO_FEATURES:append = " tpm luks"
diff --git a/src/configs/arago-master-config.xml b/src/configs/arago-master-luks-config.xml
similarity index 91%
copy from src/configs/arago-master-config.xml
copy to src/configs/arago-master-luks-config.xml
index c058317..8152482 100644
--- a/src/configs/arago-master-config.xml
+++ b/src/configs/arago-master-luks-config.xml
@@ -31,6 +31,11 @@ 
         <repo name='meta-selinux' url='https://git.yoctoproject.org/meta-selinux' branch='master' commit='HEAD' disabled='true'>
             <layers/>
         </repo>
+        <repo name='meta-security' url='https://git.yoctoproject.org/meta-security' branch='master' commit='HEAD'>
+            <layers>
+                <layer>meta-tpm</layer>
+            </layers>
+        </repo>
         <repo name='meta-qt6' url='https://code.qt.io/yocto/meta-qt6.git' branch='dev' commit='HEAD'>
             <layers/>
         </repo>
@@ -67,6 +72,10 @@ 
         </repo>
     </repos>
 
+    <local-conf>
+        <line>DISTRO_FEATURES:append = " tpm luks"</line>
+    </local-conf>
+
     <tools>
         <tool type='oe-layersetup'>
             <var name='BITBAKE_INCLUSIVE_VARS' value='yes'/>