summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* catalyst 3.0.183.0.18Matt Turner2021-06-061-1/+1
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Remove /etc/machine-id in all stagesDaniel Cordero2021-06-061-1/+1
| | | | | | | | | | 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)
* catalyst 3.0.173.0.17Ben Kohler2021-03-041-1/+1
| | | | Signed-off-by: Ben Kohler <bkohler@gentoo.org>
* catalyst 3.0.16Ben Kohler2021-03-041-1/+1
| | | | Signed-off-by: Ben Kohler <bkohler@gentoo.org>
* create-iso.sh: don't force FAT163.0.16Ben Kohler2021-02-251-3/+3
| | | | | | | 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>
* Fix builder entries for riscv32Andreas K. Hüttel2020-12-231-2/+4
| | | | Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
* catalyst 3.0.153.0.15Matt Turner2020-12-161-1/+1
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* targets: Use interpreter with portage module for build.pyMatt Turner2020-12-161-2/+7
| | | | | | Closes: https://bugs.gentoo.org/759685 Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit 37cabf5c536fe8eef16532f18790c1da566aae15)
* targets: Move ${buildpkgs} error checking closerMatt Turner2020-12-161-6/+6
| | | | | Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit 5f62563f52a81b578703f140361a5fcec96e75e5)
* targets: Make ${buildpkgs} an arrayMatt Turner2020-12-161-4/+3
| | | | | Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit 0a0efebb7834f00cea0bb35d708a56ad635627a8)
* targets: Rename clst_buildpkgs -> buildpkgsMatt Turner2020-12-161-3/+3
| | | | | | | And remove the unnecessary export. Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit d1ce4b31637d143eda05472d2216db40d001169c)
* catalyst: Fix spec file USE flag parsingFelix Bier2020-10-141-1/+2
| | | | | | | | | | | | | | | | | | | | | 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)
* catalyst: Fix typoMatt Turner2020-10-081-1/+1
| | | | | | Fixes: 3c5ef2e7 ("log: new logging module to standardize catalyst output") Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit b3f0a3535e3550ed7d0dbd3100e43b82e9b34c3b)
* catalyst 3.0.143.0.14Matt Turner2020-10-031-1/+1
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* targets: Remove ancient locale-deleting codeMatt Turner2020-10-031-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | 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)
* catalyst 3.0.133.0.13Matt Turner2020-09-191-1/+1
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* Add rv32 subarch names (all cflags magic is done in the profiles)Andreas K. Hüttel2020-09-111-1/+13
| | | | Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
* Allow "interpreter" parameter as space-separated list of filesAndreas K. Hüttel2020-09-041-15/+29
| | | | Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
* stagebase: Extend cleanup logic to more directoriesAndreas K. Hüttel2020-07-241-2/+8
| | | | | | | | 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>
* Add "interpreter" parameter for qemu-user build supportAndreas K. Hüttel2020-07-201-1/+24
| | | | Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
* add rv64 subarch names (all cflags magic is done in the profiles)Andreas K. Hüttel2020-07-181-3/+29
| | | | Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
* catalyst 3.0.123.0.12Matt Turner2020-05-191-1/+1
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* targets: Fix setting FEATURES="clean-logs"Matt Turner2020-05-191-2/+3
| | | | | | | | | | 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)
* catalyst 3.0.113.0.11Matt Turner2020-05-181-1/+1
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* targets: Build with FEATURES=binpkg-multi-instanceMatt Turner2020-05-181-1/+1
| | | | | | | | 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)
* catalyst 3.0.103.0.10Matt Turner2020-05-171-1/+1
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Open CONTENTS file in text modeMatt Turner2020-05-161-1/+1
| | | | | | Fixes: bb21b8615e64 (catalyst: gzip the .CONTENTS file) Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit 060df92357aed97af955aa36caf47e8518b01e05)
* catalyst: gzip the .CONTENTS fileMatt Turner2020-05-163-7/+10
| | | | | | | | | | | | | | | 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)
* targets: Don't delete pyc/pyo filesMatt Turner2020-05-163-8/+0
| | | | | | | | | | 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)
* targets: Drop setup_pkgmgr()Matt Turner2020-05-166-41/+0
| | | | | | | | | | | | | 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)
* targets: Test for locale-genMatt Turner2020-05-161-1/+3
| | | | | | | locale-gen is only provided by glibc and not by others. Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit bfb2731f7200e9a1f19b65d928586c209b1bf4a2)
* create-iso.sh: actually fix du ESP size calculation on x86/amd64Ben Kohler2020-05-161-1/+1
| | | | | | Signed-off-by: Ben Kohler <bkohler@gentoo.org> (cherry picked from commit 25c158df771eecadefc0d1cb591938780a8cbf4d) Signed-off-by: Matt Turner <mattst88@gentoo.org>
* targets: Switch from elilo to GRUB on ia64Matt Turner2020-05-163-69/+6
| | | | | Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit 9be399147ac1ff86deaabbd85c733da293c5bce9)
* targets: Remove portdir entry from livecd's fstabMatt Turner2020-05-161-1/+0
| | | | | | | | | | 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)
* targets: Reduce locales to C.UTF8 in stage buildsMatt Turner2020-05-164-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, glibc generates around 500 locales with more added each year. With USE=-compile-locales, glibc generates the locale archive in pkg_postinst(). Since files generated in pkg_postinst() are not recorded in the vdb, this has the advantage of allowing users to freely change the set of enabled locales (by editing /etc/locale.gen and running locale-gen). Since it is so easy for the user to generate any locales they want with locale-gen (and they probably would have anyway to rid themselves of the 499 locales they don't want!), just disable all locales except for C.UTF8 and save stage builders a lot of time. The patch works by (1) Writing /etc/locale.gen with "C.UTF8 UTF-8" (2) Setting CONFIG_PROTECT so glibc doesn't overwrite /etc/locale.gen (3) Running etc-update to reset /etc/locale.gen In order to do this I modified scripts/bootstrap.sh in commit 0aa49828ae25 (scripts/bootstrap.sh: Allow CONFIG_PROTECT). Reducing the set of locales cuts the user time (as reported by time(1)) of the stage2 and stage3 builds as well as the file size of the resulting xz'd tarballs: stage 2 stage 3 size time size time before 89M 22m42s 206M 45m5s after 77M 4m29s 195M 26m8s An alternative solution would be to set USE=compiled-locales for glibc, but that has the downside of being non-default and likely causing users to unnecessarily rebuild glibc. (We'll do this for the ISOs where we want all the locales) Note that this patch does not change the contents of /etc/locale.gen in the stage3 tarball. Closes: https://bugs.gentoo.org/686862 Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit 5fb710093c0d4643b981db7763f7f14d04e02d79)
* targets: Set LANG=C.UTF8Matt Turner2020-05-161-0/+12
| | | | | | | | | | | | | Stable glibc now always provides a UTF-8 capable locale, which many packages require. Set this as the default LANG. Running locale-gen in stage1 should also solve bug #536938. Bug: https://bugs.gentoo.org/536938 Bug: https://bugs.gentoo.org/710762 Bug: https://bugs.gentoo.org/714906 Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit f0e772bd3905d02d691d0e41b3a8e3bd3c10e2fe)
* targets: Add missing "in"Matt Turner2020-05-161-1/+1
| | | | | | Fixes: a55e0890b809 (targets: Switch from SILO to GRUB on SPARC) Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit a2ba0bda5c5a38a2f34d1a26002d3f4f73776f48)
* targets: Switch from SILO to GRUB on SPARCMatt Turner2020-05-163-45/+8
| | | | | | | Since PPC platforms already use GRUB, this is pretty trivial. Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit a55e0890b809b6597066070b4822a20626f2dfc4)
* targets: Add powerpc* to case statementMatt Turner2020-05-161-1/+1
| | | | | Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit 3706c667f1997f1b4f8c2d907d6cd15aa8fc805a)
* catalyst: Skip "maybe_tmpfs" directory creationMatt Turner2020-05-161-1/+1
| | | | | | Fixes: 8441372c2857 (fix /var/tmp/portage not being forced into a tmpfs) Signed-off-by: Matt Turner <mattst88@gentoo.org> (cherry picked from commit a4f0612d4162d937652c34200e3de0925d113e05)
* update livecd/verify to control digest typecatalyst-4.0-branchpoint3.0.9Rick Farina (Zero_Chaos)2020-02-132-8/+21
| | | | | | plus document it right Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
* add blake2 supportRick Farina (Zero_Chaos)2020-02-133-10/+14
| | | | | | | | | support blake2 for hash and digest functions. per jmbsvicetto, adjusting default digest from "sha512 whirlpool" to "blake2 sha512" for now additionally add blake2 sums for iso verification Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
* kmerge.sh: Ignore missing package.providedMatt Turner2020-02-011-1/+1
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* fix /var/tmp/portage not being forced into a tmpfsRick Farina (Zero_Chaos)2020-01-272-4/+4
| | | | | | | | | 2e91db10 accidently revealed that src tmpfs was being being used when we meant "this might be a tmpfs, or it might not". Fix preexisting code to be more readable and adjust src tmpfs to be what a sane person would expect Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
* functions.sh: find more kernel names (genkernel-4 support)3.0.8Ben Kohler2019-10-221-9/+15
| | | | | | | Also cleaned up some comments & re-enabled the installation of config-* to /boot Signed-off-by: Ben Kohler <bkohler@gentoo.org>
* catalyst 3.0.73.0.7Matt Turner2019-10-191-1/+1
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* Mount tmpfs at /runMatt Turner2019-10-192-0/+5
| | | | | Closes: https://bugs.gentoo.org/659238 Signed-off-by: Matt Turner <mattst88@gentoo.org>
* Update the default CHOST for armv6j_hardfp and armv7a_hardfpFukang Chen2019-10-191-2/+2
| | | | | Closes: https://bugs.gentoo.org/692330 Signed-off-by: Matt Turner <mattst88@gentoo.org>
* arch: Use platform.machine() instead of "buildarch"Matt Turner2019-10-193-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | In stagebase.py, machinemap contains a mapping of subarches to the name of the module they're loaded from. For example: { 'g3': 'powerpc', 'g4': 'powerpc', 'g5': 'powerpc', ... } machinemap[subarch] is assigned to self.settings["buildarch"], so it is always equal to the name of the arch module in use. ppc.py and ppc64.py were merged into powerpc.py (and similarly sparc.py and sparc64.py into sparc.py) in commit 4db65217ed36 ("Merged ppc.py and ppc64.py into powerpc.py and merged sparc.py and sparc64.py into sparc.py, so we have a cleaner set of arch files.") in 2008, leaving these checks against self.settings["buildarch"] always evaluating to false. amd64/x86 are unaffected since they still exist as separate .py files, but x86.py is modified for consistency. Signed-off-by: Matt Turner <mattst88@gentoo.org>
* Improve debugging messagesMatt Turner2019-10-191-1/+2
| | | | | | | - Move start message out of loop - Print loaded module name in the loop Signed-off-by: Matt Turner <mattst88@gentoo.org>