Skip to content

Commit cfeaee6

Browse files
rick-mastersrick-masters
committed
Upgrade Fiwix to 1.5.0-lb1, pulling from upstream Mikaku repo.
1 parent 133c054 commit cfeaee6

File tree

15 files changed

+108
-42
lines changed

15 files changed

+108
-42
lines changed

‎steps/SHA256SUMS.pkgs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,42 +22,42 @@ e8ff13753943e43972a8cf1672819f001718ed38e5497cf7b554c21a507ba22b automake-1.7.8
2222
c5807850a377e4bb9aa4121d9781d145bdd80327626a9419630a75ce2c8d9c71 automake-1.9.6_0.tar.bz2
2323
f8a55bf656f950ee3c5cea48af03f552166f6db9926b78c78843f3cc52a6e22d bash-5.2.15_0.tar.bz2
2424
ebc631ee8e9382650005984ec5f3910492ccb6fb2656b4c0af0f4afc16998906 bc-1.07.1_0.tar.bz2
25-
28b38078f88d77ebfa8ad1a514a5724fe11581bdbfc72b79f087fa24986ac9cb binutils-2.30_0.tar.bz2
25+
3126d6539138d8078bd13d7f8b7b3e2ca4719e3c49d98f8490c0f061bf72d18f binutils-2.30_0.tar.bz2
2626
da658346866061324b92a6b734561257acfdb981783ad5794d67a0cd56e14e58 binutils-2.41_0.tar.bz2
2727
026447a32ab08a8a5150bab82a2f150af4a2ed90c47cfde631e1460eaed019aa binutils-2.41_1.tar.bz2
2828
f0bb18831983493b82fde53917e8d16c6a380761ac5e71e14769a82193fee788 bison-2.3_0.tar.bz2
29-
7018edd13a1dd5ba35fdc8be49af91b28901aad3080fdeebdb98b79f8a90d7ed bison-3.4.1_0.tar.bz2
30-
41c9a95b11cf183524927f52f9f7e97a479e0261c0551f6a4c22690b931243db bison-3.4.1_1.tar.bz2
31-
4a291da4dc1d2a49eeff6bd6017d0d91f804d0a8a2b701de9ed5c53cf5061fe4 bison-3.4.1_2.tar.bz2
29+
cb93657e111253d3ed8935686d50a55bed0ebc4c3bed045d659ba9058ba0fea1 bison-3.4.1_0.tar.bz2
30+
2b79a739789a70a5f968c4b41c4f526bffef07fb36df4358121685630c0c9969 bison-3.4.1_1.tar.bz2
31+
41340ed0e496f9e120058f41eaa43b4c9f9e535d8be2d0dc277551b5995a141b bison-3.4.1_2.tar.bz2
3232
6d5e4debdec03aee096dbcefcad878fb5c6a069f895ee7ade878d9eeb97fb83e bison-3.4.2_0.tar.bz2
33-
e196396a3073992ca4d8ce1606831e3a6e06fd22753f89b778eec01eed549a92 bzip2-1.0.8_0.tar.bz2
33+
9ba54901cb606fa71476c828a215de0c738470f91ed9fd27d8ceb6a23f14d895 bzip2-1.0.8_0.tar.bz2
3434
543214998317d764595d3dd247a1fb2e0803ad77978b8474bd24d64c161b9530 ca-certificates-3.95_0.tar.bz2
35-
692ec3f83fdd94a3687c764e6246f608e4600bc8f9fec953a0b23617ad24d08d coreutils-5.0_0.tar.bz2
36-
09092e187588c5d33c023ac41671b367aef9f7ee967d2c7c03430b33cc03f251 coreutils-6.10_0.tar.bz2
35+
e790ce4bd86869a93a435aca28658a70e33049388058580bd8da453e2cb03603 coreutils-5.0_0.tar.bz2
36+
34c9558f0101773b67bc4e0c9148543e65435344d004396e629d110f0392d3bd coreutils-6.10_0.tar.bz2
3737
f49900486ae7f0c8107d729b71ede155ee44544cdf8d562b50fbea4095bd05b2 coreutils-8.32_0.tar.bz2
3838
6a10f5258650ae75e92eb7aa1a5e6107b72c8b6419a4f64272262a1545c43161 curl-8.5.0_0.tar.bz2
3939
f9efd6600ceb91918078078ff44a33f2a4fb4a59edb804866aebd288c2cfb24e curl-8.5.0_1.tar.bz2
4040
1d4dec2d1885a6b5499a0f0d55e9c2c65dab532c4c593d848b6a542f67789627 dhcpcd-10.0.1_0.tar.bz2
41-
c4008ae6b168aee4120b0f3624a1875f9e413d8f0c637708b8b04a1fb5be173c diffutils-2.7_0.tar.bz2
41+
0858dc91cf8a6c00d04ec50c31ce06d80f930b28d188d636dacbbbb593b284e9 diffutils-2.7_0.tar.bz2
4242
bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1 dist-3.5-236_0.tar.bz2
4343
3a4c5143a241364019afd39af067f1e8433bab78b04096870d9bf2c70ec6ded8 e2fsprogs-1.45.7_0.tar.bz2
4444
9c6f7e156f299f1d0948537e28f00d40e727a3debae3cce158e9bce827136214 ed-1.4_0.tar.bz2
4545
0061d240f9bb2bb534db7003ddcc4eae9981954ad72e8f41ff1d76dc449ebd37 file-5.44_0.tar.bz2
46-
d1db172ab3ea159cad1d76a7de9ec92fa8fec33270ddce16e304ece908dd1344 findutils-4.2.33_0.tar.bz2
46+
eec07e0d710ed3dd8d0ba6a1ec6ca9f1fa3a611bbb225195435679175317bf90 findutils-4.2.33_0.tar.bz2
4747
41902ec0383ea977a8d008dee37150e022e0714cd99f54c37f29c153464b758a flex-2.5.11_0.tar.bz2
4848
b3a8d59229289ca5a1de6a24c9c828d2847144f6662e0d5b7f41e7ff6e57abaa flex-2.5.33_0.tar.bz2
49-
408131b1c033a5f8a6845997b049784be0b466cec107a71270e5a04dae2c1e6c flex-2.6.4_0.tar.bz2
50-
5ff7fbe16b55563719b108260bd6a34ebabab0465d758ca98cba522932532e45 gawk-3.0.4_0.tar.bz2
49+
349c9a7cb1c90533627fb6c97f2e3cf7ae57a49a4e92ed46d660bbecacd07433 flex-2.6.4_0.tar.bz2
50+
b12ef4701c3d2e531e314776a858effb49a33595d901663263a4273a8a59d77c gawk-3.0.4_0.tar.bz2
5151
6de1c1380026ef9948387e665610185b6014f47a80453177a6c81898c95cbbd3 gc-8.0.4_0.tar.bz2
5252
c99d080cf17ac3f75cbae67095cb76220a92d96d877c92c896a7f05c9c94e92d gcc-10.4.0_0.tar.bz2
5353
e0c9e7f4f0cd0d5027f2a38eb262f883133c31ac9ec93ee6afa5abc028096bc0 gcc-13.1.0_0.tar.bz2
54-
526c3710b5067bd2fc869371541d7e71dcff1cffcba7ddecabedc33967e19e2c gcc-4.0.4_0.tar.bz2
54+
27bb77077559b6c0f8dd7b8790ac48f70410ecc8816b5c493988ad5556da65e2 gcc-4.0.4_0.tar.bz2
5555
c1bf792e90df13bf7a24d3f8ce3939fd96ff61b8117e4dcef75605974f3fcf25 gcc-4.0.4_1.tar.bz2
5656
7ac087bf006188154c28401d0c875ede56076c19d41bc54ffa0d7cc18ce40800 gcc-4.7.4_0.tar.bz2
5757
dc67fc1b132fa3945349efe74c5b2197bd0b6babf4d29d2deddd04f09d9af680 gettext-0.21_0.tar.bz2
5858
309282ba840f80b5e10897b1221f3ff3329b9e05b982c788d03652f411974524 gmp-6.2.1_0.tar.bz2
5959
62edfa633f64202b2d29199d11d56a897654a441c7ae39a4d59ca5fe75199f61 gperf-3.1_0.tar.bz2
60-
67d706423e079a9cd764fd9607027d296c0ff2380c1104006a2230a299eb2c1d grep-2.4_0.tar.bz2
60+
23d6f3bf4a60708ebc66d778c536616a728b378defff9f39ee9d1c2fd0cfdd87 grep-2.4_0.tar.bz2
6161
8e612afb9a439aa8bf5db0fc2589eec890a6017690412d5c8e88a5838730b42c grep-3.7_0.tar.bz2
6262
e2a85aad6d51e52c9a30afeed058f95172fde1215f77243549274672990f6237 guile-3.0.9_0.tar.bz2
6363
8d2015b87337abbf287f7a39ee4cf53514120b5d3e90a93fe7d533dcc43f14fa help2man-1.36.4_0.tar.bz2
@@ -72,26 +72,26 @@ daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29 libtool-2.2.4_
7272
503007bbcddcf4e49d26514c59b4c9501f8b42f0c994a59dfdc388b1ae6b7900 libunistring-0.9.10_0.tar.bz2
7373
fd2264a08cbeeb28f3e2580cba174376a154c77b0ef6cbf67b55fd13c0987f52 linux-4.9.10_0.tar.bz2
7474
d15c922973c15a8206e09020e8cfe6a78f7e93614de212f2b37ff80163799c6c linux-headers-4.9.10_0.tar.bz2
75-
3864f2c66516fc4f5086f626f4da2b2a7635e21babca86ba478f866920868e2b m4-1.4.7_0.tar.bz2
75+
fdb3dce8af3eb6c0745f103989f1bae0bfe9156390215f97240a75ed77ae4acd m4-1.4.7_0.tar.bz2
7676
e69554b0a77b419ddd5d0a0e418ba4005ecd0f6784c92a6928a0270bd929a098 make-3.82_0.tar.bz2
7777
6d24960d6a987f68a7e0e3abf6edb52d2e0fe4c86f6ba45327e9634dbf7d40b4 make-4.2.1_0.tar.bz2
7878
17cd976bc0f6e897c6fffe43dd7c55d93ce0adadf1b4dc72925b80e2d266519f mpc-1.2.1_0.tar.bz2
7979
98a9f55c01ed375fae21913284e7fa07ff434c0810f34d791f3fbaa1df221302 mpfr-4.1.0_0.tar.bz2
80-
12dfbee21a78220b4eb9fb843b6a00dd50c5849ffc4754b78209369499e3fefe musl-1.1.24_0.tar.bz2
81-
8d09bb24659023897cacf959068cdd492acc965777d7fb49e1888c14e867b36d musl-1.1.24_1.tar.bz2
82-
b79e0f8a39ba8880d43aa27551b72915655c62af39125e1f4ac8f8e69e71aaca musl-1.1.24_2.tar.bz2
80+
2fbbd3d8e56173aa6950fb2d5be9b1af6b25735ac7ba79e1938fff232a801418 musl-1.1.24_0.tar.bz2
81+
5fe0f457fd577bfbef98d85cc572ce3a30e17c004eeff18a298a6db13126ea61 musl-1.1.24_1.tar.bz2
82+
d58d85c4be26d90f111f273929a4998d05294fe5aa37c4842d5aecaa593e6079 musl-1.1.24_2.tar.bz2
8383
81f79a0faf58e105c5f12d9f538d3ea7578a3b361e633ab8f47324ec23ec9de6 musl-1.2.4_0.tar.bz2
8484
6dc5e763b747b66f72692c6820d7f46b7f4cf2e2fe05229a1d01c03919c1c936 musl-1.2.4_1.tar.bz2
8585
820203286127e7c22cee9f1b3cff664431f10d14c3f22f00b3e771fd849fd449 musl-1.2.4_2.tar.bz2
8686
c490016e49bbf77e7f63071f7aa60e8290a0c67f017846def1c3f65bd10d5712 openssl-1.1.1l_0.tar.bz2
8787
71864d042cdc564b65eab21360902c714e9b43f80a19689c5600589529b267e7 patch-2.7.6_0.tar.bz2
88-
914a7abf36a64723b6e9f9b0b6ccd19c8e544fa798896a2bb1151dc341890c22 perl-5.000_0.tar.bz2
89-
887d835562d471653bcda60e652fceb4b3ef58a83321a4eb5af0431dc182781b perl-5.003_0.tar.bz2
90-
b86fc586d72a6d204d0b9017afe17aa2439529e13f43befc56648b78de17c8f8 perl5.004-05_0.tar.bz2
91-
451ae6bb6e996a1c857fe92ec379654413fadec180c6477cf5fd4b5d7a079e26 perl5.005-03_0.tar.bz2
88+
35dff94213d6b4648ac857daff76817048723acc01a07b428f031be854b0dc63 perl-5.000_0.tar.bz2
89+
ea93a29bd049af498e34ceebed4f1b747aed1713bd2d787e03b65c1031806e71 perl-5.003_0.tar.bz2
90+
a6afef8623ffddd4d50c1688d5c6a03a696e9d06ae903412bf99edb2d6b65a6d perl5.004-05_0.tar.bz2
91+
485c76bec0aa901de0c4cfce00e3e7a203d7342895cce60dbc9162fd8a999e90 perl5.005-03_0.tar.bz2
9292
74d64a8af080022432fa94dba449090419d25b103d247710dc0b6102a4ad86a6 perl-5.10.1_0.tar.bz2
9393
fdccd3ba27a44d2149f159040414a04b39bfc72673ba36f50051b61199cc425c perl-5.32.1_0.tar.bz2
94-
9fa8850897248d77d554caa2b3d52e7890308cbf28750ffc24c09f498aee563c perl-5.6.2_0.tar.bz2
94+
f9e5cd15fa976ba1b3892640bb2f39b35e0cd1147bf98a92d26e3ab1dc6b86f3 perl-5.6.2_0.tar.bz2
9595
1b9d4260edf7b2241d10e4c4ad17d0f90047bd4bf42f2487a7133902529e9dfe pkg-config-0.29.2_0.tar.bz2
9696
1e882c3206f9d1de2a9be8b5c6ae4cc65e80a4de607bd521058577bf4169c0e9 python-2.0.1_0.tar.bz2
9797
aba9710341db75b78c7bc1eb4ef45b9496e23f7a356128af6c2b116ee0f3f31a python-2.0.1_1.tar.bz2
@@ -104,13 +104,13 @@ d497c9b614194b941620bb5c5111fc72eca8cafd7d4f476eacb24fb7f909b614 python-2.3.7_0
104104
60b93253a2078f849f81e7e1ed6233e30702f03b1893640eee95671d814f5514 python-3.3.7_0.tar.bz2
105105
da7c8ec579dd225c0d8bee63d95aeeb27ac2d5a60d4eefe298508cbf86bf506c python-3.4.10_0.tar.bz2
106106
0be505f63205b4bc1b1421896c610468ad1a2194bbc4c9abf58f61685c2023d1 python-3.8.16_0.tar.bz2
107-
6081832f1fc258df7dd927986821991b49fa78a71b76f4b37b5c34a8ebc9bc86 sed-4.0.9_0.tar.bz2
107+
6874e16afb9a0cfa960416f0ce721e81b4cfb48992e827788df0ed1feb47df1d sed-4.0.9_0.tar.bz2
108108
e8daec00b2c2de7b18efbec057dc9290eed06668806c6f5a48914d4a5cd95eb4 sed-4.8_0.tar.bz2
109109
912d8f344104f1322255d6210c7c7e1371413ab530b2c6796e6aa565c74bf647 tar-1.34_0.tar.bz2
110110
d5d0df210248a385ae255cc5651369108e9a71fa8668821a6b1ed30a8d7364a1 tcc-0.9.27_0.tar.bz2
111-
79276f54bc57933b6002e5511e6d8d88e22159dcf1cbbc9da763c38691a2c628 tcc-0.9.27_1.tar.bz2
112-
31b5cbfec69d8037cc7f788c658f6fcd8c88794ecba34a2c5724bf6223b210f5 tcc-0.9.27_2.tar.bz2
113-
2b503cd31d3326ac1ed0eb9f506ac93c93770da51164e152a812cd248961069c tcc-0.9.27_3.tar.bz2
111+
53703e68b3d5597dc05b0982331ad87e437f616165e1a289d429d54773ab02fc tcc-0.9.27_1.tar.bz2
112+
74c26384d3bde54a4d0bac4242559593872f6dcfc5856acbe2c4aea5dd62f941 tcc-0.9.27_2.tar.bz2
113+
0f7e12be49c697a2758a6e1acae736b3bac208eacfeae1e5155d8159f9a30bd2 tcc-0.9.27_3.tar.bz2
114114
50ebaa1d8fcc4a03a43d431eb71e2f435cc8712ae47d400564df3716037d553a texinfo-6.7_0.tar.bz2
115115
229d9189adac10ad2a2c76fc147a4c317fc5b34026cef1c47edc9159aee480da util-linux-2.19.1_0.tar.bz2
116116
ecdb7ffeb9256f6a9760be70969fe5dea9cde6a538cc88595281fe44340e98a1 which-2.21_0.tar.bz2

