Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mkosi for openSUSE:Factory checked in at 2021-12-03 20:35:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkosi (Old) and /work/SRC/openSUSE:Factory/.mkosi.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkosi" Fri Dec 3 20:35:49 2021 rev:6 rq:935542 version:12 Changes: -------- --- /work/SRC/openSUSE:Factory/mkosi/mkosi.changes 2021-12-02 22:31:44.778334105 +0100 +++ /work/SRC/openSUSE:Factory/.mkosi.new.31177/mkosi.changes 2021-12-03 20:36:17.780026278 +0100 @@ -1,0 +2,11 @@ +Fri Dec 3 14:55:35 UTC 2021 - Guillaume GARDET <[email protected]> + +- Enable build on aarch64 + +------------------------------------------------------------------- +Fri Dec 3 06:59:38 UTC 2021 - Sebastian Wagner <[email protected]> + +- update to version 12: + - Fix handling of baselayout in Gentoo installations. + +------------------------------------------------------------------- Old: ---- mkosi-11.tar.gz New: ---- mkosi-12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkosi.spec ++++++ --- /var/tmp/diff_new_pack.X8d96c/_old 2021-12-03 20:36:18.252024553 +0100 +++ /var/tmp/diff_new_pack.X8d96c/_new 2021-12-03 20:36:18.256024538 +0100 @@ -17,7 +17,7 @@ Name: mkosi -Version: 11 +Version: 12 Release: 0 Summary: Build Legacy-Free OS Images License: LGPL-2.1-or-later @@ -43,7 +43,7 @@ Recommends: veritysetup Recommends: zstd BuildArch: noarch -ExclusiveArch: x86_64 +ExclusiveArch: x86_64 aarch64 %description A fancy wrapper around dnf --installroot, debootstrap, pacstrap and zypper that ++++++ mkosi-11.tar.gz -> mkosi-12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkosi-11/NEWS.md new/mkosi-12/NEWS.md --- old/mkosi-11/NEWS.md 2021-11-24 16:10:05.000000000 +0100 +++ new/mkosi-12/NEWS.md 2021-11-30 09:39:26.000000000 +0100 @@ -1,6 +1,11 @@ # mkosi Changelog -## v11 (unreleased) +## v12 + +- Fix handling of baselayout in Gentoo installations. + + +## v11 - Support for Rocky Linux, Alma Linux, and Gentoo has been added! - A new `ManifestFormat=` option can be used to generate "manifest" files that diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkosi-11/man/mkosi.1 new/mkosi-12/man/mkosi.1 --- old/mkosi-11/man/mkosi.1 2021-11-24 16:10:05.000000000 +0100 +++ new/mkosi-12/man/mkosi.1 2021-11-30 09:39:26.000000000 +0100 @@ -800,7 +800,7 @@ \f[B]\f[CB]CleanPackageMetadata=\f[B]\f[R], \f[B]\f[CB]--clean-package-metadata=\f[B]\f[R] Enable/disable removal of package manager databases, caches, and logs at the end of installation. -Can be specifed as true, false, or \[lq]\f[C]auto\f[R]\[rq] (the +Can be specified as true, false, or \[lq]\f[C]auto\f[R]\[rq] (the default). With \[lq]\f[C]auto\f[R]\[rq], files will be removed if the respective package manager executable is \f[I]not\f[R] present at the end of the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkosi-11/mkosi/__init__.py new/mkosi-12/mkosi/__init__.py --- old/mkosi-11/mkosi/__init__.py 2021-11-24 16:10:05.000000000 +0100 +++ new/mkosi-12/mkosi/__init__.py 2021-11-30 09:39:26.000000000 +0100 @@ -98,7 +98,7 @@ complete_step = MkosiPrinter.complete_step -__version__ = "11" +__version__ = "12" # These types are only generic during type checking and not at runtime, leading @@ -1808,7 +1808,7 @@ """Add packages in @names to @packages, if enabled by --base-packages. - If @conditional is specifed, rpm-specific syntax for boolean + If @conditional is specified, rpm-specific syntax for boolean dependencies will be used to include @names if @conditional is satisfied. """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkosi-11/mkosi/gentoo.py new/mkosi-12/mkosi/gentoo.py --- old/mkosi-11/mkosi/gentoo.py 2021-11-24 16:10:05.000000000 +0100 +++ new/mkosi-12/mkosi/gentoo.py 2021-11-30 09:39:26.000000000 +0100 @@ -261,7 +261,7 @@ self.set_useflags() self.mkosi_conf() self.baselayout(args, root) - self.fetch_fix_stage3(root) + self.fetch_fix_stage3(args, root) self.update_stage3(args, root) self.depclean(args, root) @@ -269,7 +269,7 @@ root: Path) -> None: self.invoke_emerge(args, root, inside_stage3=False, actions=["--sync"]) - def fetch_fix_stage3(self, root: Path) -> None: + def fetch_fix_stage3(self, args: CommandLineArguments, root: Path) -> None: """usrmerge tracker bug: https://bugs.gentoo.org/690294"""; # e.g.: @@ -323,41 +323,8 @@ # remove once upstream ships the current *baselayout-999* # version alternative would be to mount /sys as tmpfs when # invoking emerge inside stage3; we don't want that. - baselaouy_qlist = [ - "etc/env.d/50baselayout", - "etc/hosts", - "etc/networks", - "etc/profile", - "etc/protocols", - "etc/services", - "etc/shells", - "etc/filesystems", - "etc/inputrc", - "etc/issue", - "etc/issue.logo", - "etc/gentoo-release", - "lib/modprobe.d/aliases.conf", - "lib/modprobe.d/i386.conf", - "lib/sysctl.d/00protected-links.conf", - "usr/lib/os-release", - "usr/share/baselayout/fstab", - "usr/share/baselayout/group", - "usr/share/baselayout/issue.devfix", - "usr/share/baselayout/passwd", - "usr/share/baselayout/shadow", - "etc/os-release", - "usr/share/applications/javaws.desktop", - "usr/share/pixmaps/java-icon48.png", - "etc/revdep-rebuild/60-java", - "etc/profile.d/java-config-2.csh", - "etc/profile.d/java-config-2.sh", - "etc/env.d/20java-config", - "etc/ssl/certs/java/.keep_sys-apps_baselayout-java-0", - "etc/ca-certificates/update.d/java-cacerts", - ] - for path in baselaouy_qlist: - if stage3_tmp_extract.joinpath(path).exists(): - stage3_tmp_extract.joinpath(path).unlink() + self.invoke_emerge(args, stage3_tmp_extract, inside_stage3=True, + opts=["--unmerge"], pkgs=["sys-apps/baselayout"]) unlink_try_hard(stage3_tmp_extract.joinpath("dev")) unlink_try_hard(stage3_tmp_extract.joinpath("proc")) @@ -551,9 +518,6 @@ def update_stage3(self, args: CommandLineArguments, root: Path) -> None: # exclude baselayout, it expects /sys/.keep but nspawn mounts host's # /sys for us without the .keep file. - self.invoke_emerge(args, root, inside_stage3=True, - opts=["--unmerge"], - pkgs=["=sys-apps/baselayout-2.7"]) opts = self.EMERGE_UPDATE_OPTS + ["--exclude", "sys-apps/baselayout"] self.invoke_emerge(args, root, pkgs=self.pkgs_sys, opts=opts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkosi-11/mkosi.md new/mkosi-12/mkosi.md --- old/mkosi-11/mkosi.md 2021-11-24 16:10:05.000000000 +0100 +++ new/mkosi-12/mkosi.md 2021-11-30 09:39:26.000000000 +0100 @@ -800,7 +800,7 @@ `CleanPackageMetadata=`, `--clean-package-metadata=` : Enable/disable removal of package manager databases, caches, and - logs at the end of installation. Can be specifed as true, false, or + logs at the end of installation. Can be specified as true, false, or "`auto`" (the default). With "`auto`", files will be removed if the respective package manager executable is *not* present at the end of the installation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkosi-11/setup.py new/mkosi-12/setup.py --- old/mkosi-11/setup.py 2021-11-24 16:10:05.000000000 +0100 +++ new/mkosi-12/setup.py 2021-11-30 09:39:26.000000000 +0100 @@ -18,7 +18,7 @@ setup( name="mkosi", - version="11", + version="12", description="Build Bespoke OS Images", url="https://github.com/systemd/mkosi";, maintainer="mkosi contributors",
