❌ FAIL: Test report for kernel (ark)
Hello, We ran automated tests on a recent commit from this kernel tree: Kernel repo: https://gitlab.com/cki-project/kernel-ark.git Commit: e6e5202ceb49 - [redhat] kernel-5.8.0-0.rc7.20200801git7dc6fd0f3b84.1 The results of these automated tests are provided below. Overall result: FAILED (see details below) Merge: OK Compile: FAILED All kernel binaries, config files, and logs are available for download here: https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=datawarehouse/2020/08/01/611347 We attempted to compile the kernel for multiple architectures, but the compile failed on one or more architectures: aarch64: FAILED (see build-aarch64.log.xz attachment) ppc64le: FAILED (see build-ppc64le.log.xz attachment) s390x: FAILED (see build-s390x.log.xz attachment) x86_64: FAILED (see build-x86_64.log.xz attachment) We hope that these logs can help you find the problem quickly. For the full detail on our testing procedures, please scroll to the bottom of this message. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' __ Compile testing --- We compiled the kernel for 4 architectures: aarch64: rpmbuild arguments: rpmbuild --target aarch64 --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools ppc64le: rpmbuild arguments: rpmbuild --target ppc64le --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools s390x: rpmbuild arguments: rpmbuild --target s390x --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools x86_64: rpmbuild arguments: rpmbuild --target x86_64 --with=kabidw_base --without=debug ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCH 0/2] Kernel ark config review netsched v3
On Fri, Jul 31, 2020 at 07:33:30PM -, GitLab Bridge on behalf of dcaratti wrote: > From: dcaratti on gitlab.com > > The merge request had no description. Acked-by: Marcelo Ricardo Leitner ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
[OS-BUILD PATCH 0/2] Kernel ark config review netsched v3
From: dcaratti on gitlab.com The merge request had no description. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
[OS-BUILD PATCH 1/2] redhat: ark: enable CONFIG_NET_SCH_ETF
From: Davide Caratti
move from 'fedora' to 'common', and remove the explicit disable from ark,
so it's enabled in the same way both on ark and fedora.
Signed-off-by: Davide Caratti
---
redhat/configs/ark/generic/CONFIG_NET_SCH_ETF| 1 -
redhat/configs/{fedora => common}/generic/CONFIG_NET_SCH_ETF | 0
2 files changed, 1 deletion(-)
delete mode 100644 redhat/configs/ark/generic/CONFIG_NET_SCH_ETF
rename redhat/configs/{fedora => common}/generic/CONFIG_NET_SCH_ETF (100%)
diff --git a/redhat/configs/ark/generic/CONFIG_NET_SCH_ETF
b/redhat/configs/ark/generic/CONFIG_NET_SCH_ETF
deleted file mode 100644
index 81be382999ac..
--- a/redhat/configs/ark/generic/CONFIG_NET_SCH_ETF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_SCH_ETF is not set
diff --git a/redhat/configs/fedora/generic/CONFIG_NET_SCH_ETF
b/redhat/configs/common/generic/CONFIG_NET_SCH_ETF
similarity index 100%
rename from redhat/configs/fedora/generic/CONFIG_NET_SCH_ETF
rename to redhat/configs/common/generic/CONFIG_NET_SCH_ETF
--
GitLab
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
[OS-BUILD PATCH 2/2] redhat: ark: enable CONFIG_NET_SCH_TAPRIO
From: Davide Caratti
move from 'fedora' to 'common', and remove the explicit disable from ark,
so it's enabled in the same way both on ark and fedora.
Signed-off-by: Davide Caratti
---
redhat/configs/ark/generic/CONFIG_NET_SCH_TAPRIO| 1 -
redhat/configs/{fedora => common}/generic/CONFIG_NET_SCH_TAPRIO | 0
2 files changed, 1 deletion(-)
delete mode 100644 redhat/configs/ark/generic/CONFIG_NET_SCH_TAPRIO
rename redhat/configs/{fedora => common}/generic/CONFIG_NET_SCH_TAPRIO (100%)
diff --git a/redhat/configs/ark/generic/CONFIG_NET_SCH_TAPRIO
b/redhat/configs/ark/generic/CONFIG_NET_SCH_TAPRIO
deleted file mode 100644
index fd5e3d773e09..
--- a/redhat/configs/ark/generic/CONFIG_NET_SCH_TAPRIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_SCH_TAPRIO is not set
diff --git a/redhat/configs/fedora/generic/CONFIG_NET_SCH_TAPRIO
b/redhat/configs/common/generic/CONFIG_NET_SCH_TAPRIO
similarity index 100%
rename from redhat/configs/fedora/generic/CONFIG_NET_SCH_TAPRIO
rename to redhat/configs/common/generic/CONFIG_NET_SCH_TAPRIO
--
GitLab
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCH] gitattributes: Remove unnecesary export restrictions
On Fri, Jul 31, 2020 at 01:01:34AM -, GitLab Bridge on behalf of prarit wrote: > From: Prarit Bhargava > > Both redhat/ and the makefile are publicly available. There is no reason > to exclude them from tarballs, etc. > > Remove the export restrictions on redhat/ and the makefile. As agreed.. Acked-by: Don Zickus > > Signed-off-by: Prarit Bhargava > --- > .gitattributes | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/.gitattributes b/.gitattributes > index 33d4be033ae5..4b32eaa9571e 100644 > --- a/.gitattributes > +++ b/.gitattributes > @@ -2,5 +2,3 @@ > *.h diff=cpp > *.dtsi diff=dts > *.dts diff=dts > -/redhat export-ignore > -makefile export-ignore > -- > GitLab > ___ > kernel mailing list -- kernel@lists.fedoraproject.org > To unsubscribe send an email to kernel-le...@lists.fedoraproject.org > Fedora Code of Conduct: > https://docs.fedoraproject.org/en-US/project/code-of-conduct/ > List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines > List Archives: > https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
[OS-BUILD PATCH 3/3] Add ability to sync upstream through Makefile
From: Don Zickus
Currently all the magic to sync upstream with os-build and ark-patches
is done through scripts in redhat/scripts/ci and .gitlab-ci.yml.
Make this easier by enabling this routine through a redhat/Makefile.
This allows:
* gitlab-ci.yml and maintainer to use same script
* allows maintainer to run local test runs before committing
* developers to hack on things a little more easily
This change also adds the ability to 'git push' the changes. This is
safe because os-build and ark-patches are considered 'protected'
branches meaning only the developers in the 'Maintainers' group can
push to those branches (which is a tiny group right now).
Because I can't atomically commit this change and the change to
kernel-ark-ci's gitlab-ci.yml file, I need this change to go in first.
Then I can modify the gitlab-ci.yml file.
Functionally, this change should be no different than what currently
runs today.
---
redhat/Makefile | 22
redhat/scripts/ci/ark-rebase-patches.sh | 16 ---
redhat/scripts/ci/ark-update-configs.sh | 27 -
3 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index 7cdf9e3bd0bf..61dcc522fbc6 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -319,6 +319,28 @@ dist-release: dist-clean-sources
dist-release-tag:
@git tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)"
$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
+DIST_BRANCH ?= "os-build"
+dist-merge-upstream:
+ @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 ' to enable
git-push.\n"; \
+ exit 1; \
+ fi
+ @if test "$(shell git branch --show-current)" != "$(DIST_BRANCH)"; then
\
+ echo -e "Please checkout $(DIST_BRANCH) branch before
merging.\n"; \
+ exit 1; \
+ fi;
+ @(shell git --no-optional-locks status -uno --porcelain 2>/dev/null || \
+ { echo -e "Dirty tree, please clean before merging.\n"; exit 1;
})
+
+ @# If TAG is empty, script defaults to master:HEAD
+ @$(REDHAT)/scripts/ci/ark-rebase-patches.sh $(TAG) || exit 1
+ @$(REDHAT)/scripts/ci/ark-update-configs.sh $(TAG)
+
+dist-merge-upstream-push: DIST_PUSH="1"
+dist-merge-upstream-push: dist-merge-upstream
+
+
+
.PHONY: dist-brew dist-koji
dist-brew : BUILD_FLAGS ?= $(BREW_FLAGS) $(TEST_FLAGS)
dist-koji : BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)
diff --git a/redhat/scripts/ci/ark-rebase-patches.sh
b/redhat/scripts/ci/ark-rebase-patches.sh
index 561a927d5946..ef2183ecc799 100755
--- a/redhat/scripts/ci/ark-rebase-patches.sh
+++ b/redhat/scripts/ci/ark-rebase-patches.sh
@@ -21,7 +21,7 @@
set -e
UPSTREAM_REF=${1:-master}
-PROJECT_ID=${2:-13604247}
+test -n "$PROJECT_ID" || PROJECT_ID="${2:-13604247}"
ISSUE_TEMPLATE="During an automated rebase of ark-patches, commit %s failed to
rebase.
@@ -98,7 +98,12 @@ else
fi
if $CLEAN_REBASE; then
- printf "You can safely update ark-patches with 'git push -f
ark-patches'\n"
+ if test -n "$DIST_PUSH"; then
+ echo "Pushing branch ark-patches to $(get remote get-url
gitlab)"
+ git push -f gitlab ark-patches
+ else
+ printf "You can safely update ark-patches with 'git push -f
ark-patches'\n"
+ fi
else
printf "Some patches could not be rebased, fix up ark-patches as
necessary"
printf " before pushing the branch."
@@ -108,5 +113,10 @@ fi
if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then
printf "Creating branch \"ark/patches/%s\"\n" "$UPSTREAM_REF"
git branch ark/patches/"$UPSTREAM_REF"
- printf "Don't forget to run 'git push ark/patches/%s'\n"
"$UPSTREAM_REF"
+ if test -n "$DIST_PUSH"; then
+ echo "Pushing branch ark/patches to $(get remote get-url
gitlab)"
+ git push gitlab ark/patches/"$UPSTREAM_REF"
+ else
+ printf "Don't forget to run 'git push
ark/patches/%s'\n" "$UPSTREAM_REF"
+ fi
fi
diff --git a/redhat/scripts/ci/ark-update-configs.sh
b/redhat/scripts/ci/ark-update-configs.sh
index 5fb13eaf60d6..22dcead23f88 100755
--- a/redhat/scripts/ci/ark-update-configs.sh
+++ b/redhat/scripts/ci/ark-update-configs.sh
@@ -19,7 +19,7 @@
set -e
UPSTREAM_REF=${1:-master}
-PROJECT_ID=${2:-13604247}
+test -n "$PROJECT_ID" || PROJECT_ID="${2:-13604247}"
ISSUE_DESCRIPTION="A merge conflict has occurred and must be resolved manually.
@@ -65,3 +65,28 @@ if git show -s --oneline HEAD | grep -q "AUTOMATIC: New
configs"; then
else
printf "No new configuration values exposed from merging %s into
$BRANCH\n" "$UPSTREAM_REF"
fi
+
+if test -n "$DIST_PUSH"; then
+ echo "Pushing branch $(git branch --show-current) to $(get remote
get-url gitlab)"
+ git push gitlab HEAD
+
+
[OS-BUILD PATCH 0/3] Prepare to separate out merge upstream step
From: dzickusrh on gitlab.com I am trying to modify the workflow to use a single branch for development as opposed to 'os-build' and 'ark-patches'. The first step I want to take is to split apart the merge-upstream step and release step. This makes it easier to convert the merge-upstream step to a single branch later. This patchset prepares the scripts to separate the steps by making the scripts less dependent on 'os-build' and more robust for repeated runs. And importantly adds a Makefile command that the gitlab-ci.yml can use too. The next step is to update the kernel-ark-ci tree with gitlab-ci.yml changes to utilize these changes. The third step is to actually split them apart. Finally updating the release steps. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
[OS-BUILD PATCH 2/3] Add master merge check
From: Don Zickus Avoid constantly running the config update scripts when the merge to master did not update anything. This means there can be no new configs to generate. Same argument for ark-patches. The only downside I see with this check is if the generate config scripts fail and this needs to be re-run. But we should be able to do that by hand. Signed-off-by: Don Zickus --- redhat/scripts/ci/ark-rebase-patches.sh | 3 +++ redhat/scripts/ci/ark-update-configs.sh | 5 + 2 files changed, 8 insertions(+) diff --git a/redhat/scripts/ci/ark-rebase-patches.sh b/redhat/scripts/ci/ark-rebase-patches.sh index 2ac22bcba3bd..561a927d5946 100755 --- a/redhat/scripts/ci/ark-rebase-patches.sh +++ b/redhat/scripts/ci/ark-rebase-patches.sh @@ -46,6 +46,9 @@ else GITLAB_CONFIG_OPT="-c $PYTHON_GITLAB_CONFIG" fi +# Check if ark-patches is already rebased to $UPSTREAM_REF +test -n "$(git branch os-build --contains "$UPSTREAM_REF")" && exit 0 + if git show "$UPSTREAM_REF" > /dev/null 2>&1; then printf "Rebasing ark-patches onto %s...\n" "$UPSTREAM_REF" else diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh index e0945d5ffbb4..5fb13eaf60d6 100755 --- a/redhat/scripts/ci/ark-update-configs.sh +++ b/redhat/scripts/ci/ark-update-configs.sh @@ -33,6 +33,7 @@ To resolve this, do the following: git checkout os-build BRANCH="$(git branch --show-current)" +HEAD="$(git describe)" if ! git merge -m "Merge '$UPSTREAM_REF' into '$BRANCH'" "$UPSTREAM_REF"; then git merge --abort printf "Merge conflict; halting!\n" @@ -47,6 +48,10 @@ if ! git merge -m "Merge '$UPSTREAM_REF' into '$BRANCH'" "$UPSTREAM_REF"; then fi exit 1 fi +NEW_HEAD="$(git describe)" + +# Merge is already up to date, nothing to do. +test "$HEAD" != "$NEW_HEAD" || exit 0 # Generates and commits all the pending configs make FLAVOR=fedora dist-configs-commit -- GitLab ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
[OS-BUILD PATCH 1/3] Replace hardcoded values 'os-build' and project id with variables
From: Don Zickus
As a step towards switching away from the os-build branch start by
using more variables.
The patch does 2 things:
* adds a use of PROJECT_ID
* replace os-build with BRANCH in the update configs script
Signed-off-by: Don Zickus
---
redhat/scripts/ci/ark-create-release.sh | 2 +-
redhat/scripts/ci/ark-update-configs.sh | 17 +++--
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/redhat/scripts/ci/ark-create-release.sh
b/redhat/scripts/ci/ark-create-release.sh
index 8b3b414be953..df501b0cce56 100755
--- a/redhat/scripts/ci/ark-create-release.sh
+++ b/redhat/scripts/ci/ark-create-release.sh
@@ -47,7 +47,7 @@ else
fi
git merge -m "Merge configuration and build scripts" os-build
-MR_PATCHES=$(gitlab project-merge-request list --project-id=13604247 \
+MR_PATCHES=$(gitlab project-merge-request list --project-id=${PROJECT_ID} \
--labels="Include in Releases" --state=opened | grep -v "^$" | sort | \
awk '{ print
"https://gitlab.com/cki-project/kernel-ark/-/merge_requests/"; $2 ".patch" }')
for patch_url in $MR_PATCHES; do
diff --git a/redhat/scripts/ci/ark-update-configs.sh
b/redhat/scripts/ci/ark-update-configs.sh
index 1669abe1ae89..e0945d5ffbb4 100755
--- a/redhat/scripts/ci/ark-update-configs.sh
+++ b/redhat/scripts/ci/ark-update-configs.sh
@@ -1,15 +1,15 @@
#!/bin/bash
#
-# This script is intended to regularly update the os-build branch with the
latest
+# This script is intended to regularly update the $BRANCH branch with the
latest
# configuration options from upstream. It merges the given reference into
-# os-build, adds all new configuration symbols to the pending/ config
directory,
+# $BRANCH, adds all new configuration symbols to the pending/ config directory,
# and creates a branch for each new config group.
#
# If the upstream branch fails to merge and the REPORT_BUGS environment
variable
# is set, an issue is filed against the provided project ID.
#
# Arguments:
-# 1) The git object to merge into os-build. This should be something from
+# 1) The git object to merge into $BRANCH. This should be something from
# Linus's master branch, usually either a tag such as v5.5-rc3 or just
# linus/master. The default is "master".
# 2) The Gitlab project ID to file issues against. See the project page on
@@ -32,14 +32,15 @@ To resolve this, do the following:
"
git checkout os-build
-if ! git merge -m "Merge '$UPSTREAM_REF' into 'os-build'" "$UPSTREAM_REF"; then
+BRANCH="$(git branch --show-current)"
+if ! git merge -m "Merge '$UPSTREAM_REF' into '$BRANCH'" "$UPSTREAM_REF"; then
git merge --abort
printf "Merge conflict; halting!\n"
if [ -n "$REPORT_BUGS" ]; then
ISSUES=$(gitlab project-issue list --state "opened" --labels
"Configuration Update" --project-id "$PROJECT_ID")
if [ -z "$ISSUES" ]; then
gitlab project-issue create --project-id "$PROJECT_ID" \
- --title "Merge conflict between '$UPSTREAM_REF'
and 'os-build'" \
+ --title "Merge conflict between '$UPSTREAM_REF'
and '$BRANCH'" \
--labels "Configuration Update" \
--description "$ISSUE_DESCRIPTION"
fi
@@ -47,11 +48,15 @@ if ! git merge -m "Merge '$UPSTREAM_REF' into 'os-build'"
"$UPSTREAM_REF"; then
exit 1
fi
+# Generates and commits all the pending configs
make FLAVOR=fedora dist-configs-commit
make FLAVOR=rhel dist-configs-commit
+# Converts each new pending config from above into its finalized git
+# configs// branch. These commits are used for Merge
+# Requests.
if git show -s --oneline HEAD | grep -q "AUTOMATIC: New configs"; then
./redhat/gen_config_patches.sh
else
- printf "No new configuration values exposed from merging %s into
os-build\n" "$UPSTREAM_REF"
+ printf "No new configuration values exposed from merging %s into
$BRANCH\n" "$UPSTREAM_REF"
fi
--
GitLab
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCH] redhat/Makefile.common: Fix MARKER
On Fri, Jul 31, 2020 at 12:56:37AM -, GitLab Bridge on behalf of prarit
wrote:
> From: Prarit Bhargava
>
> 'make setup-source' is failing with, for example,
>
> fatal: Not a valid object name master
> BUILDID is "hello". Update '/home/prarit/git-kernel/kernel-ark/localversion'
> to change.
> Gathering new log entries since 2eb3eaedb74aa011774bb95fd6516d6d7858d0f8
> fatal: ambiguous argument 'itd3590ebf6f91.1-1-..': unknown revision or path
> not in the working tree.
> Use '--' to separate paths from revisions, like this:
> 'git [...] -- [...]'
>
> As of 5.7.0 new tags were added to the tree of the form
>
> kernel-5.8.0-0.rc7.20200730gitd3590ebf6f91.1
>
> After applying a patch the value of "git describe" is
> kernel-5.8.0-0.rc7.20200730gitd3590ebf6f91.1-1-gd76dfb51aa86. This string
> is stored in TAG which is used by MARKER. The value of MARKER is set
> using a cut command on 'g' which results in MARKER being set to
> "it69119673bd50.1" instead of "d76dfb51aa86"
Hmm, surprising it is showing up now.
Acked-by: Don Zickus
>
> The problem with continuing to use cut and 'g' is that the tag string
> may change again. It is safer to use awk and '-g'.
>
> Use awk instead of cut to evaluate MARKER.
>
> Signed-off-by: Prarit Bhargava
> ---
> redhat/Makefile.common | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/redhat/Makefile.common b/redhat/Makefile.common
> index e7fb532874e3..6d048415ba6d 100644
> --- a/redhat/Makefile.common
> +++ b/redhat/Makefile.common
> @@ -52,7 +52,7 @@ endif
>
> ifeq ($(SNAPSHOT),1)
># The base for generating tags is the snapshot commit
> - MARKER:=$(shell echo $(TAG) | cut -d "g" -f 2)
> + MARKER:=$(shell echo $(TAG) | awk -F "-g" '{ print $$2 }')
># The merge window is weird because the actual versioning hasn't
># been updated but we still need something that works for
># packaging. Fix this by bumping the patch level and marking
> --
> GitLab
> ___
> kernel mailing list -- kernel@lists.fedoraproject.org
> To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
> Fedora Code of Conduct:
> https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives:
> https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCHv2] redhat/Makefile: Fix 'rh-configs' and 'fedora-configs' targets
On Fri, Jul 31, 2020 at 02:55:54PM -, GitLab Bridge on behalf of prarit wrote: > dist-configs-prep: dist-clean-configs > - cd $(REDHAT)/configs; TARGET=$(DIST_TARGET) ./build_configs.sh > $(PACKAGE_NAME) $(ARCH_MACH) > + cd $(REDHAT)/configs; ./build_configs.sh $(PACKAGE_NAME) $(ARCH_MACH) > + > +fedora-configs: dist-configs-prep > + @cd $(REDHAT)/configs; rm -f *rhel*.config > + > +rh-configs: dist-configs-prep > + @cd $(REDHAT)/configs; rm -f *fedora*.config > My concern here is the skipping of process_configs.sh. While this is slow and painful, the question is what is the expectation of the config output? A mashed up collection of configs that falsely claims a config is enabled or the final kconfig process'd configs that reflects the true result of the config option? BTW, you can cut the process_configs.sh time in half by _really_ skipping the checks instead of running the checks and skipping the results. Cheers, Don ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCHv2] redhat/Makefile: Fix 'rh-configs' and 'fedora-configs' targets
On Fri, Jul 31, 2020 at 02:55:54PM -, GitLab Bridge on behalf of prarit wrote: > From: Prarit Bhargava > > Patch didn't make it to the mailing list. > > No changes for v2. > > P. > > ---8<--- > > The 'rh-configs' and 'fedora-configs' targets are not working properly. > They should be creating ELN and Fedora configs but they only create > some temporary/intermediate build files. > > The targets must call dist-configs-prep, and remove the configs that > each target doesn't need. > > Signed-off-by: Prarit Bhargava > Reported-by: mleit...@redhat.com This fixes it here. Thanks! Acked-by: Marcelo Ricardo Leitner ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCHv2 0/23] ARK: disable uncommon net/sched modules
On Tue, Jul 28, 2020 at 01:03:07PM -, GitLab Bridge on behalf of dcaratti wrote: > From: dcaratti on gitlab.com > > after a joint review of the configuration for net/sched area, disable > qdiscs/filters/actions that are not commonly used. Acked-by: Marcelo Ricardo Leitner Plans on enabling ETF and TAPRIO? We had agreed to turn them on too. ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCHv2] redhat/Makefile: Fix 'rh-configs' and 'fedora-configs' targets
On 7/31/20 11:15 AM, Jiri Benc wrote: > On Fri, 31 Jul 2020 14:55:54 -, GitLab Bridge on behalf of prarit wrote: >> +fedora-configs: dist-configs-prep >> +@cd $(REDHAT)/configs; rm -f *rhel*.config >> + >> +rh-configs: dist-configs-prep >> +@cd $(REDHAT)/configs; rm -f *fedora*.config > > Prarit, I wouldn't expect doing > > make fedora-configs > make rh-configs > > in succession resulting in only rhel configs being present. Oh good point. > > Could we do better? Enhancing build_configs.sh to support flavors being > specified on command line and falling back to the 'flavors' file only > when there are none specified seems to me to be a better approach. It > would also speed up the config generation. This is definitely a better approach. I'll go that route. P. > > Thanks, > > Jiri > ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCHv2] redhat/Makefile: Fix 'rh-configs' and 'fedora-configs' targets
On Fri, 31 Jul 2020 14:55:54 -, GitLab Bridge on behalf of prarit wrote: > +fedora-configs: dist-configs-prep > + @cd $(REDHAT)/configs; rm -f *rhel*.config > + > +rh-configs: dist-configs-prep > + @cd $(REDHAT)/configs; rm -f *fedora*.config Prarit, I wouldn't expect doing make fedora-configs make rh-configs in succession resulting in only rhel configs being present. Could we do better? Enhancing build_configs.sh to support flavors being specified on command line and falling back to the 'flavors' file only when there are none specified seems to me to be a better approach. It would also speed up the config generation. Thanks, Jiri ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
[OS-BUILD PATCHv2] redhat/Makefile: Fix 'rh-configs' and 'fedora-configs' targets
From: Prarit Bhargava
Patch didn't make it to the mailing list.
No changes for v2.
P.
---8<---
The 'rh-configs' and 'fedora-configs' targets are not working properly.
They should be creating ELN and Fedora configs but they only create
some temporary/intermediate build files.
The targets must call dist-configs-prep, and remove the configs that
each target doesn't need.
Signed-off-by: Prarit Bhargava
Reported-by: mleit...@redhat.com
---
redhat/Makefile | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index 7cdf9e3bd0bf..74c5148449de 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -20,13 +20,6 @@ else
endif
endif
-
-ifeq ("$(IS_FEDORA)", "1")
- DIST_TARGET=fedora
-else
- DIST_TARGET=rhel
-endif
-
ifeq ("$(NO_CONFIGCHECKS)","1")
PROCESS_CONFIGS_OPTS=
PROCESS_CONFIGS_CHECK_OPTS=
@@ -141,17 +134,17 @@ 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)
-fedora-configs: DIST_TARGET=fedora
-fedora-configs: dist-configs
-
-rh-configs: DIST_TARGET=rhel
-rh-configs: dist-configs
-
dist-configs-check: dist-configs-prep
cd $(REDHAT)/configs; ./process_configs.sh
$(PROCESS_CONFIGS_CHECK_OPTS) $(PACKAGE_NAME)
dist-configs-prep: dist-clean-configs
- cd $(REDHAT)/configs; TARGET=$(DIST_TARGET) ./build_configs.sh
$(PACKAGE_NAME) $(ARCH_MACH)
+ cd $(REDHAT)/configs; ./build_configs.sh $(PACKAGE_NAME) $(ARCH_MACH)
+
+fedora-configs: dist-configs-prep
+ @cd $(REDHAT)/configs; rm -f *rhel*.config
+
+rh-configs: dist-configs-prep
+ @cd $(REDHAT)/configs; rm -f *fedora*.config
dist-configs-arch: ARCH_MACH = $(MACH)
dist-configs-arch: dist-configs
--
GitLab
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
[OS-BUILD PATCH] redhat/Makefile: Fix 'rh-configs' and 'fedora-configs' targets
From: Prarit Bhargava
The 'rh-configs' and 'fedora-configs' targets are not working properly.
They should be creating ELN and Fedora configs but they only create
some temporary/intermediate build files.
The targets must call dist-configs-prep, and remove the configs that
each target doesn't need.
Signed-off-by: Prarit Bhargava
Reported-by: mleit...@redhat.com
---
redhat/Makefile | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index 7cdf9e3bd0bf..74c5148449de 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -20,13 +20,6 @@ else
endif
endif
-
-ifeq ("$(IS_FEDORA)", "1")
- DIST_TARGET=fedora
-else
- DIST_TARGET=rhel
-endif
-
ifeq ("$(NO_CONFIGCHECKS)","1")
PROCESS_CONFIGS_OPTS=
PROCESS_CONFIGS_CHECK_OPTS=
@@ -141,17 +134,17 @@ 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)
-fedora-configs: DIST_TARGET=fedora
-fedora-configs: dist-configs
-
-rh-configs: DIST_TARGET=rhel
-rh-configs: dist-configs
-
dist-configs-check: dist-configs-prep
cd $(REDHAT)/configs; ./process_configs.sh
$(PROCESS_CONFIGS_CHECK_OPTS) $(PACKAGE_NAME)
dist-configs-prep: dist-clean-configs
- cd $(REDHAT)/configs; TARGET=$(DIST_TARGET) ./build_configs.sh
$(PACKAGE_NAME) $(ARCH_MACH)
+ cd $(REDHAT)/configs; ./build_configs.sh $(PACKAGE_NAME) $(ARCH_MACH)
+
+fedora-configs: dist-configs-prep
+ @cd $(REDHAT)/configs; rm -f *rhel*.config
+
+rh-configs: dist-configs-prep
+ @cd $(REDHAT)/configs; rm -f *fedora*.config
dist-configs-arch: ARCH_MACH = $(MACH)
dist-configs-arch: dist-configs
--
GitLab
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCH] gitattributes: Remove unnecesary export restrictions
On 7/30/20 9:01 PM, GitLab Bridge on behalf of prarit wrote: > From: Prarit Bhargava Forgot to cc dzickus and jforbes. P. > > Both redhat/ and the makefile are publicly available. There is no reason > to exclude them from tarballs, etc. > > Remove the export restrictions on redhat/ and the makefile. > > Signed-off-by: Prarit Bhargava > --- > .gitattributes | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/.gitattributes b/.gitattributes > index 33d4be033ae5..4b32eaa9571e 100644 > --- a/.gitattributes > +++ b/.gitattributes > @@ -2,5 +2,3 @@ > *.h diff=cpp > *.dtsi diff=dts > *.dts diff=dts > -/redhat export-ignore > -makefile export-ignore > ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Re: [OS-BUILD PATCH] redhat/Makefile.common: Fix MARKER
On 7/30/20 8:56 PM, GitLab Bridge on behalf of prarit wrote:
> From: Prarit Bhargava
>
Forgot to cc dzickus & jforbes.
P.
> 'make setup-source' is failing with, for example,
>
> fatal: Not a valid object name master
> BUILDID is "hello". Update '/home/prarit/git-kernel/kernel-ark/localversion'
> to change.
> Gathering new log entries since 2eb3eaedb74aa011774bb95fd6516d6d7858d0f8
> fatal: ambiguous argument 'itd3590ebf6f91.1-1-..': unknown revision or path
> not in the working tree.
> Use '--' to separate paths from revisions, like this:
> 'git [...] -- [...]'
>
> As of 5.7.0 new tags were added to the tree of the form
>
> kernel-5.8.0-0.rc7.20200730gitd3590ebf6f91.1
>
> After applying a patch the value of "git describe" is
> kernel-5.8.0-0.rc7.20200730gitd3590ebf6f91.1-1-gd76dfb51aa86. This string
> is stored in TAG which is used by MARKER. The value of MARKER is set
> using a cut command on 'g' which results in MARKER being set to
> "it69119673bd50.1" instead of "d76dfb51aa86"
>
> The problem with continuing to use cut and 'g' is that the tag string
> may change again. It is safer to use awk and '-g'.
>
> Use awk instead of cut to evaluate MARKER.
>
> Signed-off-by: Prarit Bhargava
> ---
> redhat/Makefile.common | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/redhat/Makefile.common b/redhat/Makefile.common
> index e7fb532874e3..6d048415ba6d 100644
> --- a/redhat/Makefile.common
> +++ b/redhat/Makefile.common
> @@ -52,7 +52,7 @@ endif
>
> ifeq ($(SNAPSHOT),1)
># The base for generating tags is the snapshot commit
> - MARKER:=$(shell echo $(TAG) | cut -d "g" -f 2)
> + MARKER:=$(shell echo $(TAG) | awk -F "-g" '{ print $$2 }')
># The merge window is weird because the actual versioning hasn't
># been updated but we still need something that works for
># packaging. Fix this by bumping the patch level and marking
>
___
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
