Update submodule

Signed-off-by: Bensuperpc <[email protected]>
bensuperpc · Jan 13, 2024 · 8f93e8e · 8f93e8e
1 parent 5889c35
commit 8f93e8e
Show file tree

Hide file tree

Showing 49 changed files with 269 additions and 50 deletions.
diff --git a/.cookerconfig b/.cookerconfig
@@ -0,0 +1,8 @@
+{
+    "menu": "raylib.json",
+    "layer-dir": "layers",
+    "build-dir": "builds",
+    "dl-dir": "downloads",
+    "sstate-dir": "sstate-cache",
+    "cooker-config-version": 1
+}
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 builds/*
+sstate-cache/*
+downloads/*
 .vscode/settings.json
diff --git a/.gitmodules b/.gitmodules
@@ -41,7 +41,7 @@
 	path = layers/meta-ti
 	url = git://git.yoctoproject.org/meta-ti
 [submodule "bitbake"]
-	path = tools/bitbake
+	path = layers/bitbake
 	url = git://git.openembedded.org/bitbake
 [submodule "layers/meta-linaro"]
 	path = layers/meta-linaro
@@ -104,7 +104,7 @@
 	path = layers/meta-raspberrypi-baremetal
 	url = https://github.com/ahcbb6/meta-raspberrypi-baremetal.git
 [submodule "tools/yocto-cooker"]
-	path = tools/yocto-cooker
+	path = layers/yocto-cooker
 	url = https://github.com/cpb-/yocto-cooker.git
 [submodule "docs/yocto-docs"]
 	path = docs/yocto-docs

diff --git a/Dockerfile b/Dockerfile
@@ -9,17 +9,17 @@ RUN apt-get update && apt-get -y install \
 # All needed packages for building yocto images
 	gcc build-essential \
 	gawk wget git diffstat unzip texinfo chrpath socat cpio xz-utils debianutils iputils-ping libegl1-mesa \
-	python3 python3-pip python3-pexpect python3-subunit pylint python3-git python3-jinja2 \
+	python3 python3-pip python3-pexpect python3-subunit pylint python3-git python3-jinja2 python-is-python3 \
 	libsdl1.2-dev xterm mesa-common-dev zstd liblz4-tool lz4 zstd unzip xz-utils \
 	x11-utils xvfb \
 	ccache ninja-build cmake distcc icecc meson \
 	apt-transport-https ca-certificates gnupg2 \
 	locales lsb-release rsync \
 # All needed packages for running yocto images (Qemu and others)
-#	qemu-system-x86 qemu-system-arm qemu-system-mips qemu-system-misc \
-#	qemu-system-ppc qemu-system-sparc qemu-system-aarch64 qemu-utils \
-#	qemu-kvm libvirt-clients libvirt-daemon-system \
-#	bridge-utils libguestfs-tools genisoimage virtinst libosinfo-bin \
+	qemu-system-x86 qemu-system-arm qemu-system-mips qemu-system-misc \
+	qemu-system-ppc qemu-system-sparc qemu-system-aarch64 qemu-utils \
+	qemu-kvm libvirt-clients libvirt-daemon-system \
+	bridge-utils libguestfs-tools genisoimage virtinst libosinfo-bin \
 # Other packages
 	bash-completion \
 	&& apt-get clean \

diff --git a/Makefile b/Makefile
@@ -164,7 +164,13 @@ update:
 #   Update all submodules to latest
 #   git submodule update --init --recursive
 #	git pull --recurse-submodules --all --progress --jobs=0
-	git submodule update --recursive --remote --force --rebase
+
+	git submodule foreach --recursive git clean -xfd
+	git submodule foreach --recursive git reset --hard
+#	git submodule update --init --recursive
+#	git submodule update --recursive --remote --force --rebase
+	git submodule update --recursive --init --remote --force
+
 #   Update all docker image
 	$(foreach tag,$(BASE_IMAGE_TAGS),$(DOCKER_EXEC) pull $(BASE_IMAGE_NAME):$(tag);)
 # All docker-compose things

diff --git a/docs/yocto-docs b/docs/yocto-docs
diff --git a/layers/bensuperpc/meta-raylib b/layers/bensuperpc/meta-raylib
diff --git a/layers/bitbake b/layers/bitbake
diff --git a/layers/meta-amd b/layers/meta-amd
diff --git a/layers/meta-arm b/layers/meta-arm
diff --git a/layers/meta-atmel b/layers/meta-atmel
diff --git a/layers/meta-aws b/layers/meta-aws
diff --git a/layers/meta-browser b/layers/meta-browser
diff --git a/layers/meta-clang b/layers/meta-clang
diff --git a/layers/meta-debian b/layers/meta-debian
diff --git a/layers/meta-freertos b/layers/meta-freertos
diff --git a/layers/meta-freescale b/layers/meta-freescale
diff --git a/layers/meta-intel b/layers/meta-intel
diff --git a/layers/meta-linux-mainline b/layers/meta-linux-mainline
diff --git a/layers/meta-mono b/layers/meta-mono
diff --git a/layers/meta-odroid b/layers/meta-odroid
diff --git a/layers/meta-openembedded b/layers/meta-openembedded
diff --git a/layers/meta-qt5 b/layers/meta-qt5
diff --git a/layers/meta-qt6 b/layers/meta-qt6
diff --git a/layers/meta-raspberrypi b/layers/meta-raspberrypi
diff --git a/layers/meta-raspberrypi-baremetal b/layers/meta-raspberrypi-baremetal
diff --git a/layers/meta-riscv b/layers/meta-riscv
diff --git a/layers/meta-rockchip b/layers/meta-rockchip
diff --git a/layers/meta-rust b/layers/meta-rust
diff --git a/layers/meta-rust-bin b/layers/meta-rust-bin
diff --git a/layers/meta-security b/layers/meta-security
diff --git a/layers/meta-selinux b/layers/meta-selinux
diff --git a/layers/meta-smartphone b/layers/meta-smartphone
diff --git a/layers/meta-st-stm32mp b/layers/meta-st-stm32mp
diff --git a/layers/meta-tegra b/layers/meta-tegra
diff --git a/layers/meta-tensorflow b/layers/meta-tensorflow
diff --git a/layers/meta-ti b/layers/meta-ti
diff --git a/layers/meta-yocto b/layers/meta-yocto
diff --git a/layers/openembedded-core b/layers/openembedded-core
diff --git a/layers/poky b/layers/poky
diff --git a/layers/yocto-cooker b/layers/yocto-cooker
diff --git a/qemuarm64.json b/qemuarm64.json
@@ -0,0 +1,46 @@
+{
+  "sources" : [
+    { "url": "git://git.openembedded.org/meta-openembedded", "branch": "kirkstone", "rev": "9c5541f7e18a1fac3b8dea71e1ebb8398d58e6ff" },
+    { "url": "git://git.yoctoproject.org/poky", "branch": "kirkstone", "rev": "ef5214f584765810e94a6f61585ccbcd9b909502" }
+  ],
+
+  "layers" : [
+    "poky/meta",
+    "poky/meta-poky",
+    "poky/meta-yocto-bsp",
+    "meta-openembedded/meta-oe"
+  ],
+
+  "local.conf": [
+    "BB_NUMBER_THREADS = '2' ",
+    "BB_NUMBER_PARSE_THREADS = '2' ",
+    "PARALLEL_MAKE = '-j 2' ",
+    "PARALLEL_MAKEINST = '-j 2' ",
+    "INHERIT += ' ccache'"
+  ],
+
+  "builds" : {
+    "base-qemuarm64": {
+      "target" : "core-image-base",
+      "local.conf": [
+        "MACHINE = 'qemuarm64' ",
+        "DISTRO = 'poky' ",
+        "PACKAGE_CLASSES = 'package_rpm' ",
+        "EXTRA_IMAGE_FEATURES = 'debug-tweaks package-management' ",
+        "IMAGE_INSTALL:append = ' nano' ",
+        "IMAGE_FEATURES:append = ' empty-root-password' "
+      ]
+    },
+    "sato-qemuarm64": {
+      "target" : "core-image-sato",
+      "local.conf": [
+        "MACHINE = 'qemuarm64' ",
+        "DISTRO = 'poky' ",
+        "PACKAGE_CLASSES = 'package_rpm' ",
+        "EXTRA_IMAGE_FEATURES = 'debug-tweaks splash package-management' ",
+        "IMAGE_INSTALL:append = ' nano' ",
+        "IMAGE_FEATURES:append = ' empty-root-password' "
+      ]
+    }
+  }
+}
diff --git a/qemuriscv64.json b/qemuriscv64.json
@@ -0,0 +1,46 @@
+{
+  "sources" : [
+    { "url": "git://git.openembedded.org/meta-openembedded", "branch": "kirkstone", "rev": "9c5541f7e18a1fac3b8dea71e1ebb8398d58e6ff" },
+    { "url": "git://git.yoctoproject.org/poky", "branch": "kirkstone", "rev": "ef5214f584765810e94a6f61585ccbcd9b909502" }
+  ],
+
+  "layers" : [
+    "poky/meta",
+    "poky/meta-poky",
+    "poky/meta-yocto-bsp",
+    "meta-openembedded/meta-oe"
+  ],
+
+  "local.conf": [
+    "BB_NUMBER_THREADS = '2' ",
+    "BB_NUMBER_PARSE_THREADS = '2' ",
+    "PARALLEL_MAKE = '-j 2' ",
+    "PARALLEL_MAKEINST = '-j 2' ",
+    "INHERIT += ' ccache'"
+  ],
+
+  "builds" : {
+    "base-qemuriscv64": {
+      "target" : "core-image-base",
+      "local.conf": [
+        "MACHINE = 'qemuriscv64' ",
+        "DISTRO = 'poky' ",
+        "PACKAGE_CLASSES = 'package_rpm' ",
+        "EXTRA_IMAGE_FEATURES = 'debug-tweaks package-management' ",
+        "IMAGE_INSTALL:append = ' nano' ",
+        "IMAGE_FEATURES:append = ' empty-root-password' "
+      ]
+    },
+    "sato-qemuriscv64": {
+      "target" : "core-image-sato",
+      "local.conf": [
+        "MACHINE = 'qemuriscv64' ",
+        "DISTRO = 'poky' ",
+        "PACKAGE_CLASSES = 'package_rpm' ",
+        "EXTRA_IMAGE_FEATURES = 'debug-tweaks splash package-management' ",
+        "IMAGE_INSTALL:append = ' nano' ",
+        "IMAGE_FEATURES:append = ' empty-root-password' "
+      ]
+    }
+  }
+}
diff --git a/qemux86-64.json b/qemux86-64.json
@@ -0,0 +1,46 @@
+{
+  "sources" : [
+    { "url": "git://git.openembedded.org/meta-openembedded", "branch": "kirkstone", "rev": "9c5541f7e18a1fac3b8dea71e1ebb8398d58e6ff" },
+    { "url": "git://git.yoctoproject.org/poky", "branch": "kirkstone", "rev": "ef5214f584765810e94a6f61585ccbcd9b909502" }
+  ],
+
+  "layers" : [
+    "poky/meta",
+    "poky/meta-poky",
+    "poky/meta-yocto-bsp",
+    "meta-openembedded/meta-oe"
+  ],
+
+  "local.conf": [
+    "BB_NUMBER_THREADS = '2' ",
+    "BB_NUMBER_PARSE_THREADS = '2' ",
+    "PARALLEL_MAKE = '-j 2' ",
+    "PARALLEL_MAKEINST = '-j 2' ",
+    "INHERIT += ' ccache'"
+  ],
+
+  "builds" : {
+    "base-qemux86-64": {
+      "target" : "core-image-base",
+      "local.conf": [
+        "MACHINE = 'qemux86-64' ",
+        "DISTRO = 'poky' ",
+        "PACKAGE_CLASSES = 'package_rpm' ",
+        "EXTRA_IMAGE_FEATURES = 'debug-tweaks splash package-management' ",
+        "IMAGE_INSTALL:append = ' nano' ",
+        "IMAGE_FEATURES:append = ' empty-root-password' "
+      ]
+    },
+    "sato-qemux86-64": {
+      "target" : "core-image-sato",
+      "local.conf": [
+        "MACHINE = 'qemux86-64' ",
+        "DISTRO = 'poky' ",
+        "PACKAGE_CLASSES = 'package_rpm' ",
+        "EXTRA_IMAGE_FEATURES = 'debug-tweaks splash package-management' ",
+        "IMAGE_INSTALL:append = ' nano' ",
+        "IMAGE_FEATURES:append = ' empty-root-password' "
+      ]
+    }
+  }
+}
diff --git a/demo-cooker.json → raspberrypi4-64.json b/demo-cooker.json → raspberrypi4-64.json
@@ -14,8 +14,10 @@
   ],
 
   "local.conf": [
-    "BB_NUMBER_THREADS = '8' ",
-    "PARALLEL_MAKE = '-j 8' ",
+    "BB_NUMBER_THREADS = '2' ",
+    "BB_NUMBER_PARSE_THREADS = '2' ",
+    "PARALLEL_MAKE = '-j 2' ",
+    "PARALLEL_MAKEINST = '-j 2' ",
     "INHERIT += ' ccache'"
   ],
 
@@ -25,9 +27,23 @@
       "local.conf": [
         "MACHINE = 'raspberrypi4-64' ",
         "DISTRO = 'poky' ",
-        "EXTRA_IMAGE_FEATURES = 'debug-tweaks package-management' ",
+        "PACKAGE_CLASSES = 'package_rpm' ",
+        "EXTRA_IMAGE_FEATURES = 'debug-tweaks package-management splash' ",
+        "IMAGE_INSTALL:append = ' nano' ",
         "IMAGE_FSTYPES = 'tar.bz2 ext4 wic.bz2 wic.bmap wic' ",
-        "IMAGE_FEATURES += ' empty-root-password' "
+        "IMAGE_FEATURES:append = ' empty-root-password' "
+      ]
+    },
+    "sato-raspberrypi4-64": {
+      "target" : "core-image-sato",
+      "local.conf": [
+        "MACHINE = 'raspberrypi4-64' ",
+        "DISTRO = 'poky' ",
+        "PACKAGE_CLASSES = 'package_rpm' ",
+        "EXTRA_IMAGE_FEATURES = 'debug-tweaks splash package-management' ",
+        "IMAGE_INSTALL:append = ' nano' ",
+        "IMAGE_FSTYPES = 'tar.bz2 ext4 wic.bz2 wic.bmap wic' ",
+        "IMAGE_FEATURES:append = ' empty-root-password' "
       ]
     }
   }