Page MenuHomeFreeBSD
Differential D24276

ci-qemu-test.sh: use pkgbase
ClosedPublic
Actions

Authored by emaste on Apr 3 2020, 9:49 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Nov 29, 7:55 AM
Unknown Object (File)
Tue, Nov 26, 2:51 AM
Unknown Object (File)
Mon, Nov 25, 2:03 PM
Unknown Object (File)
Nov 22 2024, 4:26 PM
Unknown Object (File)
Nov 20 2024, 8:16 PM
Unknown Object (File)
Nov 19 2024, 6:54 PM
Unknown Object (File)
Nov 9 2024, 8:00 PM
Unknown Object (File)
Oct 27 2024, 3:35 AM
View All Files
Subscribers
bapt
imp
manu

Details

Reviewers
bcran
• ian
manu
imp
Group Reviewers
pkgbase
Commits
rS365365: ci-qemu-test.sh: use pkgbase
Summary

Instead of an ad-hoc list of directories to make install.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste created this revision.Apr 3 2020, 9:49 PM
emaste added inline comments.
tools/boot/ci-qemu-test.sh
36–44

should probably get objtop from make -V OBJTOP as with srctop, below

emaste updated this revision to Diff 70168.Apr 3 2020, 9:56 PM
emaste added reviewers: bcran, • ian.

Get OBJTOP from make -V OBJTOP

emaste added a subscriber: bapt.Apr 4 2020, 5:01 PM

Need to get pkg to use uncompressed files still, with this change Cirrus-CI failed with:

sh tools/boot/ci-qemu-test.sh
pkg: Warning: Major OS version upgrade detected.  Running "pkg bootstrap -f" recommended
Updating local repository catalogue...
pkg: file:///usr/obj/tmp/cirrus-ci-build/repo/FreeBSD:13:amd64/latest/meta.txz: No such file or directory
repository local has no meta file, using default settings
pkg: file:///usr/obj/tmp/cirrus-ci-build/repo/FreeBSD:13:amd64/latest/packagesite.txz: No such file or directory
Unable to update repository local
Error updating repositories!
bcran accepted this revision.Apr 5 2020, 4:31 AM

Works great here.

This revision is now accepted and ready to land.Apr 5 2020, 4:31 AM
manu accepted this revision.Apr 5 2020, 11:47 AM
manu added a subscriber: manu.

Not familiar with this script but the code looks ok to me.
To test better that we don't break pkg dependencies maybe omit FreeBSD-clibs as it should be installed as FreeBSD-runtime depends on it.
This would test that installing kernel+bootloader+runtime result in a bootable install in single user.

emaste added a subscriber: imp.Sep 3 2020, 6:12 PM
emaste added a comment.Sep 3 2020, 6:28 PM

I held off from committing this originally because pkg did not yet properly support .tar packages. This works now and I plan to commit soon.

imp added inline comments.Sep 4 2020, 3:35 PM
tools/boot/ci-qemu-test.sh
9

I don't think make buildworld generates the proper repo. Maybe you should include a sentence for the preconditions for this?

29

Is this still true?

emaste updated this revision to Diff 76666.Sep 4 2020, 7:34 PM

Update comment as suggested by @imp

This revision now requires review to proceed.Sep 4 2020, 7:34 PM
emaste updated this revision to Diff 76667.Sep 4 2020, 7:36 PM

Also remove outdated comment

emaste marked an inline comment as done.Sep 4 2020, 7:36 PM
emaste added inline comments.
tools/boot/ci-qemu-test.sh
9

Yes, this comment needs updating. (The preconditions for this script are implicitly specified in .cirrus.yml.)

imp accepted this revision.Sep 5 2020, 4:27 AM
This revision is now accepted and ready to land.Sep 5 2020, 4:27 AM
Closed by commit rS365365: ci-qemu-test.sh: use pkgbase (authored by emaste). · Explain WhySep 5 2020, 7:03 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rS365365: ci-qemu-test.sh: use pkgbase.

Revision Contents
Changeset List

PathSize
tools/
boot/
31 lines

Diff 70168

View Options

tools/boot/ci-qemu-test.sh

Loading...