Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
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
firmware
FFS Gluon
Commits
92747244
Commit
92747244
authored
11 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
Add support for old git version without -C
parent
25db7bce
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
scripts/patch.sh
+8
-8
8 additions, 8 deletions
scripts/patch.sh
scripts/unpatch.sh
+2
-2
2 additions, 2 deletions
scripts/unpatch.sh
scripts/update-patches.sh
+4
-3
4 additions, 3 deletions
scripts/update-patches.sh
scripts/update.sh
+6
-5
6 additions, 5 deletions
scripts/update.sh
with
20 additions
and
18 deletions
scripts/patch.sh
+
8
−
8
View file @
92747244
...
...
@@ -6,17 +6,17 @@ shopt -s nullglob
.
"
$1
"
/modules
for
module
in
$GLUON_MODULES
;
do
dir
=
"
$1
"
/
$module
git
-C
$dir
checkout
-B
patching base
cd
"
$1
"
/
$module
git checkout
-B
patching base
if
[
"
$1
"
/patches/
$module
/
*
.patch
]
;
then
git
-C
"
$dir
"
am
"
$1
"
/patches/
$module
/
*
.patch
||
(
git
-C
"
$dir
"
am
--abort
git
-C
"
$dir
"
checkout patched
git
-C
"
$dir
"
branch
-D
patching
git am
"
$1
"
/patches/
$module
/
*
.patch
||
(
git am
--abort
git checkout patched
git branch
-D
patching
false
)
fi
git
-C
"
$dir
"
checkout
-B
patched
git
-C
"
$dir
"
branch
-d
patching
git checkout
-B
patched
git branch
-d
patching
done
This diff is collapsed.
Click to expand it.
scripts/unpatch.sh
+
2
−
2
View file @
92747244
...
...
@@ -5,6 +5,6 @@ set -e
.
"
$1
"
/modules
for
module
in
$GLUON_MODULES
;
do
dir
=
"
$1
"
/
$module
git
-C
"
$dir
"
checkout base
cd
"
$1
"
/
$module
git checkout base
done
This diff is collapsed.
Click to expand it.
scripts/update-patches.sh
+
4
−
3
View file @
92747244
...
...
@@ -6,13 +6,14 @@ shopt -s nullglob
.
"
$1
"
/modules
for
module
in
$GLUON_MODULES
;
do
dir
=
"
$1
"
/
$module
rm
-f
"
$1
"
/patches/
$module
/
*
.patch
mkdir
-p
"
$1
"
/patches/
$module
cd
"
$1
"
/
$module
n
=
0
for
commit
in
$(
git
-C
"
$dir
"
rev-list
--reverse
--no-merges
base..patched
)
;
do
for
commit
in
$(
git rev-list
--reverse
--no-merges
base..patched
)
;
do
let
n
=
n+1
git
-C
"
$dir
"
show
--pretty
=
format:
'From: %an <%ae>%nDate: %aD%nSubject: %B'
$commit
>
"
$1
"
/patches/
$module
/
"
$(
printf
'%04u'
$n
)
-
$(
git
-C
"
$dir
"
show
-s
--pretty
=
format:%f
$commit
)
.patch"
git show
--pretty
=
format:
'From: %an <%ae>%nDate: %aD%nSubject: %B'
$commit
>
"
$1
"
/patches/
$module
/
"
$(
printf
'%04u'
$n
)
-
$(
git show
-s
--pretty
=
format:%f
$commit
)
.patch"
done
done
This diff is collapsed.
Click to expand it.
scripts/update.sh
+
6
−
5
View file @
92747244
...
...
@@ -5,13 +5,14 @@ set -e
.
"
$1
"
/modules
for
module
in
$GLUON_MODULES
;
do
dir
=
"
$1
"
/
$module
mkdir
-p
"
$dir
"
var
=
$(
echo
$module
|
tr
'[:lower:]/'
'[:upper:]_'
)
eval
repo
=
\$
{
MODULE_
${
var
}
_REPO
}
eval
commit
=
\$
{
MODULE_
${
var
}
_COMMIT
}
git
-C
"
$dir
"
init
git
-C
"
$dir
"
checkout
$commit
2>/dev/null
||
git
-C
"
$dir
"
fetch
$repo
git
-C
"
$dir
"
checkout
-B
base
$commit
mkdir
-p
"
$1
"
/
$module
cd
"
$1
"
/
$module
git init
git checkout
$commit
2>/dev/null
||
fetch
$repo
git checkout
-B
base
$commit
done
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