From 84a106926e5131a98abfec7b2c3cb29e5c2d4ef4 Mon Sep 17 00:00:00 2001 From: Lars Niesen Date: Wed, 12 Jul 2023 18:27:59 +0200 Subject: [PATCH 1/9] Implement basic yocto build setup based on protos from jhnc-oss --- dev/bootstrap.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh index eeccce1..0eced52 100755 --- a/dev/bootstrap.sh +++ b/dev/bootstrap.sh @@ -56,11 +56,18 @@ if $DO_SSTATE ; then fi if $DO_DEPLOY ; then +<<<<<<< HEAD DEPLOY_PATH="deploy" mkdir -p $DEPLOY_PATH rm -rf "$DEPLOY_PATH"/* deploy_param1="-v" deploy_param2="${PWD}"/"${DEPLOY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}" +======= + DEPLOY_PATH="deploy-rpms" + mkdir -p $DEPLOAY_PATH + deploy_param1="-v" + deploy_param2="${PWD}"/"${DEPOLY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}" +>>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss) fi @@ -82,9 +89,18 @@ podman run \ -v "${PWD}"/default.xml:"${YOCTO_WORKDIR}"/default.xml \ -v "${PWD}"/meta-caros:"${YOCTO_WORKDIR}"/meta-caros:Z \ -v "${PWD}"/dev:"${YOCTO_WORKDIR}"/dev:Z \ +<<<<<<< HEAD -v "${PWD}"/downloads:"${YOCTO_WORKDIR}"/downloads:Z \ --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \ --env SSTATE_PATH="${SSTATE_PATH}" \ ${CONTAINER_NAME} \ ghcr.io/jhnc-oss/yocto-image/yocto:37 \ +======= + -v "${PWD}"/download:"${YOCTO_WORKDIR}"/download:Z \ + -v "${PWD}"/sstate:"${YOCTO_WORKDIR}"/sstate:Z \ + --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \ + --env SSTATE_PATH="${SSTATE_PATH}" \ + ${CONTAINER_NAME} \ + ghcr.io/jhnc-oss/yocto-image/yocto:38 \ +>>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss) bash -c "dev/init_env.sh " -- 2.45.1 From a3d5206abf7a371f179c4090a074a9d9e88ab1c6 Mon Sep 17 00:00:00 2001 From: Lars Niesen Date: Wed, 12 Jul 2023 18:27:59 +0200 Subject: [PATCH 2/9] Implement basic yocto build setup based on protos from jhnc-oss --- dev/bootstrap.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh index 0eced52..249d936 100755 --- a/dev/bootstrap.sh +++ b/dev/bootstrap.sh @@ -14,7 +14,6 @@ YOCTO_WORKDIR="/opt/${YOCTO_USER}" [[ -d "$PWD"/sstate-cache ]] || mkdir "$PWD"/sstate-cache - subgidSize=$(( $(podman info --format "{{ range .Host.IDMappings.GIDMap }}+{{.Size }}{{end }}" ) - 1 )) subuidSize=$(( $(podman info --format "{{ range .Host.IDMappings.UIDMap }}+{{.Size }}{{end }}" ) - 1 )) -- 2.45.1 From 801c2388d3be90a197c5ebc76b0a81c4b809a730 Mon Sep 17 00:00:00 2001 From: Lars Niesen Date: Fri, 25 Aug 2023 22:42:27 +0200 Subject: [PATCH 3/9] first basic image idea --- meta-caros/recipes-core/images/caros-image-minimal.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 meta-caros/recipes-core/images/caros-image-minimal.bb diff --git a/meta-caros/recipes-core/images/caros-image-minimal.bb b/meta-caros/recipes-core/images/caros-image-minimal.bb new file mode 100644 index 0000000..0132e91 --- /dev/null +++ b/meta-caros/recipes-core/images/caros-image-minimal.bb @@ -0,0 +1,9 @@ +SUMMARY = "Minimal bootable image for CaROS develoment" + +IMAGE_INSTALL = "package-group-core-boot" + +inherit core-image + +LICENSE = "MIT" + +IMAGE_ROOTFS_SIZE ?= "8192" -- 2.45.1 From 11e6f058eabda23393a92f1e667be35f07d7f8e1 Mon Sep 17 00:00:00 2001 From: Lars Niesen Date: Sat, 26 Aug 2023 18:14:26 +0200 Subject: [PATCH 4/9] fix spelling --- default.xml | 2 +- meta-caros/recipes-core/images/caros-image-minimal.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default.xml b/default.xml index cd1a1c2..5cc5938 100644 --- a/default.xml +++ b/default.xml @@ -5,7 +5,7 @@ - + Date: Fri, 1 Sep 2023 17:25:00 +0200 Subject: [PATCH 5/9] add distro features and disable busybox --- meta-caros/conf/distro/caros.conf | 2 +- meta-caros/conf/distro/include/preferred-versions.conf | 9 +++++++++ meta-caros/recipes-core/images/caros-image-minimal.bb | 5 +++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta-caros/conf/distro/caros.conf b/meta-caros/conf/distro/caros.conf index 1761061..42047e7 100644 --- a/meta-caros/conf/distro/caros.conf +++ b/meta-caros/conf/distro/caros.conf @@ -15,4 +15,4 @@ MAINTAINER = "Lars Niesen " TARGET_VENDOR = "-caros" -DISTRO_FEATURES ?= "" +DISTRO_FEATURES += "wayland systemd usbgadget usbhost" diff --git a/meta-caros/conf/distro/include/preferred-versions.conf b/meta-caros/conf/distro/include/preferred-versions.conf index f8668af..70eaf97 100644 --- a/meta-caros/conf/distro/include/preferred-versions.conf +++ b/meta-caros/conf/distro/include/preferred-versions.conf @@ -3,3 +3,12 @@ ######################### PREFERRED_VERSION_linux-yocto ?= "5.15%" PREFERRED_VERSION_linux-yocto-rt ?= "5.15%" + +VIRTUAL-RUNTIME_init_manager = "systemd" +VIRTUAL-RUNTIME_dev_manager = "udev" +VIRTUAL-RUNTIME_base-utils = "coreutils" +VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock" +VIRTUAL-RUNTIME_base-utils-syslog = "util-linux-syslog" +VIRTUAL-RUNTIME_login_manager = "shadow-base" +VIRTUAL-RUNTIME_initscripts = "" + diff --git a/meta-caros/recipes-core/images/caros-image-minimal.bb b/meta-caros/recipes-core/images/caros-image-minimal.bb index adf5c36..e03b36e 100644 --- a/meta-caros/recipes-core/images/caros-image-minimal.bb +++ b/meta-caros/recipes-core/images/caros-image-minimal.bb @@ -1,9 +1,10 @@ SUMMARY = "Minimal bootable image for CaROS develoment" +IMAGE_FEATURES = "nfs-server ssh-server-openssh" +# packagegroup-core-boot expandent to remove busybox +# PACKAGES_CORE_BOOT = IMAGE_INSTALL = "packagegroup-core-boot" inherit core-image LICENSE = "MIT" - -IMAGE_ROOTFS_SIZE ?= "8192" -- 2.45.1 From 62167a5dfe647eaa33ea3fb84835a38bc5747fa7 Mon Sep 17 00:00:00 2001 From: Lars Niesen Date: Thu, 21 Sep 2023 18:48:33 +0200 Subject: [PATCH 6/9] Fix rebase --- dev/bootstrap.sh | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh index 249d936..7eff056 100755 --- a/dev/bootstrap.sh +++ b/dev/bootstrap.sh @@ -55,18 +55,11 @@ if $DO_SSTATE ; then fi if $DO_DEPLOY ; then -<<<<<<< HEAD DEPLOY_PATH="deploy" mkdir -p $DEPLOY_PATH rm -rf "$DEPLOY_PATH"/* deploy_param1="-v" deploy_param2="${PWD}"/"${DEPLOY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}" -======= - DEPLOY_PATH="deploy-rpms" - mkdir -p $DEPLOAY_PATH - deploy_param1="-v" - deploy_param2="${PWD}"/"${DEPOLY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}" ->>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss) fi @@ -88,18 +81,9 @@ podman run \ -v "${PWD}"/default.xml:"${YOCTO_WORKDIR}"/default.xml \ -v "${PWD}"/meta-caros:"${YOCTO_WORKDIR}"/meta-caros:Z \ -v "${PWD}"/dev:"${YOCTO_WORKDIR}"/dev:Z \ -<<<<<<< HEAD -v "${PWD}"/downloads:"${YOCTO_WORKDIR}"/downloads:Z \ --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \ --env SSTATE_PATH="${SSTATE_PATH}" \ ${CONTAINER_NAME} \ ghcr.io/jhnc-oss/yocto-image/yocto:37 \ -======= - -v "${PWD}"/download:"${YOCTO_WORKDIR}"/download:Z \ - -v "${PWD}"/sstate:"${YOCTO_WORKDIR}"/sstate:Z \ - --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \ - --env SSTATE_PATH="${SSTATE_PATH}" \ - ${CONTAINER_NAME} \ - ghcr.io/jhnc-oss/yocto-image/yocto:38 \ ->>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss) bash -c "dev/init_env.sh " -- 2.45.1 From aea9924fd77265c0bd10cffd1220ff8081635a73 Mon Sep 17 00:00:00 2001 From: Lars Niesen Date: Sat, 23 Sep 2023 20:50:13 +0200 Subject: [PATCH 7/9] base image on fullcmd line --- .../recipes-core/images/caros-image-minimal.bb | 10 ---------- meta-caros/recipes-extended/images/caros-image.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 meta-caros/recipes-core/images/caros-image-minimal.bb create mode 100644 meta-caros/recipes-extended/images/caros-image.bb diff --git a/meta-caros/recipes-core/images/caros-image-minimal.bb b/meta-caros/recipes-core/images/caros-image-minimal.bb deleted file mode 100644 index e03b36e..0000000 --- a/meta-caros/recipes-core/images/caros-image-minimal.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Minimal bootable image for CaROS develoment" - -IMAGE_FEATURES = "nfs-server ssh-server-openssh" -# packagegroup-core-boot expandent to remove busybox -# PACKAGES_CORE_BOOT = -IMAGE_INSTALL = "packagegroup-core-boot" - -inherit core-image - -LICENSE = "MIT" diff --git a/meta-caros/recipes-extended/images/caros-image.bb b/meta-caros/recipes-extended/images/caros-image.bb new file mode 100644 index 0000000..4d69073 --- /dev/null +++ b/meta-caros/recipes-extended/images/caros-image.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "A console-only image with more full-featured Linux system \ +functionality installed." + +IMAGE_FEATURES += "splash ssh-server-openssh" + +IMAGE_INSTALL = "\ + packagegroup-core-boot \ + packagegroup-core-full-cmdline \ + ${CORE_IMAGE_EXTRA_INSTALL} \ + " + +inherit core-image -- 2.45.1 From df46a3eed8dc55939dad9efd01c1d5e8abd2067e Mon Sep 17 00:00:00 2001 From: Lars Niesen Date: Sun, 24 Sep 2023 20:21:13 +0200 Subject: [PATCH 8/9] Add selinux to distro feature --- meta-caros/conf/distro/caros.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-caros/conf/distro/caros.conf b/meta-caros/conf/distro/caros.conf index 42047e7..5664a23 100644 --- a/meta-caros/conf/distro/caros.conf +++ b/meta-caros/conf/distro/caros.conf @@ -15,4 +15,4 @@ MAINTAINER = "Lars Niesen " TARGET_VENDOR = "-caros" -DISTRO_FEATURES += "wayland systemd usbgadget usbhost" +DISTRO_FEATURES += "wayland systemd usbgadget usbhost selinux" -- 2.45.1 From 9011b22175a573297d5fbbf83e4d6f9ba0866248 Mon Sep 17 00:00:00 2001 From: Lars Niesen Date: Sun, 24 Sep 2023 23:48:26 +0200 Subject: [PATCH 9/9] Change image description --- meta-caros/recipes-extended/images/caros-image.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-caros/recipes-extended/images/caros-image.bb b/meta-caros/recipes-extended/images/caros-image.bb index 4d69073..5c3439d 100644 --- a/meta-caros/recipes-extended/images/caros-image.bb +++ b/meta-caros/recipes-extended/images/caros-image.bb @@ -1,5 +1,4 @@ -DESCRIPTION = "A console-only image with more full-featured Linux system \ -functionality installed." +DESCRIPTION = "CaROS full image" IMAGE_FEATURES += "splash ssh-server-openssh" -- 2.45.1