| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
Otherwise the presence of a .sha256 file would cause this error:
ERROR:catalyst:CatalystError: Ambiguous Filename: /home/catalyst/builds/default/stage3-ia64-openrc-20220216T032203Z
ERROR:catalyst:Please specify the correct extension as well
Fixes: 7457cd3b ("catalyst: generate .sha256 file if any digest is enabled")
Closes: https://bugs.gentoo.org/881705
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 1a8d6cd3d31f960755c3237679539d9cab175bc6)
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backport from master branch
checksum format is simple one, identical to one
sha256sum from coreutils produces, lines starting with # are ignored.
example:[1]
xxxx..... stage3-....tar.xz
systemd upstream calls it suse-style .sha256 files.[0]
infra already supports inline signing of files.
Bug: https://bugs.gentoo.org/821568
[0] https://github.com/systemd/systemd/blob/aedec452b9e5dd197881f2164fb205dfe8bfdcec/src/import/pull-common.c#L236
[1] https://mirrors.edge.kernel.org/opensuse/distribution/leap/15.0/iso/openSUSE-Leap-15.0-DVD-x86_64.iso.sha256
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
... which will make them usable on the PlayStation 2. Don't bother
modifying the n64 ABI configuration, since it will never work on the
PS2.
Backport from master branch
Suggested-by: Fredrik Noring <noring@nocrew.org>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
|
|
| |
Apparently the snakeoil locking mechanisms implicitly created the
directory for us.
Closes: https://bugs.gentoo.org/806229
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
|
| |
I missed this when backporting.
Fixes: 9221e327 ("catalyst: Replace snakeoil's locks with fasteners")
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
The last meaningful changes to it were in 2009. I don't think it
contains anything of value, and it's not an accurate reflection of the
state of today.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 9f9837a80af589648261cbacea2e923c5720b2fa)
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To no great surprise, the existing locking was broken. For example,
clear_chroot() releases the lock. It is called by unpack(), which is
part of prepare_sequence. The result is that the whole build could be
done without holding the lock.
Just lock around run(). It's not apparent that finer-grained locking
does anything for us.
For the catalyst-3.0-stable branch, just remove all the snapcache
locking. It's broken (bug #519656) and no one is going to fix it, since
snapcache has been removed from the master branch.
Bug: https://bugs.gentoo.org/791583
Closes: https://bugs.gentoo.org/519656
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit b3c917f7fa73d11c69b7e55dc7a00bc18a18edc7)
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
|
|
|
|
| |
Machine IDs are unique per installation, but if they are retained in a
stage tarball, all installations from that stage share the same machine
id.
Signed-off-by: Daniel Cordero <catalyst@0xdc.io>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit c1f5707a9c9f27f730aad908c8f3c86075201fc9)
|
|
|
|
| |
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
|
|
|
|
| |
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
|
|
|
|
|
|
|
| |
Newer dosfstools has a problem with FAT16 and certain volume sizes.
Let's just let it autodetect the FAT size.
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
| |
Closes: https://bugs.gentoo.org/759685
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 37cabf5c536fe8eef16532f18790c1da566aae15)
|
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 5f62563f52a81b578703f140361a5fcec96e75e5)
|
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 0a0efebb7834f00cea0bb35d708a56ad635627a8)
|
|
|
|
|
|
|
| |
And remove the unnecessary export.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit d1ce4b31637d143eda05472d2216db40d001169c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In stagebase, the set_use function applies .split() to the use flags
passed from the spec file, if the value is a string. However, the
result is immediately overwritten after the if-statement. Therefore the
.split() is ineffectual.
This results in self.settings["use"] holding a string,
which is then regarded as a list of characters in write_make_conf.
This fix ensures that the result of the split is not overwritten
(matching the similar code in set_catalyst_use).
For example, setting "stage4/use: abc" in a spec file results
in USE="a b c ..." in the generated make.conf.
With this fix, the generated make.conf contains the expected
USE="abc ...".
Fixes: b30dd97d ("Unify all make.conf settings and writing")
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 5d01bda685236a8543da3a8136a4fe809f6fd9ae)
|
|
|
|
|
|
| |
Fixes: 3c5ef2e7 ("log: new logging module to standardize catalyst output")
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit b3f0a3535e3550ed7d0dbd3100e43b82e9b34c3b)
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This block of code was added in commit ef648688ce8b ("Forward port the
changes from catalyst 1.1.9 to 1.1.10.10 to catalyst2.") in 2005 without
any further explanation. Since locale-gen was first committed to our
glibc package in 2006, we think that locales were handled differently
before (and not packed into /usr/${libdir}/locale/locale-archive).
Not only is this code unneeded, it can actually cause the locale-archive
to be deleted if the livecd is using a multilib profile! E.g. on a
multilib amd64 profile, where /usr/lib/locale is a symlink to
/usr/lib64/locale, it deletes /usr/lib64/locale/l* which matches
/usr/lib64/locale/locale-archive.
Because the minimal livecd uses a non-multilib profile, this explains
why it still contained the expected set of locales, while the multilib
admincd did not.
Thanks go to Ben Kohler, Thomas Deutschmann, and Andreas Hüttel for
figuring out this mystery!
Bug: https://bugs.gentoo.org/710762
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 234286ffae459764e2dfaf55c94e44ec3ad4e9cd)
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
|
|
|
|
| |
Needed for FEATURES management (switching off pid namespaces in qemu)
and for testing build system hacks (like building python single-threaded
to avoid hangs).
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
|
|
|
|
| |
This likely fixes a bug in 8ca52570aa2d ("keep logs outside of chroot")
that would have prevented any logs (except for those from
dev-util/ccache, sys-devel/distcc, and sys-devel/icecream) from being
kept, since "clean-logs" was added to FEATURES in the wrong place.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 92706a41fadbccf0a39af08ea2a52a2696c68603)
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
|
|
| |
Allows stage3+ builds (e.g., netboot, ISOs, stage4) to share binpkg
directories easily.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit b08a8fabf0c8e6c279848286f74a0c223c82947b)
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
|
| |
Fixes: bb21b8615e64 (catalyst: gzip the .CONTENTS file)
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 060df92357aed97af955aa36caf47e8518b01e05)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Other algorithms give better compression ratios, but the difference is
not meaningful for a 2MiB text file. In my testing bzip2 gave a better
compression ratio of 15:1 vs gzip's 11:1, but that ends up being only a
size difference of 50KiB (136 vs 187) which is only an additional 2.5%
savings from the uncompressed input.
Choose gzip because transparent decompression is widely supported by web
servers and clients.
Closes: https://bugs.gentoo.org/630284
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit bb21b8615e64cb31fa9aa9d533ef328dc1374e45)
|
|
|
|
|
|
|
|
|
|
| |
These files are actually owned by their packages now, and removing them
can break subsequent builds.
See https://archives.gentoo.org/gentoo-releng-autobuilds/message/a115781f8e7fb4bd5adfb94a7f2e63b4
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit ed82ff53408f1e3edb342f16c739c3c2b4012cb0)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's not safe to update portage this way. See
https://bugs.gentoo.org/722748
Additionally, it doesn't seem important to install/update the package
manager first. In all cases except stage1 the seed stage will have an
up-to-date package manager and in stage1 update_seed can handle that.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 3dcaf40a13cf6f1e499c457df319763811aae097)
|
|
|
|
|
|
|
| |
locale-gen is only provided by glibc and not by others.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit bfb2731f7200e9a1f19b65d928586c209b1bf4a2)
|
|
|
|
|
|
| |
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
(cherry picked from commit 25c158df771eecadefc0d1cb591938780a8cbf4d)
Signed-off-by: Matt Turner <mattst88@gentoo.org>
|
|
|
|
|
| |
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 9be399147ac1ff86deaabbd85c733da293c5bce9)
|
|
|
|
|
|
|
|
|
|
| |
It was originally added in commit f325a622f17c (Forward-porting portage
tmpfs mounting ...) in 2005 without much explanation. Something about
the Gentoo installer, I think? Regardless, now all it does is trigger an
error message on boot since stagebase.py deletes the directory.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 3c91b38b9971e76c20acbbb92104818f50cc9876)
|