[OS-BUILD PATCHv3] redhat/Makefile: fix default values for dist-brew's DISTRO and DIST
From: Íñigo Huguet
redhat/Makefile: fix default values for dist-brew's DISTRO and DIST
In dist-brew target, target-specific variables to change the default
value of DISTRO and DIST to 'rhel' and '.el9', but they're not useful
because the rest of variables that depends on them, such us BUILD_TARGET,
has been calculated yet.
The most visible error is that `make dist-brew` fails with 'brew: error:
No such build target: rawhide'. Rawhide is the default BUILD_TARGET for
Fedora, not for RHEL.
Fix it by recursively calling `make` so the sub-make has the correct DISTRO
and DIST values since the beginning, thus calculating the rest of values
correctly. Variables BUILD_TARGET and BUILD_PROFILE need to be cleared
so they're recalculated in the 2nd level sub-make.
However, variables listed in Makefile.variables file must be allowed to
be customizable by the user, so we can't override the ones defined by
the user. Save them in variables *_USERDEF so we know if they were
defined by user or by the Makefile's logic.
Also, fix a missing closing quote in `ifeq ("$(DIST)", ".eln)`.
Signed-off-by: Íñigo Huguet
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -65,6 +65,16 @@
SPECCHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr
$(RHEL_MINOR) - 1)
ARCH_LIST=aarch64 ppc64le s390x x86_64
+# save some user selectable values to know later if we can override them
+DISTRO_USERDEF:=$(DISTRO)
+DIST_USERDEF:=$(DIST)
+BUILD_PROFILE_USERDEF:=$(BUILD_PROFILE)
+BUILD_TARGET_USERDEF:=$(BUILD_TARGET)
+
+ifndef DIST
+ DIST := $(shell $(RPMBUILD) --eval '%{?dist}')
+endif
+
ifndef DISTRO
ifneq ($(findstring .fc,$(DIST)),)
DISTRO := fedora
@@ -259,7 +269,7 @@ else
BUILD_TARGET:=rhel-$(RHEL_MAJOR)-newest-test-pesign
endif
endif
- ifeq ("$(DIST)", ".eln)
+ ifeq ("$(DIST)", ".eln")
DISTRELEASETAG:=$(RELEASETAG)
DISTBASEVERSION:=$(BASEVERSION)
SPECTARFILE_RELEASE:=$(BASEVERSION)
@@ -753,14 +763,21 @@ dist-vr-check:
exit 1; \
fi
-dist-brew: DIST=.el9
-dist-brew: DISTRO=rhel
-dist-brew dist-koji: dist-%: dist-vr-check dist-srpm
+# Call as sub-make to select different default DISTRO and DIST for dist-brew.
+# This is because target-specific variables only apply inside the recipe, but
we
+# need to recalculate some values such as BUILD_TARGET that depends on them.
+# However, do not override any value directly defined by the user.
+dist-brew distg-brew: DISTRO=$(if $(DISTRO_USERDEF),$(DISTRO_USERDEF),rhel)
+dist-brew distg-brew: DIST=$(if
$(DIST_USERDEF),$(DIST_USERDEF),.el$(RHEL_MAJOR))
+dist-brew distg-brew: BUILD_PROFILE=$(if
$(BUILD_PROFILE_USERDEF),$(BUILD_PROFILE_USERDEF))
+dist-brew distg-brew: BUILD_TARGET=$(if
$(BUILD_TARGET_USERDEF),$(BUILD_TARGET_USERDEF))
+dist-brew distg-brew dist-koji distg_koji:
+ $(MAKE) _$@
+
+_dist-brew _dist-koji: _dist-%: dist-vr-check dist-srpm
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) --scratch $(BUILD_TARGET)
$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm $(OUTPUT_FILE)
-distg-brew: DIST=.el9
-distg-brew: DISTRO=rhel
-distg-brew distg-koji: distg-%: dist-vr-check
+_distg-brew _distg-koji: _distg-%: dist-vr-check
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) --scratch $(BUILD_TARGET)
"$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
.PHONY: $(REDHAT)/rpm/SOURCES/$(SPECFILE)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -40,7 +40,7 @@ BUMP_RELEASE:=yes
# This is the dist release suffix used in the package release, eg. .fc34,
# .el8 etc. In a different branch this may be set to a fixed value.
-DIST ?= $(shell $(RPMBUILD) --eval '%{?dist}')
+DIST ?=
# This is the source branch that you are building out of typically this is
# the current branch.
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -7,7 +7,9 @@ BASEVERSION=5.16.0-0.rc5.6.test
BUILD=6
BUILD_FLAGS=
BUILD_PROFILE=-p stream
+BUILD_PROFILE_USERDEF=
BUILD_TARGET=c9s-candidate
+BUILD_TARGET_USERDEF=
BUMP_RELEASE=yes
CHANGELOG_PREV=kernel.changelog-9.98
CROSS_PACKAGE_LIST=cross-binutils-common cross-gcc-common diffstat
glibc-static ncurses-devel numactl-devel rng-tools binutils-aarch64-linux-gnu
gcc-aarch64-linux-gnu binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu
binutils-s390x-linux-gnu gcc-s390x-linux-gnu
@@ -17,7 +19,9 @@ DIST=.el7
DISTBASEVERSION=5.16.0-0.rc5.6.test.el7
DISTRELEASETAG=kernel-5.16.0-0.rc5.6.test.el7
DISTRO=centos
+DISTRO_USERDEF=centos
DIST_BRANCH="os-build"
+DIST_USERDEF=.el7
EARLY_YBUILD=
EARLY_YRELEASE=
ENABLE_WERROR=
@@ -39,7 +43,7
Re: [OS-BUILD PATCH] usb: enable Design Ware Drivers on x86
From: Desnes Nunes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2334#note_1299624944 Thanks for all observations Hans! ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency for
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2341#note_1299462975 So it seems that RHEL will be keeping this new package too. Once @zbyszek gets the F37 split pushed, we can drop this and revert the previous conditional. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv2] redhat/configs: CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 is x86 only
From: Vladis Dronov on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2347#note_1299404567 thanks! ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv2] redhat/configs: CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 is x86 only
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2347#note_1299316489 Oh, of course! Fixed. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCHv2] redhat/configs: CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 is x86 only
From: Prarit Bhargava redhat/configs: CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 is x86 only Move the CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 config files into x86 and clean up fedora files that are no longer needed. Signed-off-by: Prarit Bhargava diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 rename from redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 rename from redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 diff --git a/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 b/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set diff --git a/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 b/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2347 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] redhat/configs: CONFIG_HP_ILO location fix
From: Vladis Dronov redhat/configs: CONFIG_HP_ILO location fix Move the CONFIG_HP_ILO config file into a proper location. Signed-off-by: Vladis Dronov diff --git a/redhat/configs/generic/aarch64/CONFIG_HP_ILO b/redhat/configs/common/generic/arm/aarch64/CONFIG_HP_ILO rename from redhat/configs/generic/aarch64/CONFIG_HP_ILO rename to redhat/configs/common/generic/arm/aarch64/CONFIG_HP_ILO index blahblah..blahblah 100644 --- a/redhat/configs/generic/aarch64/CONFIG_HP_ILO +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_HP_ILO -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2348 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] redhat/configs: CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 is x86 only
From: Vladis Dronov on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2347#note_1299289224 if we're doing this in `common/generic/`, don't we need to kill 'fedora/generic/' ones? ``` fedora/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64:# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set fedora/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64:# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set ``` ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCH] redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency for
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2341#note_1299058464 Adding this MR as it is to include in release as a temporary work around so that ELN builds from ark-latest until we determine the proper solution. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv2] redhat/Makefile: fix default values for dist-brew's DISTRO and DIST
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2339#note_1298953399 Yep, just run the 'make dist-self-test-data' target. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
[OS-BUILD PATCH] redhat/configs: CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 is x86 only
From: Prarit Bhargava redhat/configs: CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 is x86 only Move the CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 config files into x86. Signed-off-by: Prarit Bhargava diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 rename from redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 rename from redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2347 ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv2] redhat/Makefile: fix default values for dist-brew's DISTRO and DIST
From: Herton R. Krzesinski on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2339#note_1298900961 ah, I think you need to run ```make dist-self-test-data```, and add/push the changes to redhat/self-test/data/*, can you try that? ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv2] redhat/Makefile: fix default values for dist-brew's DISTRO and DIST
From: Íñigo Huguet on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2339#note_1298761273 Great, thanks! Now I don't know what to do with the failing selftest in CKI... AFAIK, it tries to check that variables are set to correct values by doing a diff with some predefined files. But the diff is showing the new variables and make the test to fail. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Re: [OS-BUILD PATCHv2] redhat/Makefile: fix default values for dist-brew's DISTRO and DIST
From: Herton R. Krzesinski on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2339#note_1298757389 This last version looks good to me, thank you. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
