From 6e5a9ecac1d1016a07ba19588b94d6574e88058f Mon Sep 17 00:00:00 2001 From: Maciej Pijanowski Date: Thu, 1 Aug 2024 21:52:23 +0200 Subject: [PATCH 1/4] grub-tb-common.inc: clone gnulib in do_fetch() Signed-off-by: Maciej Pijanowski --- recipes-bsp/grub/grub-tb-common.inc | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/grub/grub-tb-common.inc b/recipes-bsp/grub/grub-tb-common.inc index 5aebcd3..b2b379b 100644 --- a/recipes-bsp/grub/grub-tb-common.inc +++ b/recipes-bsp/grub/grub-tb-common.inc @@ -1,9 +1,23 @@ -SRC_URI = "git://github.com/TrenchBoot/grub.git;branch=${BRANCH};protocol=https" +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" PV = "2.06" -BRANCH = "intel-txt-aem-2.06-rebased" -SRCREV = "85ccfdc700a1640c148909cbbad777ba6d7d124b" +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" From f62a0fa3b7d910f59c4018584f09704895a63ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Fri, 2 Aug 2024 09:15:48 +0200 Subject: [PATCH 2/4] .pre-commit-config: use 5.5.2-zarhus of oelint-adv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ffa2877..c0ecee8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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] From 0f2bc5a59d0d20199f21318ba54acc87aecdb328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Fri, 2 Aug 2024 09:16:23 +0200 Subject: [PATCH 3/4] grub-tb-common.inc: Fix oelint errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- recipes-bsp/grub/grub-tb-common.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/grub/grub-tb-common.inc b/recipes-bsp/grub/grub-tb-common.inc index b2b379b..58ae339 100644 --- a/recipes-bsp/grub/grub-tb-common.inc +++ b/recipes-bsp/grub/grub-tb-common.inc @@ -1,8 +1,10 @@ -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" - PV = "2.06" +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" From 27d464aa2e2724f9d27cb3f325a0c9c026dc6105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Mon, 5 Aug 2024 11:14:22 +0200 Subject: [PATCH 4/4] .oelint-ruleset.json: Set homepageping to info so pre-commit.ci can run MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- .oelint-ruleset.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.oelint-ruleset.json b/.oelint-ruleset.json index d34dfd8..0c1cdc2 100644 --- a/.oelint-ruleset.json +++ b/.oelint-ruleset.json @@ -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",