Change image description

Add selinux to distro feature
base image on fullcmd line
2023-09-24 23:48:26 +02:00 · 2023-09-24 20:21:13 +02:00 · 2023-09-24 20:20:48 +02:00 · 2023-09-24 20:20:48 +02:00 · 2023-09-24 20:20:48 +02:00 · 2023-09-24 20:20:48 +02:00
8 changed files with 26 additions and 20 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) [year] [fullname]
+Copyright (c) 2023 -   Lars Niesen, Emre Gülçino, Tilman Sattler, David Sattler

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/default.xml
+++ b/default.xml
@@ -11,22 +11,27 @@
  <project remote="caros"
           name="poky"
           path="poky"
-           revision="kirkstone" />
+           revision="5c556073ac6e54314aa3fc210db040f3ab55105a" />


  <project remote="caros"
           name="meta-openembedded"
           path="meta-oe"
-           revision="kirkstone" />
+           revision="a88cb922f91fda95e8a584cee3092083d5ad3e98" />

  <project remote="caros"
           name="meta-qt6"
           path="meta-qt6"
-           revision="lts-6.2.9" />
+           revision="81a8947b8da3f0fbe03974d6b29e6205a76c3c42" />

  <project remote="caros"
           name="meta-selinux"
           path="meta-selinux"
-           revision="kirkstone" />
+           revision="a401f4b2816a0b41ce8d9351542658c721935bcd" />
+
+  <project remote="caros"
+           name="meta-intel"
+           path="meta-intel"
+           revision="1342bcdc5bfc6620737e7d195e7d9bd744348577" />
 </manifest>

--- a/dev/bootstrap.sh
+++ b/dev/bootstrap.sh
@@ -5,9 +5,8 @@ set -o pipefail

 MANIFEST_BRANCH="${1:-main}"

-<<<<<<< HEAD
-YOCTO_GID="$((1 + $RANDOM % 1000))"
-YOCTO_UID="$((1 + $RANDOM % 1000))"
+YOCTO_GID="1000"
+YOCTO_UID="1000"
 YOCTO_USER="yocto"
 YOCTO_WORKDIR="/opt/${YOCTO_USER}"

--- a/meta-caros/conf/distro/caros.conf
+++ b/meta-caros/conf/distro/caros.conf
@@ -15,4 +15,4 @@ MAINTAINER = "Lars Niesen <lars.niesen@gmx.de>"

 TARGET_VENDOR = "-caros"

-DISTRO_FEATURES += "wayland systemd usbgadget usbhost"
+DISTRO_FEATURES += "wayland systemd usbgadget usbhost selinux"
--- a/meta-caros/conf/templates/bblayers.conf.sample
+++ b/meta-caros/conf/templates/bblayers.conf.sample
@@ -21,6 +21,7 @@ BBLAYERS ?= " \
    ${TOPDIR}/../meta-oe/meta-python \
    ${TOPDIR}/../meta-oe/meta-webserver \
    ${TOPDIR}/../meta-oe/meta-xfce \
+    ${TOPDIR}/../meta-intel \
    ${TOPDIR}/../meta-caros \
 "

--- a/meta-caros/conf/templates/local.conf.sample
+++ b/meta-caros/conf/templates/local.conf.sample
@@ -1,4 +1,4 @@
-MACHINE ?= "genericx86-64"
+MACHINE ?= "intel-corei7-64"

 DL_DIR ?= "${TOPDIR}/../downloads"

--- a/meta-caros/recipes-core/images/caros-image-minimal.bb
+++ b/meta-caros/recipes-core/images/caros-image-minimal.bb
@@ -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"
--- a/meta-caros/recipes-extended/images/caros-image.bb
+++ b/meta-caros/recipes-extended/images/caros-image.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "CaROS full image"
+
+IMAGE_FEATURES += "splash ssh-server-openssh"
+
+IMAGE_INSTALL = "\
+    packagegroup-core-boot \
+    packagegroup-core-full-cmdline \
+    ${CORE_IMAGE_EXTRA_INSTALL} \
+    "
+
+inherit core-image
Author	SHA1	Message	Date
Lars Niesen	9011b22175	Change image description	2023-09-24 23:48:26 +02:00
Lars Niesen	df46a3eed8	Add selinux to distro feature	2023-09-24 20:21:13 +02:00
Lars Niesen	aea9924fd7	base image on fullcmd line	2023-09-24 20:20:48 +02:00
Lars Niesen	62167a5dfe	Fix rebase	2023-09-24 20:20:48 +02:00
Lars Niesen	cdf6ddad4e	add distro features and disable busybox	2023-09-24 20:20:48 +02:00
Lars Niesen	11e6f058ea	fix spelling	2023-09-24 20:20:48 +02:00
Lars Niesen	801c2388d3	first basic image idea	2023-09-24 20:20:48 +02:00
Lars Niesen	a3d5206abf	Implement basic yocto build setup based on protos from jhnc-oss	2023-09-24 20:20:48 +02:00
Lars Niesen	84a106926e	Implement basic yocto build setup based on protos from jhnc-oss	2023-09-24 20:20:45 +02:00
Lars Niesen	cc28ffce35	!29 Add meta-intel layer Add meta-intel intel layer to build for the intel cpu board configuration.	2023-09-23 23:39:41 +02:00
Lars Niesen	d6084f2ed8	!21 Change repos to fixed srcrev This commit changes the repository from HEAD to a fixed commit hash to prevent accidental updates when a meta-* layer changes.	2023-09-23 15:45:08 +00:00
Lars Niesen	bd2e7c5319	!26 Add upstream changes to UID and GID The container upstream changed the internal UID and GID which causes the boostrap script to create wrong mappings	2023-09-23 17:40:08 +02:00
Lars Niesen	126e39c583	!14 Add Authors into the licensefile	2023-09-21 18:46:02 +02:00
Lars Niesen	4bcc914087	#20 map/deploy every deployable folders	2023-09-13 09:52:54 +02:00
Lars Niesen	a2fcac7b4b	#25 Add draft of the planned Roadmap Reviewed-on: #25 Reviewed-by: welwei_tilman <tilman.sattler@stud.th-rosenheim.de>	2023-09-13 07:41:23 +00:00
Lars Niesen	4254190a14	#1 & #2 Add colaboration rules to the readme	2023-08-25 20:56:28 +02:00
Lars Niesen	50a2e25a9b	Fix depoly path variable in mkdir	2023-08-25 20:43:28 +02:00
Lars Niesen	c96db27895	#7 donwgrade fedora to f37	2023-07-20 18:52:40 +02:00
Lars Niesen	93013a925a	#3 Fix misconfiguration of the yocto layer	2023-07-13 00:22:13 +02:00
Lars Niesen	e65e90cba5	Implement basic yocto build setup based on protos from jhnc-oss	2023-07-12 23:46:17 +02:00