‎steps/fiwix-1.4.0-lb3/fiwix-1.4.0-lb3.checksums

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎steps/fiwix-1.4.0-lb3/sources

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎steps/fiwix-1.5.0-lb1/files/custom_config.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#undef NR_PROCS
2+
#define NR_PROCS 4096
3+
#undef NR_CALLOUTS
4+
#define NR_CALLOUTS NR_PROCS
5+
#undef NR_OPENS
6+
#define NR_OPENS 1536
7+
#undef NR_FLOCKS
8+
#define NR_FLOCKS (NR_PROCS * 5)
9+
#undef MAX_PID_VALUE
10+
#define MAX_PID_VALUE 16000000
11+
#undef RAMDISK_DRIVES
12+
#define RAMDISK_DRIVES 0
13+
#define CONFIG_SYSCALL_6TH_ARG
14+
#define CONFIG_VM_SPLIT22
15+
#define CONFIG_KEXEC
16+
#undef CONFIG_OFFSET64
17+
#define CONFIG_MMAP2
18+
#define CONFIG_MADVISE_STUB
19+
#define CONFIG_64BIT_SYSCALLS
20+
#undef CONFIG_NET
21+
#define CONFIG_STUB_EXIT_GROUP
22+
#undef CONFIG_PRINTK64

