[OS-BUILD PATCH] [redhat] New configs in drivers/net/usb
by GitLab Bridge on behalf of redhat-patchlab
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_USB_RTL8153_ECM:
This option supports ECM mode for RTL8153 ethernet adapter, when
CONFIG_USB_RTL8152 is not set, or the RTL8153 device is not
supported by r8152 driver.
Symbol: USB_RTL8153_ECM [=m]
Type : tristate
Defined at drivers/net/usb/Kconfig:631
Prompt: RTL8153 ECM support
Depends on: NETDEVICES [=y] && USB_NET_DRIVERS [=y] && USB_NET_CDCETHER [=m] && (USB_RTL8152 [=m] || USB_RTL8152 [=m]=n)
Location:
-> Device Drivers
-> Network device support (NETDEVICES [=y])
-> USB Network Adapters (USB_NET_DRIVERS [=y])
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_USB_RTL8153_ECM | 1 +
.../generic/CONFIG_USB_RTL8153_ECM | 19 -------------------
2 files changed, 1 insertion(+), 19 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_USB_RTL8153_ECM
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_USB_RTL8153_ECM
diff --git a/redhat/configs/common/generic/CONFIG_USB_RTL8153_ECM b/redhat/configs/common/generic/CONFIG_USB_RTL8153_ECM
new file mode 100644
index 000000000000..3ec37682be5c
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_USB_RTL8153_ECM
@@ -0,0 +1 @@
+CONFIG_USB_RTL8153_ECM=m
diff --git a/redhat/configs/pending-common/generic/CONFIG_USB_RTL8153_ECM b/redhat/configs/pending-common/generic/CONFIG_USB_RTL8153_ECM
deleted file mode 100644
index 2aac1c66d354..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_USB_RTL8153_ECM
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_USB_RTL8153_ECM:
-#
-# This option supports ECM mode for RTL8153 ethernet adapter, when
-# CONFIG_USB_RTL8152 is not set, or the RTL8153 device is not
-# supported by r8152 driver.
-#
-# Symbol: USB_RTL8153_ECM [=m]
-# Type : tristate
-# Defined at drivers/net/usb/Kconfig:631
-# Prompt: RTL8153 ECM support
-# Depends on: NETDEVICES [=y] && USB_NET_DRIVERS [=y] && USB_NET_CDCETHER [=m] && (USB_RTL8152 [=m] || USB_RTL8152 [=m]=n)
-# Location:
-# -> Device Drivers
-# -> Network device support (NETDEVICES [=y])
-# -> USB Network Adapters (USB_NET_DRIVERS [=y])
-#
-#
-#
-CONFIG_USB_RTL8153_ECM=m
--
GitLab
1 month
[OS-BUILD PATCH] [redhat] New configs in drivers/extcon
by GitLab Bridge on behalf of redhat-patchlab
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_EXTCON_USBC_TUSB320:
Say Y here to enable support for USB Type C cable detection extcon
support using a TUSB320.
Symbol: EXTCON_USBC_TUSB320 [=n]
Type : tristate
Defined at drivers/extcon/Kconfig:189
Prompt: TI TUSB320 USB-C extcon support
Depends on: EXTCON [=y] && I2C [=y]
Location:
-> Device Drivers
-> External Connector Class (extcon) support (EXTCON [=y])
Selects: REGMAP_I2C [=m]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_EXTCON_USBC_TUSB320 | 1 +
.../generic/CONFIG_EXTCON_USBC_TUSB320 | 18 ------------------
2 files changed, 1 insertion(+), 18 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_EXTCON_USBC_TUSB320
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_EXTCON_USBC_TUSB320
diff --git a/redhat/configs/common/generic/CONFIG_EXTCON_USBC_TUSB320 b/redhat/configs/common/generic/CONFIG_EXTCON_USBC_TUSB320
new file mode 100644
index 000000000000..4eedae83091b
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_EXTCON_USBC_TUSB320
@@ -0,0 +1 @@
+# CONFIG_EXTCON_USBC_TUSB320 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_EXTCON_USBC_TUSB320 b/redhat/configs/pending-common/generic/CONFIG_EXTCON_USBC_TUSB320
deleted file mode 100644
index 74b8e5ac1d0d..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_EXTCON_USBC_TUSB320
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_EXTCON_USBC_TUSB320:
-#
-# Say Y here to enable support for USB Type C cable detection extcon
-# support using a TUSB320.
-#
-# Symbol: EXTCON_USBC_TUSB320 [=n]
-# Type : tristate
-# Defined at drivers/extcon/Kconfig:189
-# Prompt: TI TUSB320 USB-C extcon support
-# Depends on: EXTCON [=y] && I2C [=y]
-# Location:
-# -> Device Drivers
-# -> External Connector Class (extcon) support (EXTCON [=y])
-# Selects: REGMAP_I2C [=m]
-#
-#
-#
-# CONFIG_EXTCON_USBC_TUSB320 is not set
--
GitLab
1 month
[OS-BUILD PATCH] [redhat] New configs in drivers/pwm
by GitLab Bridge on behalf of redhat-patchlab
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_PWM_ATMEL_TCB:
Generic PWM framework driver for Atmel Timer Counter Block.
A Timer Counter Block provides 6 PWM devices grouped by 2.
Devices in a given group must have the same period.
To compile this driver as a module, choose M here: the module
will be called pwm-atmel-tcb.
Symbol: PWM_ATMEL_TCB [=n]
Type : tristate
Defined at drivers/pwm/Kconfig:76
Prompt: Atmel TC Block PWM support
Depends on: PWM [=y] && OF [=y]
Location:
-> Device Drivers
-> Pulse-Width Modulation (PWM) Support (PWM [=y])
Selects: REGMAP_MMIO [=n]
---
CONFIG_PWM_DWC:
PWM driver for Synopsys DWC PWM Controller attached to a PCI bus.
To compile this driver as a module, choose M here: the module
will be called pwm-dwc.
Symbol: PWM_DWC [=n]
Type : tristate
Defined at drivers/pwm/Kconfig:167
Prompt: DesignWare PWM Controller
Depends on: PWM [=y] && PCI [=y]
Location:
-> Device Drivers
-> Pulse-Width Modulation (PWM) Support (PWM [=y])
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_PWM_ATMEL_TCB | 1 +
redhat/configs/common/generic/CONFIG_PWM_DWC | 1 +
.../generic/CONFIG_PWM_ATMEL_TCB | 23 -------------------
.../pending-common/generic/CONFIG_PWM_DWC | 19 ---------------
4 files changed, 2 insertions(+), 42 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_PWM_ATMEL_TCB
create mode 100644 redhat/configs/common/generic/CONFIG_PWM_DWC
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_PWM_ATMEL_TCB
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_PWM_DWC
diff --git a/redhat/configs/common/generic/CONFIG_PWM_ATMEL_TCB b/redhat/configs/common/generic/CONFIG_PWM_ATMEL_TCB
new file mode 100644
index 000000000000..0b75af7f9d88
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_PWM_ATMEL_TCB
@@ -0,0 +1 @@
+# CONFIG_PWM_ATMEL_TCB is not set
diff --git a/redhat/configs/common/generic/CONFIG_PWM_DWC b/redhat/configs/common/generic/CONFIG_PWM_DWC
new file mode 100644
index 000000000000..8aea5b09615e
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_PWM_DWC
@@ -0,0 +1 @@
+# CONFIG_PWM_DWC is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_PWM_ATMEL_TCB b/redhat/configs/pending-common/generic/CONFIG_PWM_ATMEL_TCB
deleted file mode 100644
index 661d0650fdc2..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_PWM_ATMEL_TCB
+++ /dev/null
@@ -1,23 +0,0 @@
-# CONFIG_PWM_ATMEL_TCB:
-#
-# Generic PWM framework driver for Atmel Timer Counter Block.
-#
-# A Timer Counter Block provides 6 PWM devices grouped by 2.
-# Devices in a given group must have the same period.
-#
-# To compile this driver as a module, choose M here: the module
-# will be called pwm-atmel-tcb.
-#
-# Symbol: PWM_ATMEL_TCB [=n]
-# Type : tristate
-# Defined at drivers/pwm/Kconfig:76
-# Prompt: Atmel TC Block PWM support
-# Depends on: PWM [=y] && OF [=y]
-# Location:
-# -> Device Drivers
-# -> Pulse-Width Modulation (PWM) Support (PWM [=y])
-# Selects: REGMAP_MMIO [=n]
-#
-#
-#
-# CONFIG_PWM_ATMEL_TCB is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_PWM_DWC b/redhat/configs/pending-common/generic/CONFIG_PWM_DWC
deleted file mode 100644
index 34314ebef8b7..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_PWM_DWC
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_PWM_DWC:
-#
-# PWM driver for Synopsys DWC PWM Controller attached to a PCI bus.
-#
-# To compile this driver as a module, choose M here: the module
-# will be called pwm-dwc.
-#
-# Symbol: PWM_DWC [=n]
-# Type : tristate
-# Defined at drivers/pwm/Kconfig:167
-# Prompt: DesignWare PWM Controller
-# Depends on: PWM [=y] && PCI [=y]
-# Location:
-# -> Device Drivers
-# -> Pulse-Width Modulation (PWM) Support (PWM [=y])
-#
-#
-#
-# CONFIG_PWM_DWC is not set
--
GitLab
1 month
[OS-BUILD PATCH] [redhat] New configs in drivers/mtd
by GitLab Bridge on behalf of redhat-patchlab
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_MTD_NAND_ECC_SW_BCH:
This enables support for software BCH error correction. Binary BCH
codes are more powerful and cpu intensive than traditional Hamming
ECC codes. They are used with NAND devices requiring more than 1 bit
of error correction.
Symbol: MTD_NAND_ECC_SW_BCH [=n]
Type : bool
Defined at drivers/mtd/nand/Kconfig:38
Prompt: Software BCH ECC engine
Depends on: MTD [=m]
Location:
-> Device Drivers
-> Memory Technology Device (MTD) support (MTD [=m])
-> NAND
-> ECC engine support
Selects: BCH [=n] && MTD_NAND_ECC [=n]
---
CONFIG_MTD_NAND_ECC_SW_HAMMING:
This enables support for software Hamming error
correction. This correction can correct up to 1 bit error
per chunk and detect up to 2 bit errors. While it used to be
widely used with old parts, newer NAND chips usually require
more strength correction and in this case BCH or RS will be
preferred.
Symbol: MTD_NAND_ECC_SW_HAMMING [=n]
Type : bool
Defined at drivers/mtd/nand/Kconfig:18
Prompt: Software Hamming ECC engine
Depends on: MTD [=m]
Location:
-> Device Drivers
-> Memory Technology Device (MTD) support (MTD [=m])
-> NAND
-> ECC engine support
Selects: MTD_NAND_ECC [=n]
Selected by [n]:
- SM_FTL [=n] && MTD [=m] && BLOCK [=y]
- MTD_NAND_NDFC [=n] && MTD [=m] && MTD_RAW_NAND [=n] && 4xx
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_MTD_NAND_ECC_SW_BCH | 1 +
.../generic/CONFIG_MTD_NAND_ECC_SW_HAMMING | 1 +
.../generic/CONFIG_MTD_NAND_ECC_SW_BCH | 22 ---------------
.../generic/CONFIG_MTD_NAND_ECC_SW_HAMMING | 27 -------------------
4 files changed, 2 insertions(+), 49 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_MTD_NAND_ECC_SW_BCH
create mode 100644 redhat/configs/common/generic/CONFIG_MTD_NAND_ECC_SW_HAMMING
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_MTD_NAND_ECC_SW_BCH
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_MTD_NAND_ECC_SW_HAMMING
diff --git a/redhat/configs/common/generic/CONFIG_MTD_NAND_ECC_SW_BCH b/redhat/configs/common/generic/CONFIG_MTD_NAND_ECC_SW_BCH
new file mode 100644
index 000000000000..68691d93530a
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_MTD_NAND_ECC_SW_BCH
@@ -0,0 +1 @@
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
diff --git a/redhat/configs/common/generic/CONFIG_MTD_NAND_ECC_SW_HAMMING b/redhat/configs/common/generic/CONFIG_MTD_NAND_ECC_SW_HAMMING
new file mode 100644
index 000000000000..81d0f3e93ba8
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_MTD_NAND_ECC_SW_HAMMING
@@ -0,0 +1 @@
+# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_MTD_NAND_ECC_SW_BCH b/redhat/configs/pending-common/generic/CONFIG_MTD_NAND_ECC_SW_BCH
deleted file mode 100644
index a59a866326ba..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_MTD_NAND_ECC_SW_BCH
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_MTD_NAND_ECC_SW_BCH:
-#
-# This enables support for software BCH error correction. Binary BCH
-# codes are more powerful and cpu intensive than traditional Hamming
-# ECC codes. They are used with NAND devices requiring more than 1 bit
-# of error correction.
-#
-# Symbol: MTD_NAND_ECC_SW_BCH [=n]
-# Type : bool
-# Defined at drivers/mtd/nand/Kconfig:38
-# Prompt: Software BCH ECC engine
-# Depends on: MTD [=m]
-# Location:
-# -> Device Drivers
-# -> Memory Technology Device (MTD) support (MTD [=m])
-# -> NAND
-# -> ECC engine support
-# Selects: BCH [=n] && MTD_NAND_ECC [=n]
-#
-#
-#
-# CONFIG_MTD_NAND_ECC_SW_BCH is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_MTD_NAND_ECC_SW_HAMMING b/redhat/configs/pending-common/generic/CONFIG_MTD_NAND_ECC_SW_HAMMING
deleted file mode 100644
index d23ac128daad..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_MTD_NAND_ECC_SW_HAMMING
+++ /dev/null
@@ -1,27 +0,0 @@
-# CONFIG_MTD_NAND_ECC_SW_HAMMING:
-#
-# This enables support for software Hamming error
-# correction. This correction can correct up to 1 bit error
-# per chunk and detect up to 2 bit errors. While it used to be
-# widely used with old parts, newer NAND chips usually require
-# more strength correction and in this case BCH or RS will be
-# preferred.
-#
-# Symbol: MTD_NAND_ECC_SW_HAMMING [=n]
-# Type : bool
-# Defined at drivers/mtd/nand/Kconfig:18
-# Prompt: Software Hamming ECC engine
-# Depends on: MTD [=m]
-# Location:
-# -> Device Drivers
-# -> Memory Technology Device (MTD) support (MTD [=m])
-# -> NAND
-# -> ECC engine support
-# Selects: MTD_NAND_ECC [=n]
-# Selected by [n]:
-# - SM_FTL [=n] && MTD [=m] && BLOCK [=y]
-# - MTD_NAND_NDFC [=n] && MTD [=m] && MTD_RAW_NAND [=n] && 4xx
-#
-#
-#
-# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
--
GitLab
1 month
[OS-BUILD PATCH] [redhat] New configs in drivers/iio
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_ADXRS290:
Say yes here to build support for Analog Devices ADXRS290 programmable
digital output gyroscope.
This driver can also be built as a module. If so, the module will be
called adxrs290.
Symbol: ADXRS290 [=n]
Type : tristate
Defined at drivers/iio/gyro/Kconfig:44
Prompt: Analog Devices ADXRS290 Dual-Axis MEMS Gyroscope SPI driver
Depends on: IIO [=m] && SPI [=y]
Location:
-> Device Drivers
-> Industrial I/O support (IIO [=m])
-> Digital gyroscope sensors
Selects: IIO_BUFFER [=y] && IIO_TRIGGERED_BUFFER [=m]
---
CONFIG_AS73211:
If you say yes here you get support for the AMS AS73211
JENCOLOR(R) Digital XYZ Sensor.
For triggered measurements, you will need an additional trigger driver
like IIO_HRTIMER_TRIGGER or IIO_SYSFS_TRIGGER.
This driver can also be built as a module. If so, the module
will be called as73211.
Symbol: AS73211 [=n]
Type : tristate
Defined at drivers/iio/light/Kconfig:89
Prompt: AMS AS73211 XYZ color sensor
Depends on: IIO [=m] && I2C [=y]
Location:
-> Device Drivers
-> Industrial I/O support (IIO [=m])
-> Light sensors
Selects: IIO_BUFFER [=y] && IIO_TRIGGERED_BUFFER [=m]
---
CONFIG_HDC2010:
Say yes here to build support for the Texas Instruments
HDC2010 and HDC2080 relative humidity and temperature sensors.
To compile this driver as a module, choose M here: the module
will be called hdc2010.
Symbol: HDC2010 [=n]
Type : tristate
Defined at drivers/iio/humidity/Kconfig:41
Prompt: TI HDC2010 relative humidity and temperature sensor
Depends on: IIO [=m] && I2C [=y]
Location:
-> Device Drivers
-> Industrial I/O support (IIO [=m])
-> Humidity sensors
---
CONFIG_IIO_BUFFER_DMA:
Provides the generic IIO DMA buffer infrastructure that can be used by
drivers for devices with DMA support to implement the IIO buffer.
Should be selected by drivers that want to use the generic DMA buffer
infrastructure.
Symbol: IIO_BUFFER_DMA [=n]
Type : tristate
Defined at drivers/iio/buffer/Kconfig:13
Prompt: Industrial I/O DMA buffer infrastructure
Depends on: IIO [=m] && IIO_BUFFER [=y]
Location:
-> Device Drivers
-> Industrial I/O support (IIO [=m])
-> Enable buffer support within IIO (IIO_BUFFER [=y])
Selected by [n]:
- IIO_BUFFER_DMAENGINE [=n] && IIO [=m] && IIO_BUFFER [=y]
---
CONFIG_IIO_BUFFER_DMAENGINE:
Provides a bonding of the generic IIO DMA buffer infrastructure with the
DMAEngine framework. This can be used by converter drivers with a DMA port
connected to an external DMA controller which is supported by the
DMAEngine framework.
Should be selected by drivers that want to use this functionality.
Symbol: IIO_BUFFER_DMAENGINE [=n]
Type : tristate
Defined at drivers/iio/buffer/Kconfig:22
Prompt: Industrial I/O DMA buffer integration with DMAEngine
Depends on: IIO [=m] && IIO_BUFFER [=y]
Location:
-> Device Drivers
-> Industrial I/O support (IIO [=m])
-> Enable buffer support within IIO (IIO_BUFFER [=y])
Selects: IIO_BUFFER_DMA [=n]
Selected by [n]:
- ADI_AXI_ADC [=n] && IIO [=m]
---
CONFIG_IIO_TRIGGERED_EVENT:
Provides helper functions for setting up triggered events.
Symbol: IIO_TRIGGERED_EVENT [=n]
Type : tristate
Defined at drivers/iio/Kconfig:65
Prompt: Enable triggered events support
Depends on: IIO [=m]
Location:
-> Device Drivers
-> Industrial I/O support (IIO [=m])
Selects: IIO_TRIGGER [=y]
Selected by [n]:
- HI8435 [=n] && IIO [=m] && SPI [=y]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_ADXRS290 | 1 +
redhat/configs/common/generic/CONFIG_AS73211 | 1 +
redhat/configs/common/generic/CONFIG_HDC2010 | 1 +
.../common/generic/CONFIG_IIO_BUFFER_DMA | 1 +
.../generic/CONFIG_IIO_BUFFER_DMAENGINE | 1 +
.../common/generic/CONFIG_IIO_TRIGGERED_EVENT | 1 +
.../pending-common/generic/CONFIG_ADXRS290 | 22 ----------------
.../pending-common/generic/CONFIG_AS73211 | 25 -------------------
.../pending-common/generic/CONFIG_HDC2010 | 21 ----------------
.../generic/CONFIG_IIO_BUFFER_DMA | 23 -----------------
.../generic/CONFIG_IIO_BUFFER_DMAENGINE | 25 -------------------
.../generic/CONFIG_IIO_TRIGGERED_EVENT | 19 --------------
12 files changed, 6 insertions(+), 135 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_ADXRS290
create mode 100644 redhat/configs/common/generic/CONFIG_AS73211
create mode 100644 redhat/configs/common/generic/CONFIG_HDC2010
create mode 100644 redhat/configs/common/generic/CONFIG_IIO_BUFFER_DMA
create mode 100644 redhat/configs/common/generic/CONFIG_IIO_BUFFER_DMAENGINE
create mode 100644 redhat/configs/common/generic/CONFIG_IIO_TRIGGERED_EVENT
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_ADXRS290
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_AS73211
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_HDC2010
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_IIO_BUFFER_DMA
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_IIO_BUFFER_DMAENGINE
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_IIO_TRIGGERED_EVENT
diff --git a/redhat/configs/common/generic/CONFIG_ADXRS290 b/redhat/configs/common/generic/CONFIG_ADXRS290
new file mode 100644
index 000000000000..8b7d877f13bc
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_ADXRS290
@@ -0,0 +1 @@
+# CONFIG_ADXRS290 is not set
diff --git a/redhat/configs/common/generic/CONFIG_AS73211 b/redhat/configs/common/generic/CONFIG_AS73211
new file mode 100644
index 000000000000..dd3aa86a497a
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_AS73211
@@ -0,0 +1 @@
+# CONFIG_AS73211 is not set
diff --git a/redhat/configs/common/generic/CONFIG_HDC2010 b/redhat/configs/common/generic/CONFIG_HDC2010
new file mode 100644
index 000000000000..fad2fecfd916
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_HDC2010
@@ -0,0 +1 @@
+# CONFIG_HDC2010 is not set
diff --git a/redhat/configs/common/generic/CONFIG_IIO_BUFFER_DMA b/redhat/configs/common/generic/CONFIG_IIO_BUFFER_DMA
new file mode 100644
index 000000000000..fdc2817a1429
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_IIO_BUFFER_DMA
@@ -0,0 +1 @@
+# CONFIG_IIO_BUFFER_DMA is not set
diff --git a/redhat/configs/common/generic/CONFIG_IIO_BUFFER_DMAENGINE b/redhat/configs/common/generic/CONFIG_IIO_BUFFER_DMAENGINE
new file mode 100644
index 000000000000..7f7ca607ab89
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_IIO_BUFFER_DMAENGINE
@@ -0,0 +1 @@
+# CONFIG_IIO_BUFFER_DMAENGINE is not set
diff --git a/redhat/configs/common/generic/CONFIG_IIO_TRIGGERED_EVENT b/redhat/configs/common/generic/CONFIG_IIO_TRIGGERED_EVENT
new file mode 100644
index 000000000000..d9e9ba26a23b
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_IIO_TRIGGERED_EVENT
@@ -0,0 +1 @@
+# CONFIG_IIO_TRIGGERED_EVENT is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_ADXRS290 b/redhat/configs/pending-common/generic/CONFIG_ADXRS290
deleted file mode 100644
index b02ec271816d..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_ADXRS290
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_ADXRS290:
-#
-# Say yes here to build support for Analog Devices ADXRS290 programmable
-# digital output gyroscope.
-#
-# This driver can also be built as a module. If so, the module will be
-# called adxrs290.
-#
-# Symbol: ADXRS290 [=n]
-# Type : tristate
-# Defined at drivers/iio/gyro/Kconfig:44
-# Prompt: Analog Devices ADXRS290 Dual-Axis MEMS Gyroscope SPI driver
-# Depends on: IIO [=m] && SPI [=y]
-# Location:
-# -> Device Drivers
-# -> Industrial I/O support (IIO [=m])
-# -> Digital gyroscope sensors
-# Selects: IIO_BUFFER [=y] && IIO_TRIGGERED_BUFFER [=m]
-#
-#
-#
-# CONFIG_ADXRS290 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_AS73211 b/redhat/configs/pending-common/generic/CONFIG_AS73211
deleted file mode 100644
index 74985d5e3d70..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_AS73211
+++ /dev/null
@@ -1,25 +0,0 @@
-# CONFIG_AS73211:
-#
-# If you say yes here you get support for the AMS AS73211
-# JENCOLOR(R) Digital XYZ Sensor.
-#
-# For triggered measurements, you will need an additional trigger driver
-# like IIO_HRTIMER_TRIGGER or IIO_SYSFS_TRIGGER.
-#
-# This driver can also be built as a module. If so, the module
-# will be called as73211.
-#
-# Symbol: AS73211 [=n]
-# Type : tristate
-# Defined at drivers/iio/light/Kconfig:89
-# Prompt: AMS AS73211 XYZ color sensor
-# Depends on: IIO [=m] && I2C [=y]
-# Location:
-# -> Device Drivers
-# -> Industrial I/O support (IIO [=m])
-# -> Light sensors
-# Selects: IIO_BUFFER [=y] && IIO_TRIGGERED_BUFFER [=m]
-#
-#
-#
-# CONFIG_AS73211 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_HDC2010 b/redhat/configs/pending-common/generic/CONFIG_HDC2010
deleted file mode 100644
index 9f4de631e21c..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_HDC2010
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_HDC2010:
-#
-# Say yes here to build support for the Texas Instruments
-# HDC2010 and HDC2080 relative humidity and temperature sensors.
-#
-# To compile this driver as a module, choose M here: the module
-# will be called hdc2010.
-#
-# Symbol: HDC2010 [=n]
-# Type : tristate
-# Defined at drivers/iio/humidity/Kconfig:41
-# Prompt: TI HDC2010 relative humidity and temperature sensor
-# Depends on: IIO [=m] && I2C [=y]
-# Location:
-# -> Device Drivers
-# -> Industrial I/O support (IIO [=m])
-# -> Humidity sensors
-#
-#
-#
-# CONFIG_HDC2010 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_IIO_BUFFER_DMA b/redhat/configs/pending-common/generic/CONFIG_IIO_BUFFER_DMA
deleted file mode 100644
index 21afc7a2d756..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_IIO_BUFFER_DMA
+++ /dev/null
@@ -1,23 +0,0 @@
-# CONFIG_IIO_BUFFER_DMA:
-#
-# Provides the generic IIO DMA buffer infrastructure that can be used by
-# drivers for devices with DMA support to implement the IIO buffer.
-#
-# Should be selected by drivers that want to use the generic DMA buffer
-# infrastructure.
-#
-# Symbol: IIO_BUFFER_DMA [=n]
-# Type : tristate
-# Defined at drivers/iio/buffer/Kconfig:13
-# Prompt: Industrial I/O DMA buffer infrastructure
-# Depends on: IIO [=m] && IIO_BUFFER [=y]
-# Location:
-# -> Device Drivers
-# -> Industrial I/O support (IIO [=m])
-# -> Enable buffer support within IIO (IIO_BUFFER [=y])
-# Selected by [n]:
-# - IIO_BUFFER_DMAENGINE [=n] && IIO [=m] && IIO_BUFFER [=y]
-#
-#
-#
-# CONFIG_IIO_BUFFER_DMA is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_IIO_BUFFER_DMAENGINE b/redhat/configs/pending-common/generic/CONFIG_IIO_BUFFER_DMAENGINE
deleted file mode 100644
index 46d5cb284caf..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_IIO_BUFFER_DMAENGINE
+++ /dev/null
@@ -1,25 +0,0 @@
-# CONFIG_IIO_BUFFER_DMAENGINE:
-#
-# Provides a bonding of the generic IIO DMA buffer infrastructure with the
-# DMAEngine framework. This can be used by converter drivers with a DMA port
-# connected to an external DMA controller which is supported by the
-# DMAEngine framework.
-#
-# Should be selected by drivers that want to use this functionality.
-#
-# Symbol: IIO_BUFFER_DMAENGINE [=n]
-# Type : tristate
-# Defined at drivers/iio/buffer/Kconfig:22
-# Prompt: Industrial I/O DMA buffer integration with DMAEngine
-# Depends on: IIO [=m] && IIO_BUFFER [=y]
-# Location:
-# -> Device Drivers
-# -> Industrial I/O support (IIO [=m])
-# -> Enable buffer support within IIO (IIO_BUFFER [=y])
-# Selects: IIO_BUFFER_DMA [=n]
-# Selected by [n]:
-# - ADI_AXI_ADC [=n] && IIO [=m]
-#
-#
-#
-# CONFIG_IIO_BUFFER_DMAENGINE is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_IIO_TRIGGERED_EVENT b/redhat/configs/pending-common/generic/CONFIG_IIO_TRIGGERED_EVENT
deleted file mode 100644
index d8cf5d290871..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_IIO_TRIGGERED_EVENT
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_IIO_TRIGGERED_EVENT:
-#
-# Provides helper functions for setting up triggered events.
-#
-# Symbol: IIO_TRIGGERED_EVENT [=n]
-# Type : tristate
-# Defined at drivers/iio/Kconfig:65
-# Prompt: Enable triggered events support
-# Depends on: IIO [=m]
-# Location:
-# -> Device Drivers
-# -> Industrial I/O support (IIO [=m])
-# Selects: IIO_TRIGGER [=y]
-# Selected by [n]:
-# - HI8435 [=n] && IIO [=m] && SPI [=y]
-#
-#
-#
-# CONFIG_IIO_TRIGGERED_EVENT is not set
--
GitLab
1 month, 1 week
[OS-BUILD PATCH] [redhat] New configs in drivers/irqchip
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_MST_IRQ:
Support MStar Interrupt Controller.
Symbol: MST_IRQ [=n]
Type : bool
Defined at drivers/irqchip/Kconfig:584
Prompt: MStar Interrupt Controller
Location:
-> Device Drivers
-> IRQ chip support
Selects: IRQ_DOMAIN [=y] && IRQ_DOMAIN_HIERARCHY [=y]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_MST_IRQ | 1 +
.../pending-common/generic/CONFIG_MST_IRQ | 16 ----------------
2 files changed, 1 insertion(+), 16 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_MST_IRQ
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_MST_IRQ
diff --git a/redhat/configs/common/generic/CONFIG_MST_IRQ b/redhat/configs/common/generic/CONFIG_MST_IRQ
new file mode 100644
index 000000000000..80d5aeca4332
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_MST_IRQ
@@ -0,0 +1 @@
+# CONFIG_MST_IRQ is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_MST_IRQ b/redhat/configs/pending-common/generic/CONFIG_MST_IRQ
deleted file mode 100644
index a26929e93f0e..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_MST_IRQ
+++ /dev/null
@@ -1,16 +0,0 @@
-# CONFIG_MST_IRQ:
-#
-# Support MStar Interrupt Controller.
-#
-# Symbol: MST_IRQ [=n]
-# Type : bool
-# Defined at drivers/irqchip/Kconfig:584
-# Prompt: MStar Interrupt Controller
-# Location:
-# -> Device Drivers
-# -> IRQ chip support
-# Selects: IRQ_DOMAIN [=y] && IRQ_DOMAIN_HIERARCHY [=y]
-#
-#
-#
-# CONFIG_MST_IRQ is not set
--
GitLab
1 month, 2 weeks
[OS-BUILD PATCH] [redhat] New configs in drivers/net/pcs
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_PCS_XPCS:
This module provides helper functions for Synopsys DesignWare XPCS
controllers.
Symbol: PCS_XPCS [=n]
Type : tristate
Defined at drivers/net/pcs/Kconfig:8
Prompt: Synopsys DesignWare XPCS controller
Depends on: NETDEVICES [=y] && MDIO_DEVICE [=y]
Location:
-> Device Drivers
-> Network device support (NETDEVICES [=y])
-> PCS device drivers
Selects: MDIO_BUS [=y]
Selected by [n]:
- STMMAC_ETH [=n] && NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_STMICRO [=n] && HAS_IOMEM [=y] && HAS_DMA [=y]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_PCS_XPCS | 1 +
.../pending-common/generic/CONFIG_PCS_XPCS | 21 -------------------
2 files changed, 1 insertion(+), 21 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_PCS_XPCS
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_PCS_XPCS
diff --git a/redhat/configs/common/generic/CONFIG_PCS_XPCS b/redhat/configs/common/generic/CONFIG_PCS_XPCS
new file mode 100644
index 000000000000..ca3dfae8d1b1
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_PCS_XPCS
@@ -0,0 +1 @@
+# CONFIG_PCS_XPCS is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_PCS_XPCS b/redhat/configs/pending-common/generic/CONFIG_PCS_XPCS
deleted file mode 100644
index fad45873ffb5..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_PCS_XPCS
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_PCS_XPCS:
-#
-# This module provides helper functions for Synopsys DesignWare XPCS
-# controllers.
-#
-# Symbol: PCS_XPCS [=n]
-# Type : tristate
-# Defined at drivers/net/pcs/Kconfig:8
-# Prompt: Synopsys DesignWare XPCS controller
-# Depends on: NETDEVICES [=y] && MDIO_DEVICE [=y]
-# Location:
-# -> Device Drivers
-# -> Network device support (NETDEVICES [=y])
-# -> PCS device drivers
-# Selects: MDIO_BUS [=y]
-# Selected by [n]:
-# - STMMAC_ETH [=n] && NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_STMICRO [=n] && HAS_IOMEM [=y] && HAS_DMA [=y]
-#
-#
-#
-# CONFIG_PCS_XPCS is not set
--
GitLab
1 month, 2 weeks
[OS-BUILD PATCH] [redhat] New configs in fs/cifs
by GitLab Bridge on behalf of redhat-patchlab
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_CIFS_SWN_UPCALL:
The Service Witness Protocol (SWN) is used to get notifications
from a highly available server of resource state changes. This
feature enables an upcall mechanism for CIFS which contacts a
userspace daemon to establish the DCE/RPC connection to retrieve
the cluster available interfaces and resource change notifications.
If unsure, say Y.
Symbol: CIFS_SWN_UPCALL [=n]
Type : bool
Defined at fs/cifs/Kconfig:193
Prompt: SWN feature support
Depends on: NETWORK_FILESYSTEMS [=y] && CIFS [=m]
Location:
-> File systems
-> Network File Systems (NETWORK_FILESYSTEMS [=y])
-> SMB3 and CIFS support (advanced network filesystem) (CIFS [=m])
---
Cc: kernel-patches(a)redhat.com
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_CIFS_SWN_UPCALL | 1 +
.../generic/CONFIG_CIFS_SWN_UPCALL | 22 -------------------
2 files changed, 1 insertion(+), 22 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_CIFS_SWN_UPCALL
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CIFS_SWN_UPCALL
diff --git a/redhat/configs/common/generic/CONFIG_CIFS_SWN_UPCALL b/redhat/configs/common/generic/CONFIG_CIFS_SWN_UPCALL
new file mode 100644
index 000000000000..895af9460510
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_CIFS_SWN_UPCALL
@@ -0,0 +1 @@
+# CONFIG_CIFS_SWN_UPCALL is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_CIFS_SWN_UPCALL b/redhat/configs/pending-common/generic/CONFIG_CIFS_SWN_UPCALL
deleted file mode 100644
index 4b677e712849..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_CIFS_SWN_UPCALL
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_CIFS_SWN_UPCALL:
-#
-# The Service Witness Protocol (SWN) is used to get notifications
-# from a highly available server of resource state changes. This
-# feature enables an upcall mechanism for CIFS which contacts a
-# userspace daemon to establish the DCE/RPC connection to retrieve
-# the cluster available interfaces and resource change notifications.
-# If unsure, say Y.
-#
-# Symbol: CIFS_SWN_UPCALL [=n]
-# Type : bool
-# Defined at fs/cifs/Kconfig:193
-# Prompt: SWN feature support
-# Depends on: NETWORK_FILESYSTEMS [=y] && CIFS [=m]
-# Location:
-# -> File systems
-# -> Network File Systems (NETWORK_FILESYSTEMS [=y])
-# -> SMB3 and CIFS support (advanced network filesystem) (CIFS [=m])
-#
-#
-#
-# CONFIG_CIFS_SWN_UPCALL is not set
--
GitLab
1 month, 2 weeks
[OS-BUILD PATCH] [redhat] Add GIT macro to Makefile and
Makefile.common:
by GitLab Bridge on behalf of bcrocker
From: Ben Crocker <bcrocker(a)redhat.com>
GIT ?= git
and replace literal occurrences of 'git' with $(GIT).
This change enables us to override 'git' with, e.g., some
arbitrary shell script that prints additional information
and/or does additional processing before and/or after (or
even instead of) invoking /usr/bin/git.
Signed-off-by: Ben Crocker <bcrocker(a)redhat.com>
---
redhat/Makefile | 29 +++++++++++++++--------------
redhat/Makefile.common | 16 ++++++++--------
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index 27d2cd94e78f..ee3702434e05 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,3 +1,4 @@
+GIT ?= git
include Makefile.common
include Makefile.rhpkg
@@ -32,8 +33,8 @@ endif
BUILD_TARGET ?= --scratch $(BUILD_SCRATCH_TARGET)
FLAVOR =
-RHGITURL?=$(shell git config rhg.url || git config remote.origin.url)
-RHGITCOMMIT?=$(shell git log -1 --pretty=format:%H)
+RHGITURL?=$(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
+RHGITCOMMIT?=$(shell $(GIT) log -1 --pretty=format:%H)
# this section is needed in order to make O= to work
_OUTPUT := ..
@@ -199,7 +200,7 @@ $(KABIDW_TARBALL):
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version 2.13
@IFS=" ."; \
- set -- $$(git --version); \
+ set -- $$($(GIT) --version); \
IFS=; \
if [ "$$3" -lt 2 -o \( "$$3" -eq 2 -a "$$4" -lt 13 \) ]; then \
echo "ERROR: You need git version 2.13 or newer to run some setup commands"; \
@@ -219,7 +220,7 @@ setup-source: dist-git-version-check dist-clean-sources
sources-rh: $(TARBALL)
@cp -l $(TARBALL) $(SOURCES)/ || cp $(TARBALL) $(SOURCES)/
@touch $(TESTPATCH)
- @git diff --no-renames HEAD > $(TESTPATCH).tmp
+ @$(GIT) diff --no-renames HEAD > $(TESTPATCH).tmp
@# 1) filterdiff will return crap from the patches it just filtered,
@# that's why egrep is needed so if there're changes under redhat/
@# but not everywhere else, it will be empty just like
@@ -265,7 +266,7 @@ sources-rh: $(TARBALL)
dist-sources: setup-source dist-configs-check dist-kabi dist-kabi-dup sources-rh
dist-test-patch:
- @git diff --no-renames HEAD > $(TESTPATCH);
+ @$(GIT) diff --no-renames HEAD > $(TESTPATCH);
@($(FILTERDIFF) $(TESTPATCH) | egrep -v "^index|^diff" >$(TESTPATCH).tmp; true)
@mv $(TESTPATCH).tmp $(TESTPATCH);
@@ -300,34 +301,34 @@ dist-release-finish: setup-source
@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@# if neither changelog nor marker was updated, skip bumping a release
- git diff-index --quiet HEAD && (echo "Nothing changed, skipping updates"; exit 0) || true
+ $(GIT) diff-index --quiet HEAD && (echo "Nothing changed, skipping updates"; exit 0) || true
$(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM) $(__ZSTREAM); \
- git add $(REDHAT)/$(CHANGELOG); \
- 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)"; \
+ $(GIT) add $(REDHAT)/$(CHANGELOG); \
+ $(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)"; \
dist-release: dist-clean-sources
@$(MAKE) dist-release-finish
dist-release-tag:
- @git tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)" $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
+ @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)" $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
git-tree-check:
- @if test -n "$(DIST_PUSH)" && test -z "$(shell git remote get-url gitlab 2>/dev/null)"; then \
+ @if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote get-url gitlab 2>/dev/null)"; then \
echo -e "Please run 'git remote add gitlab <url>' to enable git-push.\n"; \
exit 1; \
fi
- @git diff-index --quiet HEAD || \
+ @$(GIT) diff-index --quiet HEAD || \
{ echo -e "Dirty tree, please clean before merging.\n"; exit 1; }
DIST_BRANCH ?= "os-build"
dist-merge-upstream: git-tree-check
- @if test "$(shell git branch --show-current)" != "$(DIST_BRANCH)"; then \
+ @if test "$(shell $(GIT) branch --show-current)" != "$(DIST_BRANCH)"; then \
echo -e "Please checkout $(DIST_BRANCH) branch before merging.\n"; \
exit 1; \
fi;
@# If TAG is empty, script defaults to master:HEAD
- git checkout $(DIST_BRANCH)
+ $(GIT) checkout $(DIST_BRANCH)
@$(REDHAT)/scripts/ci/ark-update-configs.sh $(TAG)
dist-merge-upstream-push: export DIST_PUSH="1"
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index b335f3c77c7d..80c3b8dfccd4 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -1,4 +1,4 @@
-TOPDIR:=$(shell git rev-parse --show-toplevel)
+TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
REDHAT:=$(TOPDIR)/redhat
include $(TOPDIR)/Makefile.rhelver
@@ -6,11 +6,11 @@ RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
else echo rpm; fi)
MACH := $(shell uname -m)
-RPMKVERSION:=$(shell git show HEAD:Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}')
-RPMKPATCHLEVEL:=$(shell git show HEAD:Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}')
-RPMKSUBLEVEL:=$(shell git show HEAD:Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}')
-RPMKEXTRAVERSION:=$(shell git show HEAD:Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}')
-GITID:= $(shell git log --max-count=1 --pretty=format:%H)
+RPMKVERSION:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}')
+RPMKPATCHLEVEL:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}')
+RPMKSUBLEVEL:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}')
+RPMKEXTRAVERSION:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}')
+GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H)
# marker is git tag which we base off of for exporting patches
# Make sure marker uses RPMKPATCHLEVEL and RPMKEXTRAVERSION from the kernel
# makefile as opposed to any adjusted version for snapshotting.
@@ -42,8 +42,8 @@ else
endif
ifeq ($(VERSION_ON_UPSTREAM),1)
# master is expected to track mainline.
- MERGE_BASE:=$(shell git merge-base HEAD master)
- _TAG:=$(shell git describe $(MERGE_BASE))
+ MERGE_BASE:=$(shell $(GIT) merge-base HEAD master)
+ _TAG:=$(shell $(GIT) describe $(MERGE_BASE))
# a snapshot off of a tagged git is of the form [tag]-[cnt]-g[hash]
SNAPSHOT:=$(shell echo $(_TAG) | grep -c '\-g')
else
--
GitLab
2 months
[OS-BUILD PATCH] Fix branch creation for releases based on tags
by GitLab Bridge on behalf of jeremycline
From: Jeremy Cline <jcline(a)redhat.com>
The release scripts are supposed create a set of branches if the release
is based of a tag rather than a snapshot. davidlt noted on IRC that
branches were missing for recent tags, namely rc3 and rc4. The reason is
that the check for a signed tag expects $UPSTREAM_REF to be the tag.
Resolve $UPSTREAM_REF to a tag (if it exists) prior to verifying the
tag.
Signed-off-by: Jeremy Cline <jcline(a)redhat.com>
---
redhat/scripts/ci/ark-create-release.sh | 2 +-
redhat/scripts/ci/ark-rebase-patches.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh
index fd57e533ddb4..83b102ceb54f 100755
--- a/redhat/scripts/ci/ark-create-release.sh
+++ b/redhat/scripts/ci/ark-create-release.sh
@@ -37,7 +37,7 @@ git checkout os-build
git checkout os-build
./redhat/scripts/ci/ark-update-configs.sh "$UPSTREAM_REF" "$PROJECT_ID"
-if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then
+if git tag -v "$(git describe --exact-match "$UPSTREAM_REF")"; then
git checkout -b ark/"$UPSTREAM_REF" ark/patches/"$UPSTREAM_REF"
RELEASE_BRANCHES=" ark/$UPSTREAM_REF ark/patches/$UPSTREAM_REF"
else
diff --git a/redhat/scripts/ci/ark-rebase-patches.sh b/redhat/scripts/ci/ark-rebase-patches.sh
index 2ac22bcba3bd..4a02176bde88 100755
--- a/redhat/scripts/ci/ark-rebase-patches.sh
+++ b/redhat/scripts/ci/ark-rebase-patches.sh
@@ -102,7 +102,7 @@ else
exit 2
fi
-if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then
+if git tag -v "$(git describe --exact-match "$UPSTREAM_REF")"; then
printf "Creating branch \"ark/patches/%s\"\n" "$UPSTREAM_REF"
git branch ark/patches/"$UPSTREAM_REF"
printf "Don't forget to run 'git push <remote> ark/patches/%s'\n" "$UPSTREAM_REF"
--
2.26.2
2 months, 2 weeks
