kernel May 2020

kernel@lists.fedoraproject.org

29 participants
68 discussions

[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

Erase i686 from the kernel package's repository?
by Paul Bolle 22 Apr '21

22 Apr '21

Hi Justin, Fedora 31's release is imminent. This means that some time ago Fedora passed the point where (F31 and later) i686 releases were still possible, doesn't it? If so, could we please clean the kernel package's repository of all the things that are only relevant for i686? Because that would make my plans for the config generation [1] just a bit easier. Thanks, Paul Bolle [1] See https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.or…

4 16

[OS-BUILD PATCH] Add git config hook
by GitLab Bridge on behalf of dzickusrh 24 Mar '21

24 Mar '21

From: Don Zickus <dzickus(a)redhat.com> The kernel workflow is adding complexity. Let's hide some of that complexity behind git aliases. Instead of having the developer manually add them all the time, add a make command to 'include' kernel aliases. A new command 'make rh-gitsetup' runs git config --local --add include.path "../redhat/kernel.gitconfig" and adds an include to the local repo's .git/config file. Over time more workflow commands can be added to help developers. Start with a stub config file. V5: text cleanups V4: s/gitconfig/gitsetup V3: expand comment in kernel.gitconfig Signed-off-by: Don Zickus <dzickus(a)redhat.com> --- redhat/Makefile | 6 ++++++ redhat/kernel.gitconfig | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 redhat/kernel.gitconfig diff --git a/redhat/Makefile b/redhat/Makefile index 0118e5b9e2e9..9236fdb1418a 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -133,6 +133,10 @@ rh-kabi-dw-check: rh-kabi @echo "**** End of KABI DWARF-based comparison report ****" @rm -rf $(KABIDW)/base/$(CURARCH).tmp +rh-gitsetup: + @git config --get include.path | grep -q 'redhat/kernel.gitconfig' || \ + git config --local --add include.path "../redhat/kernel.gitconfig" + rh-configs-commit: rh-configs-prep @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh $(FLAVOR) 1; \ ./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR) @@ -363,6 +367,7 @@ rh-help: @echo ' rh-cross-all-rpms - Build RPMs for all supported archs using a cross compiler.' @echo '' @echo 'Configuration targets:' + @echo ' rh-gitsetup - include redhat/kernel.gitconfig in repo git config' @echo ' rh-configs - Create RHEL config files in redhat/config/.' @echo '' @echo 'For detailed description and full list of targets, run `make rh-full-help`.' @@ -442,6 +447,7 @@ rh-full-help: @echo '' @echo 'Configuration targets:' + @echo ' rh-gitsetup - include redhat/kernel.gitconfig in repo git config' @echo ' rh-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!' diff --git a/redhat/kernel.gitconfig b/redhat/kernel.gitconfig new file mode 100644 index 000000000000..6fd63c7ac1aa --- /dev/null +++ b/redhat/kernel.gitconfig @@ -0,0 +1,10 @@ +# The kernel workflow is growing in complexity. Developers can not always +# remember all the nuisances involved. +# This file is meant to aid developers by providing wrappers around some +# parts of the workflow that everyone can use. +# +# Examples include 'aliases' for git-push options or a shortcut for +# executing workflow checks before pushing. +# +# Please do not include personal information here. +[alias] -- 2.26.2

4 5

[OS-BUILD PATCH] [redhat] New configs in drivers/video
by GitLab Bridge on behalf of jeremycline 04 Dec '20

04 Dec '20