‎steps/fiwix-1.5.0-lb1/files/custom_kernel.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#undef INIT_PROGRAM
2+
#define INIT_PROGRAM "/init"

‎steps/fiwix-1.5.0-lb1/files/custom_limits.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#undef CHILD_MAX
2+
#define CHILD_MAX 4096
3+
#undef OPEN_MAX
4+
#define OPEN_MAX 1536
5+
#undef FD_SETSIZE
6+
#define FD_SETSIZE OPEN_MAX

‎steps/fiwix-1.5.0-lb1/files/custom_system.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#undef UTS_SYSNAME
2+
#define UTS_SYSNAME "Linux"

‎steps/fiwix-1.5.0-lb1/fiwix-1.5.0-lb1.checksums

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5aee0b059f5dddb096779b9fb7d6f5f47b56da750623a0a506f47632d31efac6 /boot/fiwix

‎steps/fiwix-1.4.0-lb3/pass1.kaem renamed to ‎steps/fiwix-1.5.0-lb1/pass1.kaem

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,15 @@ cd build
1818
untar --file ../src/${pkg}.tar
1919
cd ${pkg}
2020

21-
alias as="tcc -m32 -march=i386 -std=c89 -D__KERNEL__ -DMAX_PID_VALUE=64000000 -DCONFIG_MMAP2 -DNO_CONFIG_OFFSET64 -DCONFIG_64BIT_SYSCALLS -DCONFIG_KEXEC -DNR_PROCS=4096 -DCHILD_MAX=4096 -DOPEN_MAX=1536 -DNR_OPENS=1536 -DINIT_PROGRAM=\"/init\" -DUTS_SYSNAME=\"Linux\" -D__VERSION__=\"tcc\" -traditional -I${SRCDIR}/${pkg}/build/${pkg}/include"
21+
cp ../../files/custom_config.h include/fiwix
22+
cp ../../files/custom_limits.h include/fiwix
23+
cp ../../files/custom_kernel.h include/fiwix
24+
cp ../../files/custom_system.h include/fiwix
2225

