kernel December 2020

kernel@lists.fedoraproject.org

30 participants
169 discussions

Start a nNew thread

[OS-BUILD PATCH] [redhat] New configs in drivers/net/usb
by GitLab Bridge on behalf of redhat-patchlab 19 Jun '21

19 Jun '21

4 5

[OS-BUILD PATCH] [redhat] New configs in drivers/extcon
by GitLab Bridge on behalf of redhat-patchlab 19 Jun '21

19 Jun '21

4 5

[OS-BUILD PATCH] [redhat] New configs in drivers/pwm
by GitLab Bridge on behalf of redhat-patchlab 19 Jun '21

19 Jun '21

3 3

[OS-BUILD PATCH] [redhat] New configs in drivers/mtd
by GitLab Bridge on behalf of redhat-patchlab 19 Jun '21

19 Jun '21

3 3

[OS-BUILD PATCH] [redhat] New configs in drivers/iio
by GitLab Bridge on behalf of jeremycline 17 Jun '21

17 Jun '21

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

2 2

[OS-BUILD PATCH] [redhat] New configs in drivers/irqchip
by GitLab Bridge on behalf of jeremycline 11 Jun '21

11 Jun '21

2 1

[OS-BUILD PATCH] [redhat] New configs in drivers/net/pcs
by GitLab Bridge on behalf of jeremycline 10 Jun '21

10 Jun '21

2 1

[OS-BUILD PATCH] [redhat] New configs in fs/cifs
by GitLab Bridge on behalf of redhat-patchlab 06 Jun '21

06 Jun '21

5 4

[OS-BUILD PATCH] [redhat] Add GIT macro to Makefile and Makefile.common:
by GitLab Bridge on behalf of bcrocker 21 May '21

21 May '21

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

17 241

[OS-BUILD PATCH] Fix branch creation for releases based on tags
by GitLab Bridge on behalf of jeremycline 10 May '21

10 May '21

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 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel December 2020