From: Jeremy Cline <jcline(a)redhat.com> 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_BACKLIGHT_LED: If you have a LCD backlight adjustable by LED class driver, say Y to enable this driver. Symbol: BACKLIGHT_LED [=n] Type : tristate Defined at drivers/video/backlight/Kconfig:459 Prompt: Generic LED based Backlight Driver Depends on: HAS_IOMEM [=y] && BACKLIGHT_CLASS_DEVICE [=y] && LEDS_CLASS [=y] && OF [=y] Location: -> Device Drivers -> Graphics support -> Backlight & LCD device support -> Lowlevel Backlight controls (BACKLIGHT_CLASS_DEVICE [=y]) Lyude isn't aware of anything that uses this currently, but noted that that it's likely it will be needed for newer laptops and so recommended "m". --- Cc: Lyude Paul <lyude(a)redhat.com> Cc: Prarit Bhargava <prarit(a)redhat.com> --- .../generic/CONFIG_BACKLIGHT_LED | 0 .../generic/CONFIG_BACKLIGHT_LED | 19 ------------------- 2 files changed, 19 deletions(-) rename redhat/configs/{fedora => common}/generic/CONFIG_BACKLIGHT_LED (100%) delete mode 100644 redhat/configs/pending-common/generic/CONFIG_BACKLIGHT_LED diff --git a/redhat/configs/fedora/generic/CONFIG_BACKLIGHT_LED b/redhat/configs/common/generic/CONFIG_BACKLIGHT_LED similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_BACKLIGHT_LED rename to redhat/configs/common/generic/CONFIG_BACKLIGHT_LED diff --git a/redhat/configs/pending-common/generic/CONFIG_BACKLIGHT_LED b/redhat/configs/pending-common/generic/CONFIG_BACKLIGHT_LED deleted file mode 100644 index f765b88f02ff..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_BACKLIGHT_LED +++ /dev/null @@ -1,19 +0,0 @@ -# CONFIG_BACKLIGHT_LED: -# -# If you have a LCD backlight adjustable by LED class driver, say Y -# to enable this driver. -# -# Symbol: BACKLIGHT_LED [=n] -# Type : tristate -# Defined at drivers/video/backlight/Kconfig:459 -# Prompt: Generic LED based Backlight Driver -# Depends on: HAS_IOMEM [=y] && BACKLIGHT_CLASS_DEVICE [=y] && LEDS_CLASS [=y] && OF [=y] -# Location: -# -> Device Drivers -# -> Graphics support -# -> Backlight & LCD device support -# -> Lowlevel Backlight controls (BACKLIGHT_CLASS_DEVICE [=y]) -# -# -# -# CONFIG_BACKLIGHT_LED is not set -- 2.26.2

2 2

[OS-BUILD PATCH] redhat: Change Makefile target names to dist-
by GitLab Bridge on behalf of prarit 15 Aug '20

15 Aug '20

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

8 18

Stability issue with jetson-tk1NIC with 5.3+
by Nicolas Chauvet 03 Aug '20

03 Aug '20

Hi there, FYI, I've experienced a stability issue with the jetson-tk1 NIC since kernel 5.3 and later. This is reported upstream at https://bugzilla.kernel.org/show_bug.cgi?id=206217 To sum-up: under some "MMC and network I/O load" (dnf update or scp of large file), the pciport receives AER errors that are actually fatal to the network interface and cannot be recovered unless a reboot. I've bisected the issue and found the commit that once reverted, restore a good behaviour: https://patchwork.ozlabs.org/project/linux-tegra/patch/20200420164304.28810… I haven't experienced any other regression since then. What I would like to ask is: 1/ Is there any others reproducers for this issue on jetson-tk1 ? (issue only relevant on tegra124 SOC). 2/ As upstream agreed that a revert would be preferred until more investigation, can we consider to apply as a downstream patch until then ? Thanks for any advices on the topic. -- - Nicolas (kwizart)

3 5

[OS-BUILD PATCH] configs: Enable CONFIG_ENERGY_MODEL
by GitLab Bridge on behalf of prauld 30 Jul '20

30 Jul '20

From: Phil Auld <pauld(a)redhat.com> CONFIG_ENERGY_MODEL will help make the schedutil frequency governor more accurate. This will be useful in the future. It also enables the use of the energy aware scheduler. Signed-off-by: Phil Auld <pauld(a)redhat.com> --- redhat/configs/ark/generic/CONFIG_ENERGY_MODEL | 1 + 1 file changed, 1 insertion(+) create mode 100644 redhat/configs/ark/generic/CONFIG_ENERGY_MODEL diff --git a/redhat/configs/ark/generic/CONFIG_ENERGY_MODEL b/redhat/configs/ark/generic/CONFIG_ENERGY_MODEL new file mode 100644 index 000000000000..a4fec3a5d9eb --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_ENERGY_MODEL @@ -0,0 +1 @@ +CONFIG_ENERGY_MODEL=y -- 2.26.2

4 9

