Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tomeu Vizoso
linux
Commits
89bb9965
Commit
89bb9965
authored
7 years ago
by
Tomeu Vizoso
Browse files
Options
Downloads
Patches
Plain Diff
HACK: Remove the + in the version, so we can reuse the modules build from kci
parent
2b47e454
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arch/arm/configs/multi_v7_defconfig
+2
-0
2 additions, 0 deletions
arch/arm/configs/multi_v7_defconfig
scripts/setlocalversion
+0
-9
0 additions, 9 deletions
scripts/setlocalversion
with
2 additions
and
9 deletions
arch/arm/configs/multi_v7_defconfig
+
2
−
0
View file @
89bb9965
...
...
@@ -1056,3 +1056,5 @@ CONFIG_VIRTIO=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_PCI_LEGACY=y
CONFIG_VIRTIO_MMIO=y
CONFIG_LOCALVERSION_AUTO=n
CONFIG_LOCALVERSION=""
This diff is collapsed.
Click to expand it.
scripts/setlocalversion
+
0
−
9
View file @
89bb9965
...
...
@@ -161,15 +161,6 @@ res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}"
if
test
"
$CONFIG_LOCALVERSION_AUTO
"
=
"y"
;
then
# full scm version string
res
=
"
$res
$(
scm_version
)
"
else
# append a plus sign if the repository is not in a clean
# annotated or signed tagged state (as git describe only
# looks at signed or annotated tags - git tag -a/-s) and
# LOCALVERSION= is not specified
if
test
"
${
LOCALVERSION
+set
}
"
!=
"set"
;
then
scm
=
$(
scm_version
--short
)
res
=
"
$res
${
scm
:++
}
"
fi
fi
echo
"
$res
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment