14 files changed, 34 insertions, 110 deletions

diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
index 781763d1f1..961d4ea31d 100644
--- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
+++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
@@ -18,7 +18,7 @@ class Systemdboot(OESelftestTestCase):
 
         # Set EFI_PROVIDER = "systemdboot" and MACHINE = "genericx86-64" in conf/local.conf
         features = 'EFI_PROVIDER = "systemd-boot"\n'
-        features += 'MACHINE = "genericx86-64"\n'
+        features += 'MACHINE:forcevariable = "genericx86-64"\n'
         features += 'IMAGE_FSTYPES += "wic"\n'
         features += 'COMPATIBLE_MACHINE:pn-ssh-pregen-hostkeys:genericx86-64 = "genericx86-64"\n'
         self.append_config(features)
diff --git a/meta/classes-recipe/core-image.bbclass b/meta/classes-recipe/core-image.bbclass
index 309a7c577b..4072e420c5 100644
--- a/meta/classes-recipe/core-image.bbclass
+++ b/meta/classes-recipe/core-image.bbclass
@@ -33,7 +33,6 @@
 #                         LICENSE_CREATE_PACKAGE="1" to be set when building packages too
 # - doc-pkgs            - documentation packages for all installed packages in the rootfs
 # - bash-completion-pkgs - bash-completion packages for recipes using bash-completion bbclass
-# - zsh-completion-pkgs - zsh-completion packages
 # - ptest-pkgs          - ptest packages for all ptest-enabled recipes
 # - read-only-rootfs    - tweaks an image to support read-only rootfs
 # - stateless-rootfs    - systemctl-native not run, image populated by systemd at runtime
diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass
index c289808404..75ed696b72 100644
--- a/meta/classes-recipe/kernel-module-split.bbclass
+++ b/meta/classes-recipe/kernel-module-split.bbclass
@@ -131,7 +131,7 @@ python split_kernel_module_packages () {
         if modconf and basename in modconflist:
             os.makedirs(os.path.dirname(name), exist_ok=True)
             with open(name, 'w') as f:
-                f.write("%s\n" % modconf.encode().decode('unicode-escape'))
+                f.write("%s\n" % modconf)
         elif modconf:
             bb.error("Please ensure module %s is listed in KERNEL_MODULE_PROBECONF since module_conf_%s is set" % (basename, basename))
         # If the .conf file exits, then add it to FILES:* and CONFFILES:*.
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass
index 8e671cf28f..0c2fd26e6f 100644
--- a/meta/classes-recipe/populate_sdk_base.bbclass
+++ b/meta/classes-recipe/populate_sdk_base.bbclass
@@ -24,7 +24,6 @@ COMPLEMENTARY_GLOB[dbg-pkgs] = '*-dbg'
 COMPLEMENTARY_GLOB[src-pkgs] = '*-src'
 COMPLEMENTARY_GLOB[ptest-pkgs] = '*-ptest ${MLPREFIX}ptest-runner'
 COMPLEMENTARY_GLOB[bash-completion-pkgs] = '*-bash-completion'
-COMPLEMENTARY_GLOB[zsh-completion-pkgs] = '*-zsh-completion'
 
 def complementary_globs(featurevar, d):
     all_globs = d.getVarFlags('COMPLEMENTARY_GLOB')
diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass
index 36a3e9c836..2859320ddf 100644
--- a/meta/classes-recipe/populate_sdk_ext.bbclass
+++ b/meta/classes-recipe/populate_sdk_ext.bbclass
@@ -317,15 +317,10 @@ def write_local_conf(d, baseoutpath, derivative, core_meta_subdir, uninative_che
                 return origvalue, op, 0, True
         varlist = ['[^#=+ ]*']
         oldlines = []
-        if os.path.exists(builddir + '/conf/site.conf'):
-            with open(builddir + '/conf/site.conf', 'r') as f:
-                oldlines += f.readlines()
-        if os.path.exists(builddir + '/conf/auto.conf'):
-            with open(builddir + '/conf/auto.conf', 'r') as f:
-                oldlines += f.readlines()
-        if os.path.exists(builddir + '/conf/local.conf'):
-            with open(builddir + '/conf/local.conf', 'r') as f:
-                oldlines += f.readlines()
+        for conffile in ['site.conf', 'auto.conf', 'toolcfg.conf', 'local.conf']:
+            if os.path.exists(builddir + '/conf/' + conffile):
+                with open(builddir + '/conf/' + conffile, 'r') as f:
+                    oldlines += f.readlines()
         (updated, newlines) = bb.utils.edit_metadata(oldlines, varlist, handle_var)
 
         with open(baseoutpath + '/conf/local.conf', 'w') as f:
diff --git a/meta/classes-recipe/toolchain-scripts.bbclass b/meta/classes-recipe/toolchain-scripts.bbclass
index 5d28df845b..ec040b5ebb 100644
--- a/meta/classes-recipe/toolchain-scripts.bbclass
+++ b/meta/classes-recipe/toolchain-scripts.bbclass
@@ -87,11 +87,12 @@ toolchain_create_sdk_env_script () {
 # Caller must ensure CONFIG_SITE is setup
 toolchain_create_tree_env_script () {
         script=${B}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
+        bitbakedir=$(readlink -f ${BITBAKEPATH}/..)
         rm -f $script
         touch $script
         echo 'standalone_sysroot_target="${STAGING_DIR}/${MACHINE}"' >> $script
         echo 'standalone_sysroot_native="${STAGING_DIR}/${BUILD_ARCH}"' >> $script
-        echo 'orig=`pwd`; cd ${COREBASE}; . ./oe-init-build-env ${TOPDIR}; cd $orig' >> $script
+        echo "orig=`pwd`; cd ${COREBASE}; . ./oe-init-build-env ${TOPDIR} $bitbakedir; cd \$orig" >> $script
         echo 'export PATH=$standalone_sysroot_native/${bindir_native}:$standalone_sysroot_native/${bindir_native}/${TARGET_SYS}:$PATH' >> $script
         echo 'export PKG_CONFIG_SYSROOT_DIR=$standalone_sysroot_target' >> $script
         echo 'export PKG_CONFIG_PATH=$standalone_sysroot_target'"$libdir"'/pkgconfig:$standalone_sysroot_target'"$prefix"'/share/pkgconfig' >> $script
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index eebefc4840..8d1ea5491d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -813,6 +813,7 @@ FILESOVERRIDES = "${TRANSLATED_TARGET_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDE
 require conf/abi_version.conf
 include conf/site.conf
 include conf/auto.conf
+include conf/toolcfg.conf
 include conf/local.conf
 
 OE_FRAGMENTS_PREFIX ?= "conf/fragments"
diff --git a/meta/lib/bbconfigbuild/configfragments.py b/meta/lib/bbconfigbuild/configfragments.py
index fec985b442..21baedc9a4 100644
--- a/meta/lib/bbconfigbuild/configfragments.py
+++ b/meta/lib/bbconfigbuild/configfragments.py
@@ -115,7 +115,7 @@ class ConfigFragmentsPlugin(LayerPlugin):
     def create_conf(self, confpath):
         if not os.path.exists(confpath):
             with open(confpath, 'w') as f:
-                f.write('')
+                f.write('# Automated config file controlled by tools\n')
         with open(confpath, 'r') as f:
             lines = f.read()
         if "OE_FRAGMENTS += " not in lines:
@@ -184,7 +184,7 @@ class ConfigFragmentsPlugin(LayerPlugin):
             print("All fragments removed from {}.".format(args.confpath))
 
     def register_commands(self, sp):
-        default_confpath = os.path.join(os.environ["BBPATH"], "conf/local.conf")
+        default_confpath = os.path.join(os.environ["BBPATH"], "conf/toolcfg.conf")
 
         parser_list_fragments = self.add_command(sp, 'list-fragments', self.do_list_fragments, parserecipes=False)
         parser_list_fragments.add_argument("--confpath", default=default_confpath, help='Configuration file which contains a list of enabled fragments (default is {}).'.format(default_confpath))
diff --git a/meta/lib/patchtest/repo.py b/meta/lib/patchtest/repo.py
index 6a7d7d2d3b..2cdd6736e4 100644
--- a/meta/lib/patchtest/repo.py
+++ b/meta/lib/patchtest/repo.py
@@ -21,12 +21,7 @@ class PatchTestRepo(object):
         self.repodir = repodir
         self.repo = git.Repo.init(repodir)
         self.patch = mbox.PatchSeries(patch)
-
-        if self.repo.head.is_detached:
-            self.current_commit = self.repo.head.commit.hexsha
-            self.current_branch = None
-        else:
-            self.current_branch = self.repo.active_branch.name
+        self.current_branch = self.repo.active_branch.name
 
         # targeted branch defined on the patch may be invalid, so make sure there
         # is a corresponding remote branch
@@ -85,6 +80,6 @@ class PatchTestRepo(object):
             self._patchmerged = True
 
     def clean(self):
-        self.repo.git.execute(['git', 'checkout', self.current_branch if self.current_branch else self.current_commit])
+        self.repo.git.execute(['git', 'checkout', self.current_branch])
         self.repo.git.execute(['git', 'branch', '-D', self._workingbranch])
         self._patchmerged = False
diff --git a/meta/recipes-devtools/gn/gn_git.bb b/meta/recipes-devtools/gn/gn_git.bb
index 87ccfe3704..d8896609b1 100644
--- a/meta/recipes-devtools/gn/gn_git.bb
+++ b/meta/recipes-devtools/gn/gn_git.bb
@@ -49,4 +49,4 @@ BBCLASSEXTEND = "native"
 
 COMPATIBLE_HOST = "^(?!riscv32).*"
 
-CFLAGS += "-Wno-error=maybe-uninitialized"
+CFLAGS:append:toolchain-gcc = " -Wno-error=maybe-uninitialized"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/99_x11 b/meta/recipes-graphics/xorg-lib/libx11/99_x11
deleted file mode 100644
index 53c5b49d10..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/99_x11
+++ /dev/null
@@ -1 +0,0 @@
-d root root 1777 /tmp/.X11-unix none
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb
index 23a4b228a9..580e44889d 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.12.bb
@@ -21,8 +21,7 @@ PE = "1"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://disable_tests.patch \
-            file://99_x11"
+SRC_URI += "file://disable_tests.patch"
 
 SRC_URI[sha256sum] = "fa026f9bb0124f4d6c808f9aef4057aad65e7b35d8ff43951cef0abe06bb9a9a"
 
@@ -36,17 +35,7 @@ PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
 
 PACKAGES =+ "${PN}-xcb"
 
-do_install:append() {
-        # temporary directory required for x11 domain sockets
-        # systemd provides their own definition using tmpfiles.d
-        if ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'false', 'true', d)}; then
-                install -d ${D}${sysconfdir}/default/volatiles
-                install -m 0644 ${UNPACKDIR}/99_x11 ${D}${sysconfdir}/default/volatiles/99_x11
-        fi
-}
-
-FILES:${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt \
-                ${libdir}/tmpfiles.d/x11.conf ${sysconfdir}/default/volatiles/99_x11"
+FILES:${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt"
 FILES:${PN}-xcb += "${libdir}/libX11-xcb.so.*"
 FILES:${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 9d596be3a7..b9e60cbe4e 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -345,64 +345,29 @@ class Disk:
                                                    path))
 
     def copy(self, src, dest):
-        """Copy files or directories to/from the vfat or ext* partition."""
-        pnum = dest.part if isinstance(src, str) else src.part
-        partimg = self._get_part_image(pnum)
+        """Copy partition image into wic image."""
+        pnum =  dest.part if isinstance(src, str) else src.part
 
         if self.partitions[pnum].fstype.startswith('ext'):
-            if isinstance(src, str): # host to image case
-                if os.path.isdir(src):
-                    base = os.path.abspath(src)
-                    base_parent = os.path.dirname(base)
-                    cmds = []
-                    made = set()
-
-                    for root, dirs, files in os.walk(base):
-                        for fname in files:
-                            host_file = os.path.join(root, fname)
-                            rel = os.path.relpath(host_file, base_parent)
-                            dest_file = os.path.join(dest.path, rel)
-                            dest_dir = os.path.dirname(dest_file)
-
-                            # create dir structure (mkdir -p)
-                            parts = dest_dir.strip('/').split('/')
-                            cur = ''
-                            for p in parts:
-                                cur = cur + '/' + p
-                                if cur not in made:
-                                    cmds.append(f'mkdir "{cur}"')
-                                    made.add(cur)
-
-                            cmds.append(f'write "{host_file}" "{dest_file}"')
-
-                    # write script to a temp file
-                    with tempfile.NamedTemporaryFile(mode='w', delete=False,
-                                                     prefix='wic-debugfs-') as tf:
-                        for line in cmds:
-                            tf.write(line + '\n')
-                        scriptname = tf.name
-
-                    cmd = f"{self.debugfs} -w -f {scriptname} {partimg}"
-
-                else: # single file
-                    cmd = "printf 'cd {}\nwrite {} {}\n' | {} -w {}".\
-                          format(os.path.dirname(dest.path), src,
-                                 os.path.basename(src), self.debugfs, partimg)
-
-            else: # image to host case
+            if isinstance(src, str):
+                cmd = "printf 'cd {}\nwrite {} {}\n' | {} -w {}".\
+                      format(os.path.dirname(dest.path), src, os.path.basename(src),
+                             self.debugfs, self._get_part_image(pnum))
+            else: # copy from wic
+                # run both dump and rdump to support both files and directory
                 cmd = "printf 'cd {}\ndump /{} {}\nrdump /{} {}\n' | {} {}".\
                       format(os.path.dirname(src.path), src.path,
-                             dest, src.path, dest, self.debugfs, partimg)
-
+                             dest, src.path, dest, self.debugfs,
+                             self._get_part_image(pnum))
         else: # fat
             if isinstance(src, str):
                 cmd = "{} -i {} -snop {} ::{}".format(self.mcopy,
-                                                      partimg,
-                                                      src, dest.path)
+                                                  self._get_part_image(pnum),
+                                                  src, dest.path)
             else:
                 cmd = "{} -i {} -snop ::{} {}".format(self.mcopy,
-                                                      partimg,
-                                                      src.path, dest)
+                                                  self._get_part_image(pnum),
+                                                  src.path, dest)
 
         exec_cmd(cmd, as_shell=True)
         self._put_part_image(pnum)
