Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use git commit instead of snapshot tarball for bootstrap, disable auto-sync, clean var/tmp #143

Merged
merged 15 commits into from
Nov 29, 2021

Conversation

bedroge
Copy link
Collaborator

@bedroge bedroge commented Nov 29, 2021

These changes will make the bootstrap script use a prefetched git commit from the Gentoo overlay on GitHub, removing the need to provide a snapshot tarball. This gives us more fine-grained control over what should be used as base for the bootstrap.

Furthermore, it sets auto-sync = no, which will basically ignore the emerge --sync that the bootstrap usually does. This should make the build much more reproducible. @boegel is this enough to close issue #132?

Finally, it also adds a simple step that removes the contents of $EPREFIX/var/tmp after completion of the bootstrap process, i.e. it closes #142.

prefix_snapshot_url: https://eessi-gentoo-snapshot.s3-eu-west-1.amazonaws.com
prefix_snapshot_version: 20211120
prefix_gentoo_overlay: https://github.com/gentoo/gentoo
prefix_gentoo_commit: 7eaa2512d1e6ddb44e3b41bbddf6c74723f234ce
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a comment with some guidelines about how to pick a commit to use?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a short comment in e767711, I'd propose to maybe do that in more details in the (still to be written) documentation?

Copy link
Contributor

@boegel boegel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@boegel
Copy link
Contributor

boegel commented Nov 29, 2021

Installation of compat layer with these updates worked like a charm on aarch64, diff in list of installed packages compared to what we obtained with #140 made sense:

$ diff -u 2021.12-draft-aarch64-compat-layer-pkgs.txt 2021.12-aarch64-compat-layer-pkgs.txt
--- 2021.12-draft-aarch64-compat-layer-pkgs.txt	2021-11-29 21:33:57.000000000 +0100
+++ 2021.12-aarch64-compat-layer-pkgs.txt	2021-11-29 21:31:43.000000000 +0100
@@ -153,13 +153,13 @@
 dev-python/jinja-3.0.3
 dev-python/jsonpointer-2.2
 dev-python/jsonschema-4.2.1-r1
-dev-python/keyring-23.3.0
+dev-python/keyring-23.4.0
 dev-python/lxml-4.6.4
 dev-python/markupsafe-2.0.1
 dev-python/more-itertools-8.12.0
 dev-python/namespace-zope-1-r1
 dev-python/packaging-21.3
-dev-python/pip-21.3.1
+dev-python/pip-21.3.1-r1
 dev-python/pluggy-1.0.0-r1
 dev-python/ply-3.11-r1
 dev-python/py-1.11.0
@@ -178,10 +178,10 @@
 dev-python/rfc3339-validator-0.1.4
 dev-python/rfc3986-validator-0.1.1
 dev-python/rfc3987-1.3.8-r1
-dev-python/rich-10.14.0
+dev-python/rich-10.15.0
 dev-python/secretstorage-3.3.1
 dev-python/semver-2.13.0
-dev-python/setuptools-59.3.0
+dev-python/setuptools-59.4.0
 dev-python/setuptools_scm-6.3.2
 dev-python/six-1.16.0
 dev-python/smmap-5.0.0
@@ -236,7 +236,6 @@
 sys-apps/grep-3.7
 sys-apps/groff-1.22.4
 sys-apps/help2man-1.48.5
-sys-apps/hwids-20210613-r2
 sys-apps/kmod-29
 sys-apps/less-590
 sys-apps/man-db-2.9.4-r1
@@ -272,7 +271,7 @@
 sys-devel/make-4.3
 sys-devel/patch-2.7.6-r4
 sys-fs/e2fsprogs-1.46.4
-sys-fs/udev-249.6
+sys-fs/udev-249.6-r1
 sys-fs/udev-init-scripts-35
 sys-kernel/installkernel-gentoo-3
 sys-kernel/linux-headers-5.15

@boegel boegel merged commit 731342e into EESSI:main Nov 29, 2021
@bedroge bedroge deleted the dont_sync_gentoo_overlay branch November 30, 2021 09:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove contents of $EPREFIX/var/tmp after successful bootstrap
2 participants