23-
alias cc="tcc -m32 -march=i386 -std=c89 -D__KERNEL__ -DMAX_PID_VALUE=64000000 -DCONFIG_MMAP2 -DNO_CONFIG_OFFSET64 -DCONFIG_64BIT_SYSCALLS -DCONFIG_KEXEC -DNR_PROCS=4096 -DCHILD_MAX=4096 -DOPEN_MAX=1536 -DNR_OPENS=1536 -DINIT_PROGRAM=\"/init\" -DUTS_SYSNAME=\"Linux\" -D__VERSION__=\"tcc\" -I${SRCDIR}/${pkg}/build/${pkg}/include -O2 -fno-pie -fno-common -ffreestanding -Wall -Wstrict-prototypes"
26+
27+
alias as="tcc -m32 -march=i386 -std=c89 -D__KERNEL__ -DCUSTOM_CONFIG_H -DCUSTOM_LIMITS_H -DCUSTOM_KERNEL_H -DCUSTOM_SYSTEM_H -D__VERSION__=\"tcc\" -traditional -I/${SRCDIR}/${pkg}/build/${pkg}/include"
28+
29+
alias cc="tcc -m32 -march=i386 -std=c89 -D__KERNEL__ -DCUSTOM_CONFIG_H -DCUSTOM_LIMITS_H -DCUSTOM_KERNEL_H -DCUSTOM_SYSTEM_H -D__VERSION__=\"tcc\" -I/${SRCDIR}/${pkg}/build/${pkg}/include -O2 -fno-pie -fno-common -ffreestanding -Wall -Wstrict-prototypes"
2430