diff --git a/scripts/runqemu b/scripts/runqemu
index 4bac151ccf..c28980e616 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -421,27 +421,8 @@ class BaseConfig(object):
         else:
             raise RunQemuError("Unknown path arg %s" % p)
 
-    def rootfs_fixups(self):
-
-        """Decompress and/or resize the rootfs image, if needed"""
-        qb_rootfs_opt = self.get('QB_ROOTFS_OPT')
-
-        # Check if sdcard size is a power of 2, as that is currently a requirement for qemu
-        # See https://gitlab.com/qemu-project/qemu/-/issues/1754
-        rootfs_size = os.path.getsize(self.rootfs)
-        rootfs_size_pwr2 = 1 << (rootfs_size - 1).bit_length()
-        if ("if=sd" in qb_rootfs_opt or "if=pflash" in qb_rootfs_opt) and rootfs_size != rootfs_size_pwr2:
-            logger.info("Using sd-card or pflash and is not power of 2. File size %d, power of 2 size %d" %(rootfs_size, rootfs_size_pwr2))
-            logger.info("Attempting to use truncate to correct this.")
-
-            # Ensure the 'truncate' tool is installed before attempting to make a power of 2.
-            if not shutil.which('truncate'):
-                raise RunQemuError(f"'truncate' is required to make {self.rootfs} a power of 2 in size but was not found in PATH")
-            try:
-                subprocess.check_call(['truncate', '-s', str(rootfs_size_pwr2), self.rootfs])
-            except subprocess.CalledProcessError as e:
-                raise RunQemuError(f"Failed to make {self.rootfs} power of 2 in size: {e}")
-
+    def uncompress_rootfs(self):
+        """Decompress ZST rootfs image if needed"""
         if not self.rootfs or not self.fstype.endswith('.zst'):
             return
         
@@ -903,7 +884,7 @@ to your build configuration.
         self.set('QB_MEM', qb_mem)
 
         mach = self.get('MACHINE')
-        if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')) and self.get('QB_DTB') == "":
+        if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')):
             self.kernel_cmdline_script += ' mem=%s' % self.get('QB_MEM').replace('-m','').strip() + 'M'
 
         self.qemu_opt_script += ' %s' % self.get('QB_MEM')
@@ -1828,7 +1809,7 @@ def main():
         config.check_args()
         config.read_qemuboot()
         config.check_and_set()
-        config.rootfs_fixups()
+        config.uncompress_rootfs()
         # Check whether the combos is valid or not
         config.validate_combos()
         config.print_config()