Merge pull request #12 from PADL/release/6.1_separate_commits

Proposal for scarthgap branch (Swift 6.1.2)

-- No squash

Author: jeremy-prater

.devcontainer/Dockerfile

@@ -1,25 +1,100 @@
-name: Build
+name: build
 
-on: [push]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
 
 jobs:
+  yocto-aarch64:
+    runs-on: ubuntu-24.04
+    container:
+    steps:
+      - name: Packages
+        run: |
+          sudo apt-get update
+          sudo apt install -y build-essential chrpath cpio debianutils diffstat file gawk gcc git iputils-ping libacl1 liblz4-tool locales python3 python3-git python3-jinja2 python3-pexpect python3-pip python3-subunit socat texinfo unzip wget xz-utils zstd
+          echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
+      - name: Checkout Poky
+        uses: actions/checkout@v4
+        with:
+          repository: yoctoproject/poky
+          path: poky
+          ref: scarthgap
+          fetch_depth: 0
+      - name: Checkout Swift layer
+        uses: actions/checkout@v4
+        with:
+          path: poky/meta-swift
+          fetch_depth: 0
+      - name: Build
+        run: |
+          cd $GITHUB_WORKSPACE/poky
+          source oe-init-build-env
+          bitbake-layers add-layer ../meta-swift
+          rm -f conf/local.conf
+          echo 'MACHINE = "qemuarm64"' > conf/local.conf
+          echo 'INHERIT += "rm_work"' >> conf/local.conf
+          bitbake swift-hello-world
 
-    build:
-        name: Build
-        runs-on: ubuntu-latest
-        container: colemancda/meta-swift
-        strategy:
-          matrix:
-            machine: [beaglebone-yocto, qemuarm64]
-        steps:
-        - name: Checkout
-          uses: actions/checkout@v3
-        - name: Build
-          run: |
-            export SRC_ROOT=$GITHUB_WORKSPACE
-            export POKY_DIR=/tmp/poky
-            export MACHINE=${{ matrix.machine }}
-            cd /tmp/
-            git clone --branch dunfell-23.0.20-cmake-3.22.3 https://github.com/MillerTechnologyPeru/poky.git
-            cd $SRC_ROOT
-            ./build.sh
+  yocto-armv7:
+    runs-on: ubuntu-24.04
+    container:
+    steps:
+      - name: Packages
+        run: |
+          sudo apt-get update
+          sudo apt install -y build-essential chrpath cpio debianutils diffstat file gawk gcc git iputils-ping libacl1 liblz4-tool locales python3 python3-git python3-jinja2 python3-pexpect python3-pip python3-subunit socat texinfo unzip wget xz-utils zstd
+          echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
+      - name: Checkout Poky
+        uses: actions/checkout@v4
+        with:
+          repository: yoctoproject/poky
+          path: poky
+          ref: scarthgap
+          fetch_depth: 0
+      - name: Checkout Swift layer
+        uses: actions/checkout@v4
+        with:
+          path: poky/meta-swift
+          fetch_depth: 0
+      - name: Build
+        run: |
+          cd $GITHUB_WORKSPACE/poky
+          source oe-init-build-env
+          bitbake-layers add-layer ../meta-swift
+          rm -f conf/local.conf
+          echo 'MACHINE = "qemuarm"' > conf/local.conf
+          echo 'INHERIT += "rm_work"' >> conf/local.conf
+          bitbake swift-hello-world
+
+  yocto-x86_64:
+    runs-on: ubuntu-24.04
+    container:
+    steps:
+      - name: Packages
+        run: |
+          sudo apt-get update
+          sudo apt install -y build-essential chrpath cpio debianutils diffstat file gawk gcc git iputils-ping libacl1 liblz4-tool locales python3 python3-git python3-jinja2 python3-pexpect python3-pip python3-subunit socat texinfo unzip wget xz-utils zstd
+          echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
+      - name: Checkout Poky
+        uses: actions/checkout@v4
+        with:
+          repository: yoctoproject/poky
+          path: poky
+          ref: scarthgap
+          fetch_depth: 0
+      - name: Checkout Swift layer
+        uses: actions/checkout@v4
+        with:
+          path: poky/meta-swift
+          fetch_depth: 0
+      - name: Build
+        run: |
+          cd $GITHUB_WORKSPACE/poky
+          source oe-init-build-env
+          bitbake-layers add-layer ../meta-swift
+          rm -f conf/local.conf
+          echo 'MACHINE = "qemux86-64"' > conf/local.conf
+          echo 'INHERIT += "rm_work"' >> conf/local.conf
+          bitbake swift-hello-world

.devcontainer/devcontainer.json

@@ -1,14 +1,15 @@
 # meta-swift
-Yocto meta-layer for swift-on-arm (Swift 5.7.1)
+
+Yocto layer for the Swift programming language.
 
 # Usage
 
-Add this meta layer to your project (refer to yocto user manual)
+Add this layer to your project (refer to Yocto user manual, or use `bitbake-layers add-layer`).
 
-Create a new swift application and include it in your yocto build as follows...
+Create a new Swift application and include it in your build as follows:
 
 ```
-DESCRIPTION = "My swift 5.7.1 app"
+DESCRIPTION = "My Swift app"
 LICENSE = "CLOSED"
 
 SRC_URI = "file://Sources/hello-world/main.swift \
@@ -18,14 +19,14 @@ SRC_URI = "file://Sources/hello-world/main.swift \
 inherit swift
 ```
 
-This does a few things, when you `inherit swift` meta-layer class, it will does the following...
+When you `inherit swift` class, it does the following:
 
-- Automatically download the x86_64 and ARMv7 swift 5.7.1 binaries and create a cross-compiling sys-root
-- Add an RDEPENDS_${PN} for `swift` which is the Armv7 runtime
+- Automatically download the x86\_64 SDK binaries and create a cross-compiling sysroot
+- Add an RDEPENDS:${PN} for `swift`
 - Performs the required build steps
 
 # Deployment
 
-The user of this meta-layer must provide their own `do_install` function.
+The user of this layer must provide their own `do_install` function.
 
-The finished binaries are located in ${WORKDIR}/.build/release/*
+The finished binaries are located in ${BUILD\_DIR}.