2531
cd kernel
2632
as -c -o boot.o boot.S
@@ -59,7 +65,6 @@ cc -c -o fdatasync.o fdatasync.c
5965
cc -c -o chmod.o chmod.c
6066
cc -c -o mmap2.o mmap2.c
6167
cc -c -o msgsnd.o msgsnd.c
62-
cc -c -o madvise.o madvise.c
6368
cc -c -o exit.o exit.c
6469
cc -c -o readlink.o readlink.c
6570
cc -c -o socketcall.o socketcall.c
@@ -132,10 +137,8 @@ cc -c -o pause.o pause.c
132137
cc -c -o utime.o utime.c
133138
cc -c -o statfs.o statfs.c
134139
cc -c -o ioperm.o ioperm.c
135-
cc -c -o exit_group.o exit_group.c
136140
cc -c -o ftime.o ftime.c
137141
cc -c -o truncate.o truncate.c
138-
cc -c -o pipe2.o pipe2.c
139142
cc -c -o old_mmap.o old_mmap.c
140143
cc -c -o olduname.o olduname.c
141144
cc -c -o kill.o kill.c
@@ -164,6 +167,7 @@ cc -c -o nanosleep.o nanosleep.c
164167
cc -c -o close.o close.c
165168
cc -c -o chroot.o chroot.c
166169
cc -c -o ftruncate64.o ftruncate64.c
170+
cc -c -o truncate64.o truncate64.c
167171
cc -c -o msgrcv.o msgrcv.c
168172
cc -c -o umount2.o umount2.c
169173
cc -c -o time.o time.c
@@ -185,6 +189,7 @@ cc -c -o getpgrp.o getpgrp.c
185189
cc -c -o fchown.o fchown.c
186190
cc -c -o execve.o execve.c
187191
cc -c -o shmget.o shmget.c
192+
cc -c -o lchown.o lchown.c
188193
cd ../..
189194

