Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
redox-os
cookbook
Commits
c6c87761
Unverified
Commit
c6c87761
authored
7 years ago
by
Ian Douglas Scott
Browse files
Options
Downloads
Patches
Plain Diff
Use system 'pkg' when run on Redox
parent
8eba3003
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!64
Use system 'pkg' when run on Redox
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cook.sh
+9
-2
9 additions, 2 deletions
cook.sh
with
9 additions
and
2 deletions
cook.sh
+
9
−
2
View file @
c6c87761
...
...
@@ -8,6 +8,13 @@ source config.sh
export
BINDIR
=
bin
export
CARGOFLAGS
=
if
[
!
"
$(
uname
-s
)
"
=
"Redox"
]
then
function
pkg
{
CC
=
cc cargo run
--release
--manifest-path
"
$ROOT
/pkgutils/Cargo.toml"
--bin
pkg
--
$@
}
fi
function
usage
{
echo
"cook.sh
$1
<op>"
>
&2
echo
" dist"
>
&2
...
...
@@ -118,7 +125,7 @@ function op {
for
i
in
"
${
BUILD_DEPENDS
[@]
}
"
do
CC
=
cc cargo run
--release
--manifest-path
"
$ROOT
/pkgutils/Cargo.toml"
--bin
pkg
--
--target
=
$TARGET
install
--root
sysroot
"
$REPO
/
$i
.tar.gz"
pkg
--target
=
$TARGET
install
--root
sysroot
"
$REPO
/
$i
.tar.gz"
done
fi
...
...
@@ -229,7 +236,7 @@ function op {
echo
"target =
\"
$TARGET
\"
"
>>
"stage.toml"
mkdir
-p
stage/pkg
cp
-v
stage.toml
"stage/pkg/
$1
.toml"
CC
=
cc cargo run
--release
--manifest-path
"
$ROOT
/pkgutils/Cargo.toml"
--bin
pkg
--
--target
=
$TARGET
create stage
pkg
--target
=
$TARGET
create stage
;;
untar
)
rm
-rfv
stage.tar.gz stage.sig stage.toml
...
...
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