diff mbox series

[isar-cip-core] Update isar revision

Message ID 50913583-4cdd-494e-bac1-1cbe8c0f761b@siemens.com (mailing list archive)
State New
Headers show
Series [isar-cip-core] Update isar revision | expand

Commit Message

Jan Kiszka Feb. 14, 2025, 11:01 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

This brings our squashfs class from isar upstream. So, drop it here.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

While there are still known issues in isar that are waiting for fixes to 
be merged, key problems for us are solved now.

 classes/squashfs.bbclass | 51 ----------------------------------------
 kas-cip.yml              |  2 +-
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 classes/squashfs.bbclass

Comments

Jan Kiszka Feb. 14, 2025, 1:33 p.m. UTC | #1 
On 14.02.25 12:01, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This brings our squashfs class from isar upstream. So, drop it here.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> While there are still known issues in isar that are waiting for fixes to 
> be merged, key problems for us are solved now.
> 

Argh, missed that the linux kernel build fix is still not merged. Strike
this.

Jan
diff mbox series

Patch

diff --git a/classes/squashfs.bbclass b/classes/squashfs.bbclass
deleted file mode 100644
index 829625a1..00000000
--- a/classes/squashfs.bbclass
+++ /dev/null
@@ -1,51 +0,0 @@ 
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2021-2023
-#
-# Authors:
-#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-def get_free_mem():
-    try:
-        with open('/proc/meminfo') as meminfo:
-            lines = meminfo.readlines()
-            for line in lines:
-                if line.startswith('MemAvailable:'):
-                    return int(line.split()[1]) * 1024
-    except FileNotFoundError:
-        pass
-    return 4*1024*1024*1024  # 4G
-
-IMAGER_INSTALL:squashfs += "squashfs-tools"
-
-SQUASHFS_EXCLUDE_DIRS ?= ""
-SQUASHFS_CONTENT ?= "${PP_ROOTFS}"
-SQUASHFS_CREATION_ARGS ?= ""
-
-SQUASHFS_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}"
-SQUASHFS_MEMLIMIT ?= "${@int(get_free_mem() * 3/4)}"
-SQUASHFS_CREATION_LIMITS = "-mem ${SQUASHFS_MEMLIMIT} -processors ${SQUASHFS_THREADS}"
-
-python __anonymous() {
-    exclude_directories = d.getVar('SQUASHFS_EXCLUDE_DIRS').split()
-    if len(exclude_directories) == 0:
-        return
-    # Use wildcard to exclude only content of the directory.
-    # This allows to use the directory as a mount point.
-    args = " -wildcards"
-    for dir in exclude_directories:
-        args += " -e '{dir}/*' ".format(dir=dir)
-    d.appendVar('SQUASHFS_CREATION_ARGS', args)
-}
-
-IMAGE_CMD:squashfs[depends] = "${PN}:do_transform_template"
-IMAGE_CMD:squashfs[vardepsexclude] += "SQUASHFS_CREATION_LIMITS"
-IMAGE_CMD:squashfs() {
-    ${SUDO_CHROOT} /bin/mksquashfs \
-        '${SQUASHFS_CONTENT}' '${IMAGE_FILE_CHROOT}' \
-        -noappend ${SQUASHFS_CREATION_LIMITS} ${SQUASHFS_CREATION_ARGS}
-}
diff --git a/kas-cip.yml b/kas-cip.yml
index 1c868afc..6c8d2f98 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,7 +22,7 @@  repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: 37cb017a0e63f9cc26c5ff1805190a95cd0cfad9
+    commit: 21e9d1a22124014b274006c917da6681c9fd096f
     layers:
       meta: