❌ FAIL: Test report for kernel (ark)
by CKI Project
Hello,
We ran automated tests on a recent commit from this kernel tree:
Kernel repo: https://gitlab.com/cki-project/kernel-ark.git
Commit: dd40cce0e64f - [redhat] kernel-5.9.0-0.rc1.1
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Merge: OK
Compile: FAILED
All kernel binaries, config files, and logs are available for download here:
https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=datawa...
We attempted to compile the kernel for multiple architectures, but the compile
failed on one or more architectures:
Source RPM: FAILED (see build-generic.log.xz attachment)
We hope that these logs can help you find the problem quickly. For the full
detail on our testing procedures, please scroll to the bottom of this message.
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Compile testing
---------------
We tried to create the SRPM package but failed.
3 years, 8 months
[OS-BUILD PATCH v3 0/3] redhat/Makefile: Clean up dist-configs and related targets
by Prarit Bhargava
[The email bridge seems to have eaten my patches. Manually sending
these for https://gitlab.com/cki-project/kernel-ark/-/merge_requests/586 ]
The 'dist-configs' is not working properly as it only creates ELN
configs. The
'rh-configs' and 'fedora-configs' targets are not working properly and
should
be creating ELN and Fedora configs but they only create some
temporary/intermediate build files. These targets should output final
.config
files for each supported arch. The code has been modified to output
final
.config files.
While fixing this I noticed a few other things that needed to be fixed.
- The TARGET and DIST_TARGET variables in redhat/Makefile are
unused.
- 'make fedora-configs' fails due to a config mismatch on
CONFIG_FORCE_MAX_ZONEORDER
- The configs/process_configs.sh script left *.orig files lying
around
The code has been modified to fix these as well.
Signed-off-by: Prarit Bhargava prarit(a)redhat.com
Cc: dzickus(a)redhat.com
Cc: jforbes(a)redhat.com
Cc: mleitner(a)redhat.com
Cc: jbenc(a)redhat.com
Prarit Bhargava (3):
redhat/Makefile: Fix '*-configs' targets
redhat/configs/process_configs.sh: Add process_configs_known_broken
flag
redhat/configs/process_configs.sh: Remove *.config.orig files
redhat/Makefile | 19 +++++----------
redhat/configs/build_configs.sh | 9 ++++++-
.../arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER | 3 ++-
redhat/configs/generate_all_configs.sh | 8 +++++--
redhat/configs/process_configs.sh | 24 ++++++++++++++++++-
5 files changed, 45 insertions(+), 18 deletions(-)
--
2.26.2
3 years, 8 months
❌ FAIL: Test report for kernel (ark)
by CKI Project
Hello,
We ran automated tests on a recent commit from this kernel tree:
Kernel repo: https://gitlab.com/cki-project/kernel-ark.git
Commit: dd40cce0e64f - [redhat] kernel-5.9.0-0.rc1.1
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Merge: OK
Compile: FAILED
All kernel binaries, config files, and logs are available for download here:
https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=datawa...
We attempted to compile the kernel for multiple architectures, but the compile
failed on one or more architectures:
Source RPM: FAILED (see build-generic.log.xz attachment)
We hope that these logs can help you find the problem quickly. For the full
detail on our testing procedures, please scroll to the bottom of this message.
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Compile testing
---------------
We tried to create the SRPM package but failed.
3 years, 8 months
[OS-BUILD PATCH] [redhat] New configs in drivers/net/wireless
by GitLab Bridge on behalf of jeremycline
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
CONFIG_MT7663S:
This adds support for MT7663S 802.11ac 2x2:2 wireless devices.
To compile this driver as a module, choose M here.
Symbol: MT7663S [=n]
Type : tristate
Defined at drivers/net/wireless/mediatek/mt76/mt7615/Kconfig:46
Prompt: MediaTek MT7663S (SDIO) support
Depends on: NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_MEDIATEK [=y] && MAC80211 [=m] && MMC [=m]
Location:
-> Device Drivers
-> Network device support (NETDEVICES [=y])
-> Wireless LAN (WLAN [=y])
-> MediaTek devices (WLAN_VENDOR_MEDIATEK [=y])
Selects: MT76_SDIO [=n] && MT7663_USB_SDIO_COMMON [=n]
---
CONFIG_RTW88_8821CE:
Select this option will enable support for 8821CE chipset
802.11ac PCIe wireless network adapter
Symbol: RTW88_8821CE [=n]
Type : tristate
Defined at drivers/net/wireless/realtek/rtw88/Kconfig:64
Prompt: Realtek 8821CE PCI wireless network adapter
Depends on: NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_REALTEK [=y] && RTW88 [=m] && PCI [=y]
Location:
-> Device Drivers
-> Network device support (NETDEVICES [=y])
-> Wireless LAN (WLAN [=y])
-> Realtek devices (WLAN_VENDOR_REALTEK [=y])
-> Realtek 802.11ac wireless chips support (RTW88 [=m])
Selects: RTW88_CORE [=m] && RTW88_PCI [=m] && RTW88_8821C [=n]
---
CONFIG_WLAN_VENDOR_MICROCHIP:
If you have a wireless card belonging to this class, say Y.
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all the
questions about these cards. If you say Y, you will be asked for
your specific card in the following questions.
Symbol: WLAN_VENDOR_MICROCHIP [=y]
Type : bool
Defined at drivers/net/wireless/microchip/Kconfig:2
Prompt: Microchip devices
Depends on: NETDEVICES [=y] && WLAN [=y]
Location:
-> Device Drivers
-> Network device support (NETDEVICES [=y])
-> Wireless LAN (WLAN [=y])
---
Cc: Jarod Wilson <jarod(a)redhat.com>
Cc: John Linville <linville(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_MT7663S | 1 +
.../common/generic/CONFIG_RTW88_8821CE | 1 +
.../generic/CONFIG_WLAN_VENDOR_MICROCHIP | 1 +
.../pending-common/generic/CONFIG_MT7663S | 21 ------------------
.../generic/CONFIG_RTW88_8821CE | 22 -------------------
.../generic/CONFIG_WLAN_VENDOR_MICROCHIP | 22 -------------------
6 files changed, 3 insertions(+), 65 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_MT7663S
create mode 100644 redhat/configs/common/generic/CONFIG_RTW88_8821CE
create mode 100644 redhat/configs/common/generic/CONFIG_WLAN_VENDOR_MICROCHIP
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_MT7663S
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_RTW88_8821CE
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_WLAN_VENDOR_MICROCHIP
diff --git a/redhat/configs/common/generic/CONFIG_MT7663S b/redhat/configs/common/generic/CONFIG_MT7663S
new file mode 100644
index 000000000000..0597f0e96baa
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_MT7663S
@@ -0,0 +1 @@
+# CONFIG_MT7663S is not set
diff --git a/redhat/configs/common/generic/CONFIG_RTW88_8821CE b/redhat/configs/common/generic/CONFIG_RTW88_8821CE
new file mode 100644
index 000000000000..1f652b03a1e1
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_RTW88_8821CE
@@ -0,0 +1 @@
+# CONFIG_RTW88_8821CE is not set
diff --git a/redhat/configs/common/generic/CONFIG_WLAN_VENDOR_MICROCHIP b/redhat/configs/common/generic/CONFIG_WLAN_VENDOR_MICROCHIP
new file mode 100644
index 000000000000..48f5fabaecfb
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_WLAN_VENDOR_MICROCHIP
@@ -0,0 +1 @@
+CONFIG_WLAN_VENDOR_MICROCHIP=y
diff --git a/redhat/configs/pending-common/generic/CONFIG_MT7663S b/redhat/configs/pending-common/generic/CONFIG_MT7663S
deleted file mode 100644
index 5d3e88f699f8..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_MT7663S
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_MT7663S:
-#
-# This adds support for MT7663S 802.11ac 2x2:2 wireless devices.
-#
-# To compile this driver as a module, choose M here.
-#
-# Symbol: MT7663S [=n]
-# Type : tristate
-# Defined at drivers/net/wireless/mediatek/mt76/mt7615/Kconfig:46
-# Prompt: MediaTek MT7663S (SDIO) support
-# Depends on: NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_MEDIATEK [=y] && MAC80211 [=m] && MMC [=m]
-# Location:
-# -> Device Drivers
-# -> Network device support (NETDEVICES [=y])
-# -> Wireless LAN (WLAN [=y])
-# -> MediaTek devices (WLAN_VENDOR_MEDIATEK [=y])
-# Selects: MT76_SDIO [=n] && MT7663_USB_SDIO_COMMON [=n]
-#
-#
-#
-# CONFIG_MT7663S is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_RTW88_8821CE b/redhat/configs/pending-common/generic/CONFIG_RTW88_8821CE
deleted file mode 100644
index 8ed6ad01f9cd..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_RTW88_8821CE
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_RTW88_8821CE:
-#
-# Select this option will enable support for 8821CE chipset
-#
-# 802.11ac PCIe wireless network adapter
-#
-# Symbol: RTW88_8821CE [=n]
-# Type : tristate
-# Defined at drivers/net/wireless/realtek/rtw88/Kconfig:64
-# Prompt: Realtek 8821CE PCI wireless network adapter
-# Depends on: NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_REALTEK [=y] && RTW88 [=m] && PCI [=y]
-# Location:
-# -> Device Drivers
-# -> Network device support (NETDEVICES [=y])
-# -> Wireless LAN (WLAN [=y])
-# -> Realtek devices (WLAN_VENDOR_REALTEK [=y])
-# -> Realtek 802.11ac wireless chips support (RTW88 [=m])
-# Selects: RTW88_CORE [=m] && RTW88_PCI [=m] && RTW88_8821C [=n]
-#
-#
-#
-# CONFIG_RTW88_8821CE is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_WLAN_VENDOR_MICROCHIP b/redhat/configs/pending-common/generic/CONFIG_WLAN_VENDOR_MICROCHIP
deleted file mode 100644
index 7fde12ef25dc..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_WLAN_VENDOR_MICROCHIP
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_WLAN_VENDOR_MICROCHIP:
-#
-# If you have a wireless card belonging to this class, say Y.
-#
-# Note that the answer to this question doesn't directly affect the
-# kernel: saying N will just cause the configurator to skip all the
-# questions about these cards. If you say Y, you will be asked for
-# your specific card in the following questions.
-#
-# Symbol: WLAN_VENDOR_MICROCHIP [=y]
-# Type : bool
-# Defined at drivers/net/wireless/microchip/Kconfig:2
-# Prompt: Microchip devices
-# Depends on: NETDEVICES [=y] && WLAN [=y]
-# Location:
-# -> Device Drivers
-# -> Network device support (NETDEVICES [=y])
-# -> Wireless LAN (WLAN [=y])
-#
-#
-#
-CONFIG_WLAN_VENDOR_MICROCHIP=y
--
GitLab
3 years, 8 months
[OS-BUILD PATCH] enable PROTECTED_VIRTUALIZATION_GUEST for all s390x
kernels
by GitLab Bridge on behalf of sharkcz
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan(a)danny.cz>
Signed-off-by: Dan Horák <dan(a)danny.cz>
---
.../generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST | 0
.../fedora/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST | 1 -
2 files changed, 1 deletion(-)
rename redhat/configs/{ark => common}/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST (100%)
delete mode 100644 redhat/configs/fedora/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST
diff --git a/redhat/configs/ark/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST b/redhat/configs/common/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST
similarity index 100%
rename from redhat/configs/ark/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST
rename to redhat/configs/common/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST
diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST b/redhat/configs/fedora/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST
deleted file mode 100644
index 3b7418088380..000000000000
--- a/redhat/configs/fedora/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PROTECTED_VIRTUALIZATION_GUEST is not set
--
GitLab
3 years, 8 months
[OS-BUILD PATCH] fedora: enable enery model
by GitLab Bridge on behalf of pbrobinson
From: Peter Robinson <pbrobinson(a)gmail.com>
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
---
redhat/configs/fedora/generic/CONFIG_ENERGY_MODEL | 1 +
1 file changed, 1 insertion(+)
create mode 100644 redhat/configs/fedora/generic/CONFIG_ENERGY_MODEL
diff --git a/redhat/configs/fedora/generic/CONFIG_ENERGY_MODEL b/redhat/configs/fedora/generic/CONFIG_ENERGY_MODEL
new file mode 100644
index 000000000000..a4fec3a5d9eb
--- /dev/null
+++ b/redhat/configs/fedora/generic/CONFIG_ENERGY_MODEL
@@ -0,0 +1 @@
+CONFIG_ENERGY_MODEL=y
--
GitLab
3 years, 8 months
[OS-BUILD PATCH] [redhat] New configs in sound/pci
by GitLab Bridge on behalf of jeremycline
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM:
Intel hardware has a feature called 'silent stream', that
keeps external HDMI receiver's analog circuitry powered on
avoiding 2-3 sec silence during playback start. This mechanism
relies on setting channel_id as 0xf, sending info packet and
preventing codec D3 entry (increasing platform static power
consumption when HDMI receiver is plugged-in). 2-3 sec silence
at the playback start is expected whenever there is format change.
(default is 2 channel format).
Say Y to enable Silent Stream feature.
Symbol: SND_HDA_INTEL_HDMI_SILENT_STREAM [=n]
Type : bool
Defined at sound/pci/hda/Kconfig:243
Prompt: Enable Silent Stream always for HDMI
Depends on: SOUND [=m] && !UML && SND [=m] && SND_HDA [=m] && SND_HDA_INTEL [=m]
Location:
-> Device Drivers
-> Sound card support (SOUND [=m])
-> Advanced Linux Sound Architecture (SND [=m])
-> HD-Audio
---
Cc: Jaroslav Kysela <jkysela(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM | 1 +
.../CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM | 26 -------------------
2 files changed, 1 insertion(+), 26 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM
diff --git a/redhat/configs/common/generic/CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM b/redhat/configs/common/generic/CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM
new file mode 100644
index 000000000000..ffa5ca1ab99b
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM
@@ -0,0 +1 @@
+# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM b/redhat/configs/pending-common/generic/CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM
deleted file mode 100644
index 86e887fb33ef..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM
+++ /dev/null
@@ -1,26 +0,0 @@
-# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM:
-#
-# Intel hardware has a feature called 'silent stream', that
-# keeps external HDMI receiver's analog circuitry powered on
-# avoiding 2-3 sec silence during playback start. This mechanism
-# relies on setting channel_id as 0xf, sending info packet and
-# preventing codec D3 entry (increasing platform static power
-# consumption when HDMI receiver is plugged-in). 2-3 sec silence
-# at the playback start is expected whenever there is format change.
-# (default is 2 channel format).
-# Say Y to enable Silent Stream feature.
-#
-# Symbol: SND_HDA_INTEL_HDMI_SILENT_STREAM [=n]
-# Type : bool
-# Defined at sound/pci/hda/Kconfig:243
-# Prompt: Enable Silent Stream always for HDMI
-# Depends on: SOUND [=m] && !UML && SND [=m] && SND_HDA [=m] && SND_HDA_INTEL [=m]
-# Location:
-# -> Device Drivers
-# -> Sound card support (SOUND [=m])
-# -> Advanced Linux Sound Architecture (SND [=m])
-# -> HD-Audio
-#
-#
-#
-# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
--
GitLab
3 years, 8 months
[OS-BUILD PATCH] [redhat] New configs in drivers/infiniband
by GitLab Bridge on behalf of jeremycline
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
CONFIG_INFINIBAND_RTRS_CLIENT:
RDMA transport client module.
RDMA Transport (RTRS) client implements a reliable transport layer
and also multipathing functionality and that it is intended to be
the base layer for a block storage initiator over RDMA.
Symbol: INFINIBAND_RTRS_CLIENT [=n]
Type : tristate
Defined at drivers/infiniband/ulp/rtrs/Kconfig:7
Prompt: RTRS client module
Depends on: INFINIBAND [=m] && INFINIBAND_ADDR_TRANS [=y]
Location:
-> Device Drivers
-> InfiniBand support (INFINIBAND [=m])
Selects: INFINIBAND_RTRS [=n]
---
CONFIG_INFINIBAND_RTRS_SERVER:
RDMA transport server module.
RDMA Transport (RTRS) server module processing connection and IO
requests received from the RTRS client module, it will pass the
IO requests to its user eg. RNBD_server.
Symbol: INFINIBAND_RTRS_SERVER [=n]
Type : tristate
Defined at drivers/infiniband/ulp/rtrs/Kconfig:18
Prompt: RTRS server module
Depends on: INFINIBAND [=m] && INFINIBAND_ADDR_TRANS [=y]
Location:
-> Device Drivers
-> InfiniBand support (INFINIBAND [=m])
Selects: INFINIBAND_RTRS [=n]
---
Cc: Kamal Heib <kheib(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../generic/CONFIG_INFINIBAND_RTRS_CLIENT | 1 +
.../generic/CONFIG_INFINIBAND_RTRS_SERVER | 1 +
.../generic/CONFIG_INFINIBAND_RTRS_CLIENT | 21 -------------------
.../generic/CONFIG_INFINIBAND_RTRS_SERVER | 21 -------------------
4 files changed, 2 insertions(+), 42 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_INFINIBAND_RTRS_CLIENT
create mode 100644 redhat/configs/common/generic/CONFIG_INFINIBAND_RTRS_SERVER
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_INFINIBAND_RTRS_CLIENT
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_INFINIBAND_RTRS_SERVER
diff --git a/redhat/configs/common/generic/CONFIG_INFINIBAND_RTRS_CLIENT b/redhat/configs/common/generic/CONFIG_INFINIBAND_RTRS_CLIENT
new file mode 100644
index 000000000000..4d8db5cda5a8
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_INFINIBAND_RTRS_CLIENT
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_RTRS_CLIENT is not set
diff --git a/redhat/configs/common/generic/CONFIG_INFINIBAND_RTRS_SERVER b/redhat/configs/common/generic/CONFIG_INFINIBAND_RTRS_SERVER
new file mode 100644
index 000000000000..dfdaaad5e995
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_INFINIBAND_RTRS_SERVER
@@ -0,0 +1 @@
+# CONFIG_INFINIBAND_RTRS_SERVER is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_INFINIBAND_RTRS_CLIENT b/redhat/configs/pending-common/generic/CONFIG_INFINIBAND_RTRS_CLIENT
deleted file mode 100644
index be772193ac8c..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_INFINIBAND_RTRS_CLIENT
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_INFINIBAND_RTRS_CLIENT:
-#
-# RDMA transport client module.
-#
-# RDMA Transport (RTRS) client implements a reliable transport layer
-# and also multipathing functionality and that it is intended to be
-# the base layer for a block storage initiator over RDMA.
-#
-# Symbol: INFINIBAND_RTRS_CLIENT [=n]
-# Type : tristate
-# Defined at drivers/infiniband/ulp/rtrs/Kconfig:7
-# Prompt: RTRS client module
-# Depends on: INFINIBAND [=m] && INFINIBAND_ADDR_TRANS [=y]
-# Location:
-# -> Device Drivers
-# -> InfiniBand support (INFINIBAND [=m])
-# Selects: INFINIBAND_RTRS [=n]
-#
-#
-#
-# CONFIG_INFINIBAND_RTRS_CLIENT is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_INFINIBAND_RTRS_SERVER b/redhat/configs/pending-common/generic/CONFIG_INFINIBAND_RTRS_SERVER
deleted file mode 100644
index 04d5207730ea..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_INFINIBAND_RTRS_SERVER
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_INFINIBAND_RTRS_SERVER:
-#
-# RDMA transport server module.
-#
-# RDMA Transport (RTRS) server module processing connection and IO
-# requests received from the RTRS client module, it will pass the
-# IO requests to its user eg. RNBD_server.
-#
-# Symbol: INFINIBAND_RTRS_SERVER [=n]
-# Type : tristate
-# Defined at drivers/infiniband/ulp/rtrs/Kconfig:18
-# Prompt: RTRS server module
-# Depends on: INFINIBAND [=m] && INFINIBAND_ADDR_TRANS [=y]
-# Location:
-# -> Device Drivers
-# -> InfiniBand support (INFINIBAND [=m])
-# Selects: INFINIBAND_RTRS [=n]
-#
-#
-#
-# CONFIG_INFINIBAND_RTRS_SERVER is not set
--
2.26.2
3 years, 8 months
[OS-BUILD PATCH] Revert "Merge branch 'make_configs_fix' into
'os-build'"
by GitLab Bridge on behalf of jmflinuxtx
From: Justin Forbes <jforbes(a)fedoraproject.org>
This reverts merge request !537
---
redhat/Makefile | 15 ++++++++----
redhat/configs/build_configs.sh | 9 +------
.../arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER | 3 +--
redhat/configs/generate_all_configs.sh | 2 +-
redhat/configs/process_configs.sh | 24 +------------------
5 files changed, 15 insertions(+), 38 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index d29e5646e746..61dcc522fbc6 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -20,6 +20,13 @@ else
endif
endif
+
+ifeq ("$(IS_FEDORA)", "1")
+ DIST_TARGET=fedora
+else
+ DIST_TARGET=rhel
+endif
+
ifeq ("$(NO_CONFIGCHECKS)","1")
PROCESS_CONFIGS_OPTS=
PROCESS_CONFIGS_CHECK_OPTS=
@@ -131,20 +138,20 @@ dist-configs-commit: dist-configs-prep
./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR)
dist-configs: dist-configs-prep
- @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh "$(FLAVOR)" 1; \
+ @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
-fedora-configs: FLAVOR = fedora
+fedora-configs: DIST_TARGET=fedora
fedora-configs: dist-configs
-rh-configs: FLAVOR = rhel
+rh-configs: DIST_TARGET=rhel
rh-configs: dist-configs
dist-configs-check: dist-configs-prep
cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS) $(PACKAGE_NAME)
dist-configs-prep: dist-clean-configs
- cd $(REDHAT)/configs; ./build_configs.sh "$(PACKAGE_NAME)" "$(ARCH_MACH)" "$(FLAVOR)"
+ cd $(REDHAT)/configs; TARGET=$(DIST_TARGET) ./build_configs.sh $(PACKAGE_NAME) $(ARCH_MACH)
dist-configs-arch: ARCH_MACH = $(MACH)
dist-configs-arch: dist-configs
diff --git a/redhat/configs/build_configs.sh b/redhat/configs/build_configs.sh
index 90f2be85f49d..18610e1fc097 100755
--- a/redhat/configs/build_configs.sh
+++ b/redhat/configs/build_configs.sh
@@ -10,12 +10,6 @@ SCRIPT="$(readlink -f $0)"
OUTPUT_DIR="$PWD"
SCRIPT_DIR="$(dirname $SCRIPT)"
-if [ -z "$3" ]; then
- cat flavors > .flavors
-else
- echo "$3" > .flavors
-fi
-
LANG=en_US.UTF-8
# to handle this script being a symlink
@@ -27,7 +21,6 @@ set nounset
cleanup()
{
rm -f config-*
- rm -f .flavors
}
die()
@@ -149,6 +142,6 @@ function build_flavor()
while read line
do
build_flavor $line
-done < .flavors
+done < flavors
cleanup
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
index 03d2ae718172..b730690db048 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
+++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
@@ -1,5 +1,4 @@
# We technically want this to be 13 for Fedora with 4K pages but that's only
# an option with an out of tree patch. Keep this 11 for compatibility until
-# we figure out what we want here.
-# process_configs_known_broken
+# we figure out what we want here
CONFIG_FORCE_MAX_ZONEORDER=13
diff --git a/redhat/configs/generate_all_configs.sh b/redhat/configs/generate_all_configs.sh
index 15a39a8fccc8..14f0f3a24de5 100755
--- a/redhat/configs/generate_all_configs.sh
+++ b/redhat/configs/generate_all_configs.sh
@@ -25,7 +25,7 @@ for i in kernel-*-$PRIMARY.config; do
mv $i $NEW
done
-rm -f kernel-*-$SECONDARY.config
+rm kernel-*-$SECONDARY.config
if [ $DEBUGBUILDSENABLED -eq 0 ]; then
for i in kernel-*debug*.config; do
diff --git a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh
index 92cc79701c4e..14773fef2410 100755
--- a/redhat/configs/process_configs.sh
+++ b/redhat/configs/process_configs.sh
@@ -15,11 +15,6 @@ usage()
echo " -t: test run, do not overwrite original config"
echo " -w: error on misconfigured config options"
echo " -z: commit new configs to pending directory"
- echo ""
- echo " A special CONFIG file tag, process_configs_known_broken can be added as a"
- echo " comment to any CONFIG file. This tag indicates that there is no way to "
- echo " fix a CONFIG's entry. This tag should only be used in extreme cases"
- echo " and is not to be used as a workaround to solve CONFIG problems."
exit 1
}
@@ -72,23 +67,8 @@ checkoptions()
}
' $1 $2 > .mismatches
- checkoptions_error=false
if test -s .mismatches
then
- while read LINE
- do
- if find ./ -name $(echo $LINE | awk -F "=" ' { print $1 } ' | awk ' { print $2 }') | xargs grep ^ | grep -q "process_configs_known_broken"; then
- # This is a known broken config.
- # See script help warning.
- checkoptions_error=false
- else
- checkoptions_error=true
- break
- fi
- done < .mismatches
-
- ! $checkoptions_error && return
-
echo "Error: Mismatches found in configuration files"
cat .mismatches
RETURNCODE=1
@@ -187,7 +167,6 @@ function commit_new_configs()
if [ "$arch" = "EMPTY" ]
then
# This arch is intentionally left blank
- rm -f "${cfg}.orig"
continue
fi
echo -n "Checking for new configs in $cfg ... "
@@ -222,7 +201,6 @@ function process_configs()
if [ "$arch" = "EMPTY" ]
then
# This arch is intentionally left blank
- rm -f "${cfg}.orig"
continue
fi
echo -n "Processing $cfg ... "
@@ -266,7 +244,7 @@ function process_configs()
else
mv ${cfgtmp} ${cfg}
fi
- rm -f ${cfgorig}
+ rm ${cfgorig}
echo "done"
done
rm "$SCRIPT_DIR"/*.config*.old
--
GitLab
3 years, 8 months
[OS-BUILD PATCH] redhat: Change Makefile target names to dist-
by GitLab Bridge on behalf of prarit
From: Prarit Bhargava <prarit(a)redhat.com>
The distribution specific Makefile target names begin with rh-. Switch
them to be use the distro agnostic dist-.
rh-dist-git-test and rh-dist-git are renamed to dist-git-test and
dist-git.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
v2: Update to include jcline's newly added docs
---
makefile | 6 +-
redhat/Makefile | 216 ++++++++++++------------
redhat/Makefile.cross | 18 +-
redhat/configs/README | 2 +-
redhat/configs/editconfig | 2 +-
redhat/configs/evaluate_configs | 2 +-
redhat/docs/index.rst | 8 +-
redhat/docs/maintaining.rst | 12 +-
redhat/koji/Makefile | 2 +-
redhat/koji/kernel.spec | 2 +-
redhat/scripts/ci/ark-create-release.sh | 8 +-
redhat/scripts/ci/ark-update-configs.sh | 4 +-
redhat/scripts/configdiff.sh | 4 +-
redhat/scripts/download_cross.sh | 2 +-
14 files changed, 144 insertions(+), 144 deletions(-)
diff --git a/makefile b/makefile
index 7dc9bcb3267e..819ac9a5cd60 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-ifeq ($(filter rh-% rhg-%,$(MAKECMDGOALS)),)
+ifeq ($(filter dist-% distg-%,$(MAKECMDGOALS)),)
include Makefile
endif
@@ -8,9 +8,9 @@ ifeq ("$(origin O)", "command line")
_OUTPUT := "$(abspath $(O))"
_EXTRA_ARGS := O=$(_OUTPUT)
endif
-rh-%::
+dist-%::
$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
-rhg-%::
+distg-%::
$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
diff --git a/redhat/Makefile b/redhat/Makefile
index 0118e5b9e2e9..006e48de5870 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -57,9 +57,9 @@ KABIDW := $(REDHAT)/kabi-dwarf
include Makefile.cross
-default: rh-help
+default: dist-help
-rh-python-check:
+dist-python-check:
@if [ ! -f /usr/libexec/platform-python ]; then \
if ! which python3 > /dev/null 2>&1; then \
echo "ERROR: Python 3 is needed." ; \
@@ -71,7 +71,7 @@ rh-python-check:
exit 1; \
fi
-rh-kabi: rh-python-check
+dist-kabi: dist-python-check
@for KABIARCH in $(ARCH_LIST); do \
$(REDHAT)/kabi/show-kabi -k $(REDHAT)/kabi/kabi-module/ -m \
-a $$KABIARCH -r $(RHEL_MAJOR).$(RHEL_MINOR) > $(REDHAT)/kabi/Module.kabi_$$KABIARCH;\
@@ -83,7 +83,7 @@ rh-kabi: rh-python-check
done;
@(cd $(REDHAT)/kabi/ && ln -Tsf kabi-rhel$(RHEL_MAJOR)$(RHEL_MINOR) kabi-current)
-rh-kabi-dup: rh-python-check
+dist-kabi-dup: dist-python-check
@for KABIARCH in $(ARCH_LIST); do \
touch $(REDHAT)/kabi/Module.kabi_dup_$$KABIARCH;\
if [ -d $(REDHAT)/kabi/kabi-dup-module/kabi_$$KABIARCH ]; then \
@@ -93,7 +93,7 @@ rh-kabi-dup: rh-python-check
fi \
done;
-rh-check-kabi: rh-kabi
+dist-check-kabi: dist-kabi
@if [ ! -e $(_OUTPUT)/Module.symvers ]; then \
echo "ERROR: You must compile the kernel and modules first";\
exit 1;\
@@ -101,7 +101,7 @@ rh-check-kabi: rh-kabi
@$(REDHAT)/kabi/check-kabi -k $(REDHAT)/kabi/Module.kabi_$(MACH) \
-s $(_OUTPUT)/Module.symvers
-rh-check-kabi-dup: rh-kabi-dup
+dist-check-kabi-dup: dist-kabi-dup
@if [ ! -e $(_OUTPUT)/Module.symvers ]; then \
echo "ERROR: You must compile the kernel and modules first";\
exit 1;\
@@ -109,18 +109,18 @@ rh-check-kabi-dup: rh-kabi-dup
@$(REDHAT)/kabi/check-kabi -k $(REDHAT)/kabi/Module.kabi_dup_$(MACH) \
-s $(_OUTPUT)/Module.symvers
-rh-kabi-dw-base: rh-kabi
+dist-kabi-dw-base: dist-kabi
@echo "Generating baseline dataset for KABI DWARF-based comparison..."
@echo "**** GENERATING DWARF-based kABI baseline dataset ****"
@$(KABIDW)/run_kabi-dw.sh generate \
$(REDHAT)/kabi/kabi-current/kabi_whitelist_$(CURARCH) \
$(_OUTPUT) $(KABIDW)/base/$(CURARCH)/
-rh-kabi-dw-check: rh-kabi
+dist-kabi-dw-check: dist-kabi
@if [ ! -d $(KABIDW)/base/$(CURARCH) ]; then \
echo "**** ERROR: ****"; \
echo "Comparison base not found in $(KABIDW)/base/$(CURARCH)."; \
- echo "Please run \"make rh-kabi-dw-base\" first!"; \
+ echo "Please run \"make dist-kabi-dw-base\" first!"; \
exit 1; \
fi
@echo "**** GENERATING DWARF-based kABI dataset ****"
@@ -133,42 +133,42 @@ rh-kabi-dw-check: rh-kabi
@echo "**** End of KABI DWARF-based comparison report ****"
@rm -rf $(KABIDW)/base/$(CURARCH).tmp
-rh-configs-commit: rh-configs-prep
+dist-configs-commit: dist-configs-prep
@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh $(FLAVOR) 1; \
./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR)
-rh-configs: rh-configs-prep
+dist-configs: dist-configs-prep
@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
-rh-configs-check: rh-configs-prep
+dist-configs-check: dist-configs-prep
cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS) $(PACKAGE_NAME)
-rh-configs-prep: rh-clean-configs
+dist-configs-prep: dist-clean-configs
cd $(REDHAT)/configs; TARGET=$(DIST_TARGET) ./build_configs.sh $(PACKAGE_NAME) $(ARCH_MACH)
-rh-configs-arch: ARCH_MACH = $(MACH)
-rh-configs-arch: rh-configs
+dist-configs-arch: ARCH_MACH = $(MACH)
+dist-configs-arch: dist-configs
-rh-clean-configs:
+dist-clean-configs:
cd $(REDHAT)/configs; rm -f kernel-*.config \
kernel-*.config.orig \
kernel-*.config.tmp
-rh-clean-sources:
+dist-clean-sources:
@rm -f $(RPM)/SPECS/*
@for i in $(SOURCES)/*; do \
rm -f $$i; \
done;
-rh-clean-rpmdirs:
+dist-clean-rpmdirs:
@for i in $(RPM)/{BUILD,SRPMS,RPMS,SPECS}/*; do \
rm -rf $$i; \
done;
-rh-clean: rh-clean-sources rh-clean-configs rh-clean-rpmdirs
+dist-clean: dist-clean-sources dist-clean-configs dist-clean-rpmdirs
-rh-stub-key:
+dist-stub-key:
@echo "Copying pre-generated keys";
@echo "*** THIS IS NOT RECOMMENDED ***";
@echo "To be safe, keys should be created once for every build";
@@ -197,7 +197,7 @@ $(KABIDW_TARBALL):
@(cd kabi-dwarf && tar cjvf $(SOURCES)/$(KABIDW_TARFILE) base run_kabi-dw.sh)
-rh-git-version-check:
+dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version 2.13
@IFS=" ."; \
set -- $$(git --version); \
@@ -207,7 +207,7 @@ rh-git-version-check:
exit 1; \
fi
-setup-source: rh-git-version-check rh-clean-sources
+setup-source: dist-git-version-check dist-clean-sources
@cp $(REDHAT)/$(SPECFILE).template $(SOURCES)/$(SPECFILE)
@if [ ! -e $(REDHAT)/$(CHANGELOG) ]; then \
echo "Creating $(CHANGELOG) as copy of $(CHANGELOG_PREV)"; \
@@ -230,7 +230,7 @@ sources-rh: $(TARBALL)
@($(FILTERDIFF) $(TESTPATCH).tmp | egrep -v "^index|^diff" >$(TESTPATCH).tmp2; true)
@mv $(TESTPATCH).tmp2 $(TESTPATCH).tmp
@diff $(TESTPATCH).tmp $(TESTPATCH) > /dev/null || \
- echo "WARNING: There are uncommitted changes in your tree or the changes are not in sync with linux-kernel-test.patch. Either commit the changes or run 'make rh-test-patch'"
+ echo "WARNING: There are uncommitted changes in your tree or the changes are not in sync with linux-kernel-test.patch. Either commit the changes or run 'make dist-test-patch'"
@rm $(TESTPATCH).tmp
@cp $(TESTPATCH) $(SOURCES)/linux-kernel-test.patch
@cp fedora_files/* $(SOURCES);
@@ -262,197 +262,197 @@ sources-rh: $(TARBALL)
fi
@(cd kabi-dwarf && tar cjvf $(SOURCES)/$(KABIDW_TARFILE) base run_kabi-dw.sh)
-rh-sources: setup-source rh-configs-check rh-kabi rh-kabi-dup sources-rh
+dist-sources: setup-source dist-configs-check dist-kabi dist-kabi-dup sources-rh
-rh-test-patch:
+dist-test-patch:
@git diff --no-renames HEAD > $(TESTPATCH);
@($(FILTERDIFF) $(TESTPATCH) | egrep -v "^index|^diff" >$(TESTPATCH).tmp; true)
@mv $(TESTPATCH).tmp $(TESTPATCH);
-rh-all-rpms: rh-sources
+dist-all-rpms: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" --target $(MACH) -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
-rh-srpm: rh-sources
+dist-srpm: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" --nodeps -bs $(RPM)/SOURCES/$(PACKAGE_NAME).spec
-rh-srpm-gcov:
- make rh-sources BUILDID=".gcov" BUILDOPTS="+gcov"
+dist-srpm-gcov:
+ make dist-sources BUILDID=".gcov" BUILDOPTS="+gcov"
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" --nodeps -bs $(RPM)/SOURCES/$(PACKAGE_NAME).spec
-rh-rpms: rh-sources
+dist-rpms: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" --target $(MACH) -bb $(RPM)/SOURCES/$(PACKAGE_NAME).spec
-rh-kernel-%: rh-sources
+dist-kernel-%: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" --target $(MACH) --with $* --without vdso_install --without perf --without tools -bb $(RPM)/SOURCES/$(PACKAGE_NAME).spec
-rh-prep: rh-sources
+dist-prep: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" --nodeps --target noarch -bp $(RPM)/SOURCES/$(PACKAGE_NAME).spec
-rh-perf: rh-sources
+dist-perf: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" --without up --without smp --without zfcpdump --without debug --without doc --without headers --without --without doc --without debuginfo --target $(MACH) -bb $(RPM)/SOURCES/$(PACKAGE_NAME).spec
-rh-rpm-baseonly: rh-sources
+dist-rpm-baseonly: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" --target $(MACH) --without debug --without debuginfo --without vdso_install --without bpftool --without perf --without tools -bb $(RPM)/SOURCES/$(PACKAGE_NAME).spec
# unless you know what you're doing, you don't want to use the next three ones
-rh-release-finish: setup-source
+dist-release-finish: setup-source
@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
@git add $(REDHAT)/$(CHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@git add $(REDHAT)/marker
@git commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PREBUILD)$(BUILD)$(BUILDID)"
- @$(MAKE) rh-configs
- @$(MAKE) rh-kabi
- @$(MAKE) rh-kabi-dup
+ @$(MAKE) dist-configs
+ @$(MAKE) dist-kabi
+ @$(MAKE) dist-kabi-dup
@$(MAKE) sources-rh
-rh-release: rh-clean-sources
+dist-release: dist-clean-sources
@$(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM) $(__ZSTREAM)
- @$(MAKE) rh-release-finish
-rh-release-tag:
+ @$(MAKE) dist-release-finish
+dist-release-tag:
@git tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)" $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
-.PHONY: rh-brew rh-koji
-rh-brew : BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS)
-rh-koji : BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)
-rhg-brew: BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS)
-rhg-koji: BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)
+.PHONY: dist-brew dist-koji
+dist-brew : BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS)
+dist-koji : BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)
+distg-brew: BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS)
+distg-koji: BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)
-rh-brew rh-koji: rh-%: rh-srpm
+dist-brew dist-koji: dist-%: dist-srpm
$* build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm $(OUTPUT_FILE)
-rhg-brew rhg-koji: rhg-%:
+distg-brew distg-koji: distg-%:
$* build $(BUILD_FLAGS) $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
.PHONY: $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec:
- @echo "rh-sources"
- @$(MAKE) rh-sources
+ @echo "dist-sources"
+ @$(MAKE) dist-sources
-rh-dist-git-test: export RH_DIST_GIT_TEST="1"
-rh-dist-git-test: rh-dist-git
+dist-git-test: export RH_DIST_GIT_TEST="1"
+dist-git-test: dist-git
-rh-dist-git: rh-srpm $(TARBALL) $(KABI_TARBALL) $(KABIDW_TARBALL)
+dist-git: dist-srpm $(TARBALL) $(KABI_TARBALL) $(KABIDW_TARBALL)
ifeq ("$(RHDISTGIT_BRANCH)", "")
$(error RHDISTGIT_BRANCH unset)
endif
$(REDHAT)/scripts/rh-dist-git.sh "$(RHDISTGIT_BRANCH)" "$(RHDISTGIT_CACHE)" "$(RHDISTGIT_TMP)" "$(RHDISTGIT)" "$(TARBALL)" "$(KABI_TARBALL)" "$(KABIDW_TARBALL)" "$(__ZSTREAM)" "$(PACKAGE_NAME)" "$(RHEL_MAJOR)" "$(RHPKG_BIN)" "$(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm"
-rh-rtg: rh-release
- @$(MAKE) rh-release-tag
- @$(MAKE) rh-dist-git
+dist-rtg: dist-release
+ @$(MAKE) dist-release-tag
+ @$(MAKE) dist-git
# RH_LATEST returns the value of the latest "known good" kernel from brew.
# This should not be confused with the latest top-of-tree development tag.
-rh-get-latest:
+dist-get-latest:
$(eval RH_LATEST:=$(shell brew latest-pkg --quiet rhel-${RHEL_MAJOR}.${RHEL_MINOR}.0-candidate kernel | awk ' { print $$1 } '))
@echo "The latest kernel package tag is ${RH_LATEST}."
-rh-os-version:
+dist-os-version:
@echo "OSVERSION: $(RHEL_MAJOR).$(RHEL_MINOR)"
-rh-help:
+dist-help:
@echo 'Cleaning targets:'
- @echo ' rh-clean - Clean redhat/configs/ and redhat/rpm/ directories.'
+ @echo ' dist-clean - Clean redhat/configs/ and redhat/rpm/ directories.'
@echo ''
@echo 'Building targets:'
- @echo ' rh-srpm - Create a source RPM.'
- @echo ' rh-all-rpms - Create a source RPM and build binary RPMs locally.'
- @echo ' rh-brew - Create a source RPM and call brew to build binary RPMs.'
- @echo ' rhg-brew - Build RPMs using a remote git repo. [Configuration needed.]'
- @echo ' rh-cross-all-rpms - Build RPMs for all supported archs using a cross compiler.'
+ @echo ' dist-srpm - Create a source RPM.'
+ @echo ' dist-all-rpms - Create a source RPM and build binary RPMs locally.'
+ @echo ' dist-brew - Create a source RPM and call brew to build binary RPMs.'
+ @echo ' distg-brew - Build RPMs using a remote git repo. [Configuration needed.]'
+ @echo ' dist-cross-all-rpms - Build RPMs for all supported archs using a cross compiler.'
@echo ''
@echo 'Configuration targets:'
- @echo ' rh-configs - Create RHEL config files in redhat/config/.'
+ @echo ' dist-configs - Create RHEL config files in redhat/config/.'
@echo ''
- @echo 'For detailed description and full list of targets, run `make rh-full-help`.'
+ @echo 'For detailed description and full list of targets, run `make dist-full-help`.'
@echo ''
-rh-full-help:
+dist-full-help:
@echo 'Cleaning targets:'
- @echo ' rh-clean - Do rh-clean-sources, rh-clean-configs, & rh-clean-rpmdirs.'
- @echo ' rh-clean-sources - Clean the redhat/rpm/SOURCES/ directory.'
- @echo ' rh-clean-configs - Clean the redhat/configs/ directory.'
- @echo ' rh-clean-rpmdirs - Clean the redhat/rpm/{BUILD,SRPMS,RPMS,SPECS}/ directories.'
+ @echo ' dist-clean - Do dist-clean-sources, dist-clean-configs, & dist-clean-rpmdirs.'
+ @echo ' dist-clean-sources - Clean the redhat/rpm/SOURCES/ directory.'
+ @echo ' dist-clean-configs - Clean the redhat/configs/ directory.'
+ @echo ' dist-clean-rpmdirs - Clean the redhat/rpm/{BUILD,SRPMS,RPMS,SPECS}/ directories.'
@echo ''
@echo 'Building targets:'
@echo ' All RPM/SRPM files will be put under the redhat/rpm/ directory.'
@echo ''
- @echo ' rh-srpm - Create a source RPM and put it into the redhat/rpm/SRPMS/ directory.'
- @echo ' See the rh-brew target for available options.'
- @echo ' rh-srpm-gcov - Create a source RPM with gcov enabled and put it into the'
+ @echo ' dist-srpm - Create a source RPM and put it into the redhat/rpm/SRPMS/ directory.'
+ @echo ' See the dist-brew target for available options.'
+ @echo ' dist-srpm-gcov - Create a source RPM with gcov enabled and put it into the'
@echo ' redhat/rpm/SRPMS/ directory.'
- @echo ' rh-brew - Create a kernel SRPM and then call brew to build the created SRPM.'
+ @echo ' dist-brew - Create a kernel SRPM and then call brew to build the created SRPM.'
@echo ' Add BUILDOPTS="+<opt> -<opt> [...]" to enable/disable build options.'
@echo ' Available <opt>s and their default values:' \
$$(sed -n -e 's/^%define with_\([^ \t]*\).*\?_without_.*/+\1/p' \
-e 's/^%define with_\([^ \t]*\).*\?_with_.*/-\1/p' kernel.spec.template | \
grep -v 'only$$') | fmt -90
- @echo ' rh-koji - Create a kernel SRPM and then call koji to build the created SRPM.'
- @echo ' See the rh-brew target for available options.'
- @echo ' rhg-brew - Pass HEAD of the current git branch to brew to build an RPM set.'
+ @echo ' dist-koji - Create a kernel SRPM and then call koji to build the created SRPM.'
+ @echo ' See the dist-brew target for available options.'
+ @echo ' distg-brew - Pass HEAD of the current git branch to brew to build an RPM set.'
@echo ' Do not forget to push to the remote repository first.'
@echo ' Preceed make command by RHGITCOMMIT=<commitID> to specify commit ID'
@echo ' to use.'
@echo ' To set the remote repo, invoke: git config rhg.url git://<repo_path>'
- @echo ' rhg-koji - Pass HEAD of the current git branch to koji to build an RPM set.'
+ @echo ' distg-koji - Pass HEAD of the current git branch to koji to build an RPM set.'
@echo ' Do not forget to push to the remote repository first.'
- @echo ' See the rhg-brew target for options and configuration.'
- @echo ' rh-rpms - Create the binary RPMS for the kernel.'
- @echo ' See the rh-brew target for available options.'
- @echo ' rh-rpm-baseonly - Create the binary RPMS for the kernel and modules only (no'
+ @echo ' See the distg-brew target for options and configuration.'
+ @echo ' dist-rpms - Create the binary RPMS for the kernel.'
+ @echo ' See the dist-brew target for available options.'
+ @echo ' dist-rpm-baseonly - Create the binary RPMS for the kernel and modules only (no'
@echo ' userspace tools or debuginfo).'
- @echo ' rh-kernel-<type> - Create binary RPMS for a particular kernel type.'
+ @echo ' dist-kernel-<type> - Create binary RPMS for a particular kernel type.'
@echo ' Available <type>s:'\
$$(sed -n 's/^%define with_\([^ ]*only\).*/\1/p' kernel.spec.template)
- @echo ' rh-all-rpms - Create the binary RPMS and the SRPM for the kernel.'
- @echo ' See the rh-brew target for available options.'
- @echo ' rh-prep - Setup the redhat/rpm/BUILD/ directory with the kernel source.'
- @echo ' See the rh-brew target for available options.'
- @echo ' rh-test-patch - Create a diff against HEAD and put it in linux-kernel-test.patch.'
+ @echo ' dist-all-rpms - Create the binary RPMS and the SRPM for the kernel.'
+ @echo ' See the dist-brew target for available options.'
+ @echo ' dist-prep - Setup the redhat/rpm/BUILD/ directory with the kernel source.'
+ @echo ' See the dist-brew target for available options.'
+ @echo ' dist-test-patch - Create a diff against HEAD and put it in linux-kernel-test.patch.'
@echo ' Then linux-kernel-test.patch will be added to the kernel build.'
- @echo ' rh-stub-key - Use pre generated keys to speed local test builds.'
- @echo ' rh-cross-download - [x86_64 only] download cross compiler rpms.'
- @echo ' rh-cross-all-builds - [x86_64 only] execute "rpmbuild -bc" for all supported'
+ @echo ' dist-stub-key - Use pre generated keys to speed local test builds.'
+ @echo ' dist-cross-download - [x86_64 only] download cross compiler rpms.'
+ @echo ' dist-cross-all-builds - [x86_64 only] execute "rpmbuild -bc" for all supported'
@echo ' archs using RHEL cross compiler.'
- @echo ' rh-cross-<arch>-build - [x86_64 only] execute "rpmbuild -bc" for specified'
+ @echo ' dist-cross-<arch>-build - [x86_64 only] execute "rpmbuild -bc" for specified'
@echo ' <arch> using RHEL cross compiler.'
@echo ' Supported <arch>s: x86_64'\
$$(sed -n 's/.*--target \([^ ]*\).*/\1/p' Makefile.cross | sort -u)
- @echo ' rh-cross-all-rpms - [x86_64 only] execute rpm builds for all supported'
+ @echo ' dist-cross-all-rpms - [x86_64 only] execute rpm builds for all supported'
@echo ' archs using RHEL cross compiler.'
- @echo ' rh-cross-<arch>-rpm - [x86_64 only] execute rpm builds for specified'
+ @echo ' dist-cross-<arch>-rpm - [x86_64 only] execute rpm builds for specified'
@echo ' <arch> using RHEL cross compiler.'
- @echo ' See rh-cross-<arch>-build for the supported archs.'
+ @echo ' See dist-cross-<arch>-build for the supported archs.'
@echo ''
@echo 'kABI targets:'
- @echo ' rh-kabi - Create kABI whitelist files in redhat/kabi/kabi-rhel*/ and'
+ @echo ' dist-kabi - Create kABI whitelist files in redhat/kabi/kabi-rhel*/ and'
@echo ' merge kABI checksums into redhat/kabi/Module.kabi_*.'
- @echo ' rh-kabi-dup - Merge kABI checksums for Driver Update Program (DUP) whitelist'
+ @echo ' dist-kabi-dup - Merge kABI checksums for Driver Update Program (DUP) whitelist'
@echo ' into redhat/kabi/Module.kabi_dup_*.'
- @echo ' rh-check-kabi - Check for changes in kABI whitelisted symbols.'
- @echo ' Requires a pre-compiled tree: run `make rh-configs`, copy the'
+ @echo ' dist-check-kabi - Check for changes in kABI whitelisted symbols.'
+ @echo ' Requires a pre-compiled tree: run `make dist-configs`, copy the'
@echo ' relevant config file from redhat/configs/ to .config, run `make`.'
- @echo ' rh-check-kabi-dup - Like rh-check-kabi but uses a DUP kABI whitelist.'
- @echo ' rh-kabi-dw-base - Generate the base dataset for kABI DWARF-based check.'
- @echo ' rh-kabi-dw-check - Run DWARF-based kABI comparison of current binaries with the base'
+ @echo ' dist-check-kabi-dup - Like dist-check-kabi but uses a DUP kABI whitelist.'
+ @echo ' dist-kabi-dw-base - Generate the base dataset for kABI DWARF-based check.'
+ @echo ' dist-kabi-dw-check - Run DWARF-based kABI comparison of current binaries with the base'
@echo ' dataset.'
@echo ''
@echo 'Configuration targets:'
- @echo ' rh-configs - Creates config files for RHEL $(RHEL_MAJOR) architectures, cleans them'
+ @echo ' dist-configs - Creates config files for RHEL $(RHEL_MAJOR) architectures, cleans them'
@echo ' by running make nonint_oldconfig, and copies them to'
@echo ' redhat/configs/ directory. This is the target to use for a config!'
@echo ' Copy the config file you want from the redhat/configs/ directory'
@echo ' to .config.'
- @echo ' rh-configs-arch - Same as rh-configs but for single architecture only.'
+ @echo ' dist-configs-arch - Same as dist-configs but for single architecture only.'
@echo ''
@echo 'Misc targets:'
- @echo ' rh-get-latest - Returns the latest "known good" kernel from brew. This should not'
+ @echo ' dist-get-latest - Returns the latest "known good" kernel from brew. This should not'
@echo ' be confused with the latest top-of-tree development tag.'
- @echo ' rh-os-version - Displays the current Red Hat Enterprise Linux version target used'
+ @echo ' dist-os-version - Displays the current Red Hat Enterprise Linux version target used'
@echo ' by the current branch/tree.'
@echo ''
diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross
index b50d8fa4af3a..3a22d83670d3 100644
--- a/redhat/Makefile.cross
+++ b/redhat/Makefile.cross
@@ -16,7 +16,7 @@ CROSS_PACKAGE_LIST += binutils-powerpc64-linux-gnu gcc-powerpc64-linux-gnu
CROSS_PACKAGE_LIST += binutils-s390x-linux-gnu gcc-s390x-linux-gnu
endif
-rh-cross-download:
+dist-cross-download:
@if [ "$(ARCHCONFIG)" != "X86_64" ]; then \
echo "$(ARCHCONFIG) ERROR: cross compile only enabled for x86_64"; \
exit 1; \
@@ -24,22 +24,22 @@ rh-cross-download:
@ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \
$(REDHAT)/scripts/download_cross.sh $(CROSS_PACKAGE_LIST)
-rh-cross-aarch64-rpms: rh-cross-download rh-sources
+dist-cross-aarch64-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
$(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/scripts/generate-cross-report.sh "aarch64"
-rh-cross-ppc64-rpms: rh-cross-download rh-sources
+dist-cross-ppc64-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
$(CROSS_RPMFLAGS) --target ppc64 --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/scripts/generate-cross-report.sh "ppc64"
-rh-cross-s390x-rpms: rh-cross-download rh-sources
+dist-cross-s390x-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
$(CROSS_RPMFLAGS) --target s390x --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/scripts/generate-cross-report.sh "s390x"
-rh-cross-all-rpms: rh-cross-download rh-sources
+dist-cross-all-rpms: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
$(CROSS_RPMFLAGS) --target aarch64 --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
$(CROSS_RPMFLAGS) --target ppc64 --with cross -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
@@ -47,22 +47,22 @@ rh-cross-all-rpms: rh-cross-download rh-sources
$(CROSS_RPMFLAGS) -ba $(RPM)/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/scripts/generate-cross-report.sh "aarch64 ppc64 s390x x86_64"
-rh-cross-aarch64-build: rh-cross-download rh-sources
+dist-cross-aarch64-build: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
$(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/scripts/generate-cross-report.sh "aarch64"
-rh-cross-ppc64-build: rh-cross-download rh-sources
+dist-cross-ppc64-build: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
$(CROSS_RPMFLAGS) --target ppc64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/scripts/generate-cross-report.sh "ppc64"
-rh-cross-s390x-build: rh-cross-download rh-sources
+dist-cross-s390x-build: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
$(CROSS_RPMFLAGS) --target s390x --with cross --without debuginfo -bc $(RPM)/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/scripts/generate-cross-report.sh "s390x"
-rh-cross-all-builds: rh-cross-download rh-sources
+dist-cross-all-builds: dist-cross-download dist-sources
$(REDHAT)/scripts/x86_rngd.sh
$(CROSS_RPMFLAGS) --target aarch64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(PACKAGE_NAME).spec
$(CROSS_RPMFLAGS) --target ppc64 --with cross --without debuginfo -bc $(RPM)/SOURCES/$(PACKAGE_NAME).spec
diff --git a/redhat/configs/README b/redhat/configs/README
index 0d3c309da206..b07491a3445f 100644
--- a/redhat/configs/README
+++ b/redhat/configs/README
@@ -39,7 +39,7 @@ been reviewed by Fedora kernel maintainers. Since the Fedora kernel turns on
more configuration options than ARK, there are often settings that are not set
to default in pending-common. These settings are moved to the fedora/
configuration directory after community review. Options are populated with
-"make FLAVOR=fedora rh-commit-configs".
+"make FLAVOR=fedora dist-commit-configs".
All the configuration options for each arch and variant can be found
diff --git a/redhat/configs/editconfig b/redhat/configs/editconfig
index 09ece06029c1..0261b0393d49 100755
--- a/redhat/configs/editconfig
+++ b/redhat/configs/editconfig
@@ -4,7 +4,7 @@
#
# For help, run ./editconfig -h
#
-# TODO: Is there a way to verify the output? Maybe run 'make rh-configs' &
+# TODO: Is there a way to verify the output? Maybe run 'make dist-configs' &
# the process_configs.sh -c tool on the modified CONFIG? This would
# require a modification to process_configs.sh to take a single
# CONFIG option but is do-able.
diff --git a/redhat/configs/evaluate_configs b/redhat/configs/evaluate_configs
index 3835ca7421ba..5ed3e0407bca 100755
--- a/redhat/configs/evaluate_configs
+++ b/redhat/configs/evaluate_configs
@@ -499,7 +499,7 @@ fi
# Find configs that are requested but do not exist in the final .configs
#
if [ "$FINDDEAD" ]; then
- (cd ..; make rh-configs)
+ (cd ..; make dist-configs)
awk '
/is not set/ {
diff --git a/redhat/docs/index.rst b/redhat/docs/index.rst
index 7d13aec5940f..36601ed011ca 100644
--- a/redhat/docs/index.rst
+++ b/redhat/docs/index.rst
@@ -40,7 +40,7 @@ Once GitLab finishes forking the repository (this can take a while):
git checkout upstream/ark-latest
# If you're on Fedora, you need to run:
# ln -s /usr/bin/python3 /usr/libexec/platform-python
- make rh-srpm
+ make dist-srpm
sudo dnf builddep -y redhat/rpm/SPECS/kernel.spec
@@ -60,8 +60,8 @@ patches) , a sub-system maintainer's tree, or your own creation.
git merge -m "Merge branch 'os-build'" os-build
# Fedora carries a patch to alter this setting, so we need to change the configuration to build a vanilla tree.
sed -i 's/=13/=11/g' redhat/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
- # If you're targeting RHEL and have brew/rhpkg installed, use "make DIST=.elrdy rh-srpm" instead
- make rh-srpm
+ # If you're targeting RHEL and have brew/rhpkg installed, use "make DIST=.elrdy dist-srpm" instead
+ make dist-srpm
You can now build the SRPM however you like:
@@ -73,7 +73,7 @@ You can now build the SRPM however you like:
koji build --scratch rawhide redhat/rpm/SRPMS/kernel*src.rpm
Want to add a patch? Just git-cherry-pick it or apply it with git-am and
-re-run ``make rh-srpm``. Change configurations in ``redhat/configs/``
+re-run ``make dist-srpm``. Change configurations in ``redhat/configs/``
(consult the repository layout for details on this).
diff --git a/redhat/docs/maintaining.rst b/redhat/docs/maintaining.rst
index 3cfd8b6d2904..625884a7e154 100644
--- a/redhat/docs/maintaining.rst
+++ b/redhat/docs/maintaining.rst
@@ -156,8 +156,8 @@ Snapshot Release
git merge -m "Merge configuration and build scripts" os-build
# If there's a temporary fix you want in just this build, you can run git-cherry-pick here.
touch localversion
- make rh-release
- make rh-release-tag
+ make dist-release
+ make dist-release-tag
git push upstream $(git describe)
git branch -D build-branch
@@ -170,8 +170,8 @@ Upstream Release
git checkout -b ark/"$UPSTREAM_REF" ark/patches/"$UPSTREAM_REF"
git merge -m "Merge configuration and build scripts" os-build
touch localversion
- make rh-release
- make rh-release-tag
+ make dist-release
+ make dist-release-tag
git push $(git describe) ark/"$UPSTREAM_REF" ark/patches/"$UPSTREAM_REF"
git checkout ark-latest && git reset --hard ark/"$UPSTREAM_REF" && git push -f upstream ark-latest
@@ -200,7 +200,7 @@ From the release branch/tag, run:
# localversion sets the buildid, releases should have an empty build id
rm localversion
touch localversion
- make rh-dist-git
+ make dist-dist-git
cd /tmp/RHEL*/kernel
git commit -a -s -F ../changelog
@@ -219,7 +219,7 @@ From the release branch/tag, run:
# localversion sets the buildid, releases should have an empty build id
rm localversion
touch localversion
- make DIST=.elrdy rh-dist-git
+ make DIST=.elrdy dist-dist-git
cd /tmp/RHEL-8*/kernel
git commit -a -s -F ../changelog
git push
diff --git a/redhat/koji/Makefile b/redhat/koji/Makefile
index c75afa4d4782..079244c24552 100644
--- a/redhat/koji/Makefile
+++ b/redhat/koji/Makefile
@@ -27,7 +27,7 @@ buildid: notes
sources: buildid
echo $(BUILDID) > ../../localversion
- $(MAKE) -C ../ rh-sources
+ $(MAKE) -C ../ dist-sources
mv -f ../rpm/SOURCES/* .
rm -f ./$(PACKAGE_NAME).spec
mv ../rpm/SPECS/$(PACKAGE_NAME).spec .
diff --git a/redhat/koji/kernel.spec b/redhat/koji/kernel.spec
index 61c36ba8fb80..12f17a667b84 100644
--- a/redhat/koji/kernel.spec
+++ b/redhat/koji/kernel.spec
@@ -1,4 +1,4 @@
This is a dummy spec file. It will be replaced by the sources target of the
Makefile in this directory. That target will replace this file with the real
-kernel.spec file in ../rpm/SPECS as generated by make -C ../ rh-sources
+kernel.spec file in ../rpm/SPECS as generated by make -C ../ dist-sources
diff --git a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh
index fd57e533ddb4..8b3b414be953 100755
--- a/redhat/scripts/ci/ark-create-release.sh
+++ b/redhat/scripts/ci/ark-create-release.sh
@@ -27,8 +27,8 @@ fi
if [ -n "$BASE_RELEASE" ]; then
printf "There's already a release for %s (tagged as %s); if you're trying \
to create a new release check out that tag, apply any commits you \
- want, and then run \"touch localversion && make rh-release && make \
- rh-release-tag\".\n" "$UPSTREAM_REF" "$BASE_RELEASE"
+ want, and then run \"touch localversion && make dist-release && make \
+ dist-release-tag\".\n" "$UPSTREAM_REF" "$BASE_RELEASE"
exit 3
fi
@@ -55,8 +55,8 @@ for patch_url in $MR_PATCHES; do
done
touch localversion
-make rh-release
-make rh-release-tag
+make dist-release
+make dist-release-tag
RELEASE=$(git describe)
git checkout ark-latest
git reset --hard "$RELEASE"
diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh
index 59a2fe9868f9..1669abe1ae89 100755
--- a/redhat/scripts/ci/ark-update-configs.sh
+++ b/redhat/scripts/ci/ark-update-configs.sh
@@ -47,8 +47,8 @@ if ! git merge -m "Merge '$UPSTREAM_REF' into 'os-build'" "$UPSTREAM_REF"; then
exit 1
fi
-make FLAVOR=fedora rh-configs-commit
-make FLAVOR=rhel rh-configs-commit
+make FLAVOR=fedora dist-configs-commit
+make FLAVOR=rhel dist-configs-commit
if git show -s --oneline HEAD | grep -q "AUTOMATIC: New configs"; then
./redhat/gen_config_patches.sh
diff --git a/redhat/scripts/configdiff.sh b/redhat/scripts/configdiff.sh
index 139efcb83c63..6c62a3412e94 100755
--- a/redhat/scripts/configdiff.sh
+++ b/redhat/scripts/configdiff.sh
@@ -18,7 +18,7 @@ get_configarch()
# to the srcarch used in the $RHCP_RHEL/pending-common/generic path.
file=$1
- # make rh-configs-prep uses <package-name>-<arch>-<variant>.config
+ # make dist-configs-prep uses <package-name>-<arch>-<variant>.config
# the trick is to get the <package-name> and filter it out
arch="$(echo "$file" | sed "s/$PACKAGE_NAME-\([^-]*\).*.config/\1/")"
@@ -159,5 +159,5 @@ generate_rh_config()
rm -rf $WORK
}
-make rh-configs-prep > /dev/null || die "Failed make rh-prep"
+make dist-configs-prep > /dev/null || die "Failed make dist-prep"
generate_rh_config
diff --git a/redhat/scripts/download_cross.sh b/redhat/scripts/download_cross.sh
index c674893f138a..2e2f719a43f8 100755
--- a/redhat/scripts/download_cross.sh
+++ b/redhat/scripts/download_cross.sh
@@ -26,7 +26,7 @@ fi
# if we're not root, all we can do now is see what's installed
if [ "$(whoami)" != "root" ]; then
- echo "Checking for RHEL7 cross compile packages. If this fails, run \"make rh-cross-download\" as root."
+ echo "Checking for RHEL7 cross compile packages. If this fails, run \"make dist-cross-download\" as root."
rpm -q $@
if [ $? == 0 ]; then
echo "Compilers found."
--
2.26.2
3 years, 8 months