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

grub-tb-common.inc: clone gnulib in do_fetch() #36

Merged
merged 4 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .oelint-ruleset.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"oelint.vars.fileextrapathsop": "error",
"oelint.var.filesoverride": "warning",
"oelint.vars.homepageprefix": "warning",
"oelint.vars.homepageping": "warning",
"oelint.vars.homepageping": "info",
"oelint.vars.insaneskip": "info",
"oelint.var.licenseremotefile": "info",
"oelint.vars.licensesdpx": "warning",
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ repos:
args: ["--severity=warning"]

- repo: https://github.com/zarhus/oelint-adv
rev: 949111ff4d256af759aa5d94db9d0fb444679b2
rev: 5.5.2-zarhus
hooks:
- id: oelint-adv
args: [--rulefile=.oelint-ruleset.json, --hide=info, --quiet, --fix]
Expand Down
24 changes: 20 additions & 4 deletions recipes-bsp/grub/grub-tb-common.inc
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
SRC_URI = "git://github.com/TrenchBoot/grub.git;branch=${BRANCH};protocol=https"

PV = "2.06"

BRANCH = "intel-txt-aem-2.06-rebased"
SRCREV = "85ccfdc700a1640c148909cbbad777ba6d7d124b"
SRC_URI = " \
git://github.com/TrenchBoot/grub.git;name=grub;branch=${BRANCH_grub};protocol=https \
git://github.com/coreutils/gnulib;name=gnulib;branch=${BRANCH_gnulib};protocol=https;destsuffix=git/gnulib \
"

BRANCH_grub = "intel-txt-aem-2.06-rebased"
SRCREV_grub = "85ccfdc700a1640c148909cbbad777ba6d7d124b"

# We add gnulib to SRC_URI to avoid downloading it during the do_configure().
# The bootstrap script seems to be smart enough to skip fetching repo again
# if the local revision is correct. Another way to "solve" that would be
# to add gnulib as a submodule in our fork.
#
# We need to update this with each grub rebase, to make sure it is in sync
# with the bootstrap.conf, otherwise it will be sync during do_configure()
# again.
BRANCH_gnulib = "master"
SRCREV_gnulib = "9f48fb992a3d7e96610c4ce8be969cff2d61a01b"

SRCREV_FORMAT = "grub_gnulib"

S = "${WORKDIR}/git"

Expand Down