190195
cd mm
@@ -304,7 +309,7 @@ cc -c -o printk.o printk.c
304309
cd ..
305310

306311
mkdir /boot
307-
tcc -m32 -Wl,-Ttext=0xC0100000 -static -nostdlib -nostdinc \
312+
tcc -m32 -Wl,-Ttext=0x80100000 -static -nostdlib -nostdinc \
308313
kernel/boot.o \
309314
kernel/core386.o \
310315
kernel/main.o kernel/init.o \
@@ -338,7 +343,6 @@ tcc -m32 -Wl,-Ttext=0xC0100000 -static -nostdlib -nostdinc \
338343
kernel/syscalls/chmod.o \
339344
kernel/syscalls/mmap2.o \
340345
kernel/syscalls/msgsnd.o \
341-
kernel/syscalls/madvise.o \
342346
kernel/syscalls/exit.o \
343347
kernel/syscalls/readlink.o \
344348
kernel/syscalls/socketcall.o \
@@ -411,10 +415,8 @@ tcc -m32 -Wl,-Ttext=0xC0100000 -static -nostdlib -nostdinc \
411415
kernel/syscalls/utime.o \
412416
kernel/syscalls/statfs.o \
413417
kernel/syscalls/ioperm.o \
414-
kernel/syscalls/exit_group.o \
415418
kernel/syscalls/ftime.o \
416419
kernel/syscalls/truncate.o \
417-
kernel/syscalls/pipe2.o \
418420
kernel/syscalls/old_mmap.o \
419421
kernel/syscalls/olduname.o \
420422
kernel/syscalls/kill.o \
@@ -443,6 +445,7 @@ tcc -m32 -Wl,-Ttext=0xC0100000 -static -nostdlib -nostdinc \
443445
kernel/syscalls/close.o \
444446
kernel/syscalls/chroot.o \
445447
kernel/syscalls/ftruncate64.o \
448+
kernel/syscalls/truncate64.o \
446449
kernel/syscalls/msgrcv.o \
447450
kernel/syscalls/umount2.o \
448451
kernel/syscalls/time.o \
@@ -464,6 +467,7 @@ tcc -m32 -Wl,-Ttext=0xC0100000 -static -nostdlib -nostdinc \
464467
kernel/syscalls/fchown.o \
465468
kernel/syscalls/execve.o \
466469
kernel/syscalls/shmget.o \
470+
kernel/syscalls/lchown.o \
467471
mm/bios_map.o \
468472
mm/buddy_low.o \
469473
mm/memory.o \

