Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
redox
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
Cyryl Płotnicki
redox
Commits
345c6bc4
Commit
345c6bc4
authored
7 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
New method of linking live filesystem
Downsize live filesystem to 256 MB
parent
44f776f6
No related branches found
Branches containing commit
Tags
0.3.4
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
kernel
+1
-1
1 addition, 1 deletion
kernel
mk/filesystem.mk
+1
-1
1 addition, 1 deletion
mk/filesystem.mk
mk/kernel.mk
+13
-6
13 additions, 6 deletions
mk/kernel.mk
with
15 additions
and
8 deletions
kernel
@
d6b9768d
Compare
1f81866a
...
d6b9768d
Subproject commit
1f81866afafd5a3830c078c0ad8921b5316c0248
Subproject commit
d6b9768dc3e9cd967df0acf3eafb10d02c9f0ba6
This diff is collapsed.
Click to expand it.
mk/filesystem.mk
+
1
−
1
View file @
345c6bc4
build/filesystem.bin
:
filesystem.toml build/kernel
-$(
FUMOUNT
)
build/filesystem/
||
true
rm
-rf
$@
$@
.partial build/filesystem/
dd
if
=
/dev/zero
of
=
$@
.partial
bs
=
1048576
count
=
512
dd
if
=
/dev/zero
of
=
$@
.partial
bs
=
1048576
count
=
256
cargo run
--manifest-path
redoxfs/Cargo.toml
--release
--bin
redoxfs-mkfs
$@
.partial
mkdir
-p
build/filesystem/
cargo build
--manifest-path
redoxfs/Cargo.toml
--release
--bin
redoxfs
...
...
This diff is collapsed.
Click to expand it.
mk/kernel.mk
+
13
−
6
View file @
345c6bc4
...
...
@@ -6,11 +6,18 @@ else
cd
kernel
&&
xargo
rustc
--lib
--target
$(KTARGET)
--release
--
-C
soft-float
--emit
link
=
../
$@
endif
build/libkernel_live.a
:
kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* build/initfs.tag
build/filesystem.bin
cd
kernel
&&
FILESYSTEM
=
"
$(
PWD
)
/build/filesystem.bin"
xargo rustc
--lib
--features
live
--target
$(
KTARGET
)
--release
--
-C
soft-float
--emit
link
=
../
$@
build/libkernel_live.a
:
kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* build/initfs.tag
cd
kernel
&&
xargo rustc
--lib
--features
live
--target
$(
KTARGET
)
--release
--
-C
soft-float
--emit
link
=
../
$@
build/kernel
:
build/libkernel.a
kernel/linkers/$(ARCH).ld
$(
LD
)
--gc-sections
-z
max-page-size
=
0x1000
-T
kernel/linkers/
$(
ARCH
)
.ld
-o
$@
$<
build/kernel
:
kernel/linkers/$(ARCH).ld
build/libkernel.a
$(
LD
)
--gc-sections
-z
max-page-size
=
0x1000
-T
$<
-o
$@
build/libkernel.a
build/kernel_live
:
build/libkernel_live.a kernel/linkers/$(ARCH).ld
$(
LD
)
--gc-sections
-z
max-page-size
=
0x1000
-T
kernel/linkers/
$(
ARCH
)
.ld
-o
$@
$<
build/kernel_live
:
kernel/linkers/$(ARCH).ld build/libkernel_live.a build/live.o
$(
LD
)
--gc-sections
-z
max-page-size
=
0x1000
-T
$<
-o
$@
build/libkernel_live.a build/live.o
build/live.o
:
build/filesystem.bin
#TODO: More general use of
$(
ARCH
)
objcopy
-I
binary
-O
elf64-x86-64
-B
i386:x86-64
$<
$@
\
--redefine-sym
_binary_build_filesystem_bin_start
=
__live_start
\
--redefine-sym
_binary_build_filesystem_bin_end
=
__live_end
\
--redefine-sym
_binary_build_filesystem_bin_size
=
__live_size
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