[OS-BUILD PATCH] Fix update_scripts.sh unselective pattern sub
by GitLab Bridge on behalf of jmflinuxtx 01 Jun '20

01 Jun '20

From: David Howells <dhowells(a)redhat.com> The update_scripts.sh script doesn't correctly strip the suffix from the end of the pathname, but will substitute for it anywhere in the path. The pattern really ought to have been /[.]$TARGET$//. Fix this by using a special shell expansion to do it instead of invoking a sed pipeline. Signed-off-by: David Howells <dhowells(a)redhat.com> cc: Jeremy Cline <jcline(a)redhat.com> --- redhat/update_scripts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redhat/update_scripts.sh b/redhat/update_scripts.sh index bbfd6f11f058..5c3dbaeb9459 100755 --- a/redhat/update_scripts.sh +++ b/redhat/update_scripts.sh @@ -7,6 +7,6 @@ fi TARGET=$1 for i in $RPM_SOURCE_DIR/*.$TARGET; do - NEW=`echo $i | sed s/.$TARGET//` + NEW=${i%.$TARGET} cp $i $NEW done -- 2.26.2

4 3

✅ PASS: Test report for kernel 5.6.15-300.fc32 (fedora-32)
by CKI Project 29 May '20

29 May '20

Hello jforbes, We ran automated tests on the following kernel build: Kernel package: kernel-5.6.15-300.fc32 Task URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=45104344 The results of these automated tests are provided below. Overall result: PASSED Tests: OK All kernel binaries, config files, and logs are available for download here: https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=dataware… 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. For the full detail on our testing procedures, please scroll to the bottom of this message. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ✅ stress: stress-ng 🚧 ✅ Storage blktests Host 2: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. ✅ Boot test ⚡⚡⚡ LTP ⚡⚡⚡ Loopdev Sanity ⚡⚡⚡ Memory function: memfd_create ⚡⚡⚡ AMTU (Abstract Machine Test Utility) ⚡⚡⚡ Ethernet drivers sanity 🚧 ⚡⚡⚡ CIFS Connectathon Host 3: ✅ Boot test ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Ethernet drivers sanity 🚧 ✅ CIFS Connectathon ppc64le: Host 1: ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs 🚧 ✅ Storage blktests Host 2: ✅ Boot test 🚧 ✅ kdump - sysrq-c Host 3: ✅ Boot test ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Ethernet drivers sanity 🚧 ✅ CIFS Connectathon s390x: Host 1: ✅ Boot test ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ Ethernet drivers sanity 🚧 ✅ CIFS Connectathon Host 2: ✅ Boot test 🚧 ✅ kdump - sysrq-c Host 3: ✅ Boot test ✅ stress: stress-ng 🚧 ✅ Storage blktests x86_64: Host 1: ✅ Boot test ✅ xfstests - ext4 ✅ xfstests - xfs ✅ stress: stress-ng 🚧 ✅ Storage blktests Host 2: ✅ Boot test ✅ LTP ✅ Loopdev Sanity ✅ Memory function: memfd_create ✅ AMTU (Abstract Machine Test Utility) ✅ Ethernet drivers sanity 🚧 ✅ CIFS Connectathon Host 3: ✅ Boot test 🚧 ✅ kdump - sysrq-c Test sources: https://github.com/CKI-project/tests-beaker 💚 Pull requests are welcome for new tests or improvements to existing tests! Aborted tests ------------- Tests that didn't complete running successfully are marked with ⚡⚡⚡. If this was caused by an infrastructure issue, we try to mark that explicitly in the report. Waived tests ------------ If the test run included waived tests, they are marked with 🚧. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed. Testing timeout --------------- We aim to provide a report within reasonable timeframe. Tests that haven't finished running yet are marked with ⏱.

1 0

[OS-BUILD PATCH 0/6] Patch Breakout again.
by GitLab Bridge on behalf of jmflinuxtx 29 May '20

29 May '20

From: jmflinuxtx on gitlab.com The series breaks the Red Hat patches out into individual patches for dist-git and the spec. It also adds a Patchlist file to the dist-git for a quick view of which patches are applied. That file will also handily show which patches are dropped in a diff before commit so that they can be manually removed from the dist-git. The code has not changed from the previous merge request, just corrected the attribution.

2 7

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel May 2020