‎steps/fiwix-1.5.0-lb1/sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/mikaku/Fiwix/releases/download/v1.5.0-lb1/fiwix-1.5.0-lb1.tar.gz 6635f8b8a44694a374daccd528a8d22550e684d33dc967f7fa2d161b9d69deb4

‎steps/manifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
# Other features:
2727
# - predicate; based on variables set in bootstrap.cfg, require for something to execute
2828
# must be enclosed in brackets with spaces padded
29-
# eg, build: fiwix-1.4.0-lb3 ( BUILD_FIWIX == True )
29+
# eg, build: fiwix-1.5.0-lb1 ( BUILD_FIWIX == True )
3030

3131
build: checksum-transcriber-1.0
3232
build: simple-patch-1.0
3333
build: mes-0.25
3434
build: tcc-0.9.26
3535
build: tcc-0.9.27
3636
define: BUILD_FIWIX = ( KERNEL_BOOTSTRAP == True || BUILD_KERNELS == True )
37-
build: fiwix-1.4.0-lb3 ( BUILD_FIWIX == True )
37+
build: fiwix-1.5.0-lb1 ( BUILD_FIWIX == True )
3838
build: lwext4-1.0.0-lb1 ( BUILD_FIWIX == True )
3939
build: kexec-fiwix-1.0 ( BUILD_FIWIX == True )
4040
jump: fiwix ( KERNEL_BOOTSTRAP == True )

