12:41 p.m.
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1900
The dist-buildreq-check target can be improved in a few ways by allowing
users to convert the fatal error into a warning, and by indicating where
the system-sb-certs package can be found.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/docs/index.rst | 21 +++++++++++++++++++++
redhat/Makefile | 13 ++++++++-----
.gitlab-ci.yml | 31 +++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 5 deletions(-)
12:41 p.m.
New subject: [OS-BUILD PATCHv2 1/4] redhat/Makefile: Change dist-buildreq-check to
a
non-blocking target
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Change dist-buildreq-check to a non-blocking target
Rename dist-buildreq-check to dist-get-buildreqs and make it non-blocking.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -391,7 +391,7 @@ rh-configs: dist-rhel-configs
dist-configs-check: dist-configs-prep
+cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS) ""
""
-dist-configs-prep: dist-clean-configs dist-buildreq-check
+dist-configs-prep: dist-clean-configs
+cd $(REDHAT)/configs; ./build_configs.sh "partial" "snip"
+cd $(REDHAT)/configs; ./build_configs.sh "$(PACKAGE_NAME)"
"$(FLAVOR)"
@@ -448,15 +448,14 @@ dist-git-version-check:
exit 1; \
fi
-dist-buildreq-check: setup-source
+dist-get-buildreqs: setup-source
@PKGLIST="rpm-build $$(rpmspec -q --buildrequires $(SOURCES)/$(SPECFILE) | cut -d
' ' -f 1)"; \
MISSING=""; \
for pkg in $$PKGLIST; do \
rpm -q --whatprovides $$pkg >/dev/null || MISSING="$$MISSING $$pkg"; \
done; \
if [ -n "$$MISSING" ]; then \
- echo "Error: please install $$MISSING"; \
- exit 1; \
+ echo " Missing dependencies: $$MISSING"; \
fi
setup-source: dist-git-version-check dist-clean-sources
@@ -801,7 +800,8 @@ dist-full-help:
@echo ''
@echo 'Misc targets:'
- @echo ' dist-buildreq-check - Checks for presence of packages required for
build'
+ @echo ' dist-get-buildreqs - returns list of packages listed as build
requirements'
+ @echo ' for this kernel'
@echo ' dist-get-latest - Returns the latest "known good" kernel from
brew. This'
@echo ' should not be confused with the latest top-of-tree'
@echo ' development tag.'
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1900
12:41 p.m.
New subject: [OS-BUILD PATCHv2 2/4] redhat/Makefile: Provide a better message for
system-sb-certs
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Provide a better message for system-sb-certs
Most of the kernel build dependencies come from widely known repositories
including EPEL, RHEL, and Fedora. The system-sb-certs package comes from
a smaller RHEL and CS9 repository called CodeReady Linux Builder (CRB).
Provide a better system-sb-certs missing package message that points users
to the CRB repository.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -456,6 +456,9 @@ dist-get-buildreqs: setup-source
done; \
if [ -n "$$MISSING" ]; then \
echo " Missing dependencies: $$MISSING"; \
+ if echo "$$MISSING" | grep -q system-sb-certs ; then \
+ echo "system-sb-certs can be installed from a RHEL or Centos-Stream CodeReady
Linux Builder (CRB) repository."; \
+ fi; \
fi
setup-source: dist-git-version-check dist-clean-sources
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1900
12:41 p.m.
New subject: [OS-BUILD PATCHv2 3/4] .gitlab-ci.yaml: Add test for
dist-get-buildreqs target
From: Prarit Bhargava <prarit(a)redhat.com>
.gitlab-ci.yaml: Add test for dist-get-buildreqs target
Add a test for the dist-get-buildreqs target.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,6 +239,37 @@ rawhide_release:
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RAWHIDE_RELEASE ==
"true"'
+test_makefile:
+ image: quay.io/fedora/fedora:rawhide
+ variables:
+ GIT_DEPTH: "0"
+ GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/kernel-ark
+ before_script:
+ - echo "fastestmirror=true" >> /etc/dnf/dnf.conf
+ - dnf -y install python3-gitlab git openssh-clients dnf-utils gnupg2
+ # These packages are required for 'make dist-get-buildreqs'
+ - dnf -y install make rpm-build
+ - git config user.name "Fedora Kernel Team"
+ - git config user.email "kernel-team(a)fedoraproject.org"
+ - echo "$PYTHON_GITLAB_CONFIG" >> ~/.python-gitlab.cfg
+ # Need SSH since the clone is set up without write access.
+ - eval $(ssh-agent -s)
+ - echo "$PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+ - mkdir -p ~/.ssh
+ - chmod 700 ~/.ssh
+ - echo "$GITLAB_KNOWN_HOSTS" >> ~/.ssh/known_hosts
+ - chmod 644 ~/.ssh/known_hosts
+ - git remote add gitlab git@gitlab.com:cki-project/kernel-ark.git
+ - gpg2 --import "$TORVALDS_GPG_KEY"
+ script:
+ - export missing=$(make dist-get-buildreqs | grep "Missing dependencies:" |
cut -d":" -f2)
+ - if [ "$missing" == "" ]; then echo "Missing dependencies
should not be null but are empty. Review test log." && exit 1; fi;
+ - dnf -y install $missing
+ - export missingafter=$(make dist-get-buildreqs | grep "Missing
dependencies:" | cut -d":" -f2)
+ - if [ "$missingafter" != "" ]; then echo "Missing
dependencies should be null but are $missingafter. Review test log." && exit
1; fi;
+ rules:
+ - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "os-build"'
+
test_docs:
stage: test
image: registry.gitlab.com/cki-project/containers/python
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1900
12:41 p.m.
New subject: [OS-BUILD PATCHv2 4/4] redhat/docs: Add information on build
dependencies
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/docs: Add information on build dependencies
Add a section on build dependencies.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/docs/index.rst b/redhat/docs/index.rst
index blahblah..blahblah 100644
--- a/redhat/docs/index.rst
+++ b/redhat/docs/index.rst
@@ -65,6 +65,26 @@ os-build branch that can be used if the os-build branch does not
compile due to
upstream bugs. However, the os-build branch must be used as a Merge Request
target for all Fedora/ARK specific changes.
+Build Dependencies
+------------------
+
+kernel-ark has a long list of BuildRequires that are specified in the
+kernel.spec file. Built-in rpm commands like 'yum builddep' will not
+work on all OSes (`see BZ 2103214`_),
+and 'yum deplist' which requires the configuration and enabling of a source
+repository. As a result a 'dist-get-buildreqs' target has been added that will
+provide a list of missing dependencies. This list can be consumed by other
+commands to install missing packages:
+
+.. code-block:: sh
+
+ # install missing build dependencies
+ yum -y install $(make dist-get-buildreqs | grep "Missing dependencies:" |
cut -d":" -f2)
+
+Some packages may require the enabling of additional repositories such as the
+system-sb-certs package which can be found in a Centos-Stream or RHEL CodeReady
+Linux Builder (CRB) repository.
+
Local builds
------------
@@ -129,6 +149,7 @@ Maintainer Guide
.. _register your SSH key: https://gitlab.com/-/profile/keys
.. _Koji:
https://docs.fedoraproject.org/en-US/package-maintainers/Using_the_Koji_B...
.. _Mock:
https://fedoraproject.org/wiki/Using_Mock_to_test_package_builds#How_do_I...
+.. _see BZ 2103214: https://bugzilla.redhat.com/2103214
Indices and tables
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1900
6:30 a.m.
New subject: [OS-BUILD PATCHv2 0/4] redhat/Makefile: Improve
dist-buildreq-check
target
From: Veronika Kabátová on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1900#note_1022...
IIUC most of the commands in this added `before_script` are copied over from
the scheduled job that is doing git pushes and they aren't needed here
:thinking:
680
days inactive
685
days old
kernel@lists.fedoraproject.org
5 comments
2 participants
participants (2)
-
Prarit Bhargava (via Email Bridge) -
Veronika Kabátová (via Email Bridge)