Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
flatdeb-steam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
steamrt
flatdeb-steam
Commits
0551559a
Commit
0551559a
authored
6 years ago
by
Simon McVittie
Browse files
Options
Downloads
Plain Diff
Merge subtree commit '
a36b947a
'
parents
18de3b97
a36b947a
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
flatdeb/flatdeb/clean-up-before-pack
+4
-1
4 additions, 1 deletion
flatdeb/flatdeb/clean-up-before-pack
flatdeb/flatdeb/collect-source-code
+1
-1
1 addition, 1 deletion
flatdeb/flatdeb/collect-source-code
flatdeb/flatdeb/usrmerge
+12
-3
12 additions, 3 deletions
flatdeb/flatdeb/usrmerge
with
17 additions
and
5 deletions
flatdeb/flatdeb/clean-up-before-pack
+
4
−
1
View file @
0551559a
...
...
@@ -75,8 +75,11 @@ var/lock \
var/tmp
\
${
NULL
}
ln
-s
/run/lock var/lock
install
-d
root
install
-d
run
install
-d
run/lock
install
-d
-m1777
tmp
install
-d
var/cache
install
-d
-m1777
var/tmp
ln
-s
/dev/shm run/shm
ln
-s
/run/lock var/lock
This diff is collapsed.
Click to expand it.
flatdeb/flatdeb/collect-source-code
+
1
−
1
View file @
0551559a
...
...
@@ -178,7 +178,7 @@ def main():
sources_required
=
set
()
if
os
.
path
.
exists
(
platform_manifest
):
platform_packages
=
read_manifest
(
manifest
)
platform_packages
=
read_manifest
(
platform_
manifest
)
else
:
platform_packages
=
[]
...
...
This diff is collapsed.
Click to expand it.
flatdeb/flatdeb/usrmerge
+
12
−
3
View file @
0551559a
...
...
@@ -48,6 +48,9 @@ fi
sysroot
=
"
$1
"
cd
"
$sysroot
"
ls
-ld
bin sbin lib
*
ls
-ld
usr/
*
in_chroot
()
{
chroot
"
$sysroot
"
"
$@
"
}
...
...
@@ -84,14 +87,20 @@ usrmerge () {
fi
}
(
cd
"
$sysroot
"
;
find bin sbin lib
*
-not
-xtype
d
-print0
)
|
(
find bin sbin lib
*
-not
-xtype
d
-print0
)
|
while
read
-r
-d
''
f
;
do
if
chroot
"
$sysroot
"
test
-e
"/usr/
$f
"
;
then
usrmerge
"/
$f
"
fi
done
tar
-cf-
bin sbin lib
*
|
tar
-C
usr
-xf-
cd
"
$sysroot
"
for
f
in
bin sbin lib
*
;
do
if
[
-L
"
$f
"
]
;
then
rm
-v
-f
"
$f
"
>
&2
else
echo
"
$f
"
fi
done
|
tar
-cf-
-T-
|
tar
-C
usr
-xf-
rm
-fr
bin sbin lib
*
ln
-vs
usr/bin usr/sbin usr/lib
*
.
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