‎steps/musl-1.1.24/patches-pass3/madvise_preserve_errno.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# SPDX-FileCopyrightText: 2023 Richard Masters <[email protected]>
2+
# SPDX-License-Identifier: MIT
3+
diff -r -u musl-1.1.24.orig/src/malloc/malloc.c musl-1.1.24/src/malloc/malloc.c
4+
--- src/malloc/malloc.c 2019-10-13 21:58:27.000000000 +0000
5+
+++ src/malloc/malloc.c 2023-12-22 23:18:21.088570834 +0000
6+
@@ -496,7 +496,9 @@
7+
uintptr_t a = (uintptr_t)self + SIZE_ALIGN+PAGE_SIZE-1 & -PAGE_SIZE;
8+
uintptr_t b = (uintptr_t)next - SIZE_ALIGN & -PAGE_SIZE;
9+
#if 1
10+
+ int e = errno;
11+
__madvise((void *)a, b-a, MADV_DONTNEED);
12+
+ errno = e;
13+
#else
14+
__mmap((void *)a, b-a, PROT_READ|PROT_WRITE,
15+
MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);

‎steps/musl-1.1.24/patches/madvise_preserve_errno.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# SPDX-FileCopyrightText: 2023 Richard Masters <[email protected]>
2+
# SPDX-License-Identifier: MIT
3+
diff -r -u musl-1.1.24.orig/src/malloc/malloc.c musl-1.1.24/src/malloc/malloc.c
4+
--- src/malloc/malloc.c 2019-10-13 21:58:27.000000000 +0000
5+
+++ src/malloc/malloc.c 2023-12-22 23:18:21.088570834 +0000
6+
@@ -496,7 +496,9 @@
7+
uintptr_t a = (uintptr_t)self + SIZE_ALIGN+PAGE_SIZE-1 & -PAGE_SIZE;
8+
uintptr_t b = (uintptr_t)next - SIZE_ALIGN & -PAGE_SIZE;
9+
#if 1
10+
+ int e = errno;
11+
__madvise((void *)a, b-a, MADV_DONTNEED);
12+
+ errno = e;
13+
#else
14+
__mmap((void *)a, b-a, PROT_READ|PROT_WRITE,
15+
MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);

‎steps/tcc-0.9.27/simple-patches/fiwix-paddr.after

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ph->p_paddr = ph->p_vaddr;
2-
if (ph->p_paddr >= 0xC0000000)
3-
ph->p_paddr = ph->p_paddr - 0xC0000000;
2+
if (s1->text_addr == 0x80100000)
3+
ph->p_paddr = ph->p_paddr - 0x80000000;

‎steps/tcc-0.9.27/tcc-0.9.27.checksums

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f81f0cb4d77be9b724f6afcca966811fb347010b21aee6eb39dc2caf9f287e07 /usr/bin/tcc
1+
cff99e8badc080f57f34b31560d266b703b79c5ed8380a9ddfc3f1694aba10bd /usr/bin/tcc

0 commit comments

Comments
 (0)