Skip to content

Commit dcf2a6e

Browse files
AKuHAKAKuHAK
committed
Add EXT2 partition formatting support and update shell commands
1 parent 8192de3 commit dcf2a6e

7 files changed

Lines changed: 672 additions & 6 deletions

File tree

‎.github/workflows/check_ext2.yml‎

Lines changed: 295 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,295 @@
1+
name: Continuous Integration
2+
on:
3+
push:
4+
paths:
5+
- "**.c"
6+
- "**.h"
7+
- "**.cpp"
8+
- "**.hpp"
9+
- "**.build"
10+
- "**.in"
11+
- "**.yml"
12+
pull_request:
13+
paths:
14+
- "**.c"
15+
- "**.h"
16+
- "**.cpp"
17+
- "**.hpp"
18+
- "**.build"
19+
- "**.in"
20+
- "**.yml"
21+
env:
22+
CMAKE_GENERATOR: Ninja
23+
HOMEBREW_NO_ANALYTICS: "1"
24+
HOMEBREW_NO_AUTO_UPDATE: "1"
25+
HOMEBREW_NO_INSTALL_UPGRADE: "1"
26+
HOMEBREW_NO_INSTALL_CLEANUP: "1"
27+
DEBIAN_FRONTEND: noninteractive
28+
TZ: Japan
29+
jobs:
30+
build-ubuntu:
31+
runs-on: ubuntu-latest
32+
timeout-minutes: 20
33+
container:
34+
image: ubuntu:20.04
35+
options: --user 0
36+
steps:
37+
- name: Install build dependancies
38+
run: |
39+
apt-get -y update
40+
apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' install build-essential expect pkg-config fuse libfuse-dev git time p7zip-full e2fsprogs python3
41+
42+
- uses: actions/checkout@v6
43+
with:
44+
submodules: recursive
45+
46+
- uses: actions/setup-python@v3
47+
with:
48+
python-version: 3.13.3
49+
50+
- uses: actions/cache@v3
51+
with:
52+
path: ~/.cache/pip
53+
key: ${{ runner.os }}-pip
54+
restore-keys: ${{ runner.os }}-pip
55+
56+
- run: python -m pip install --upgrade meson ninja
57+
58+
- name: Build pfsshell
59+
run: |
60+
meson setup build/ -Denable_pfs2tar=true
61+
meson compile -C build
62+
63+
- name: Run Test
64+
run: |
65+
cd test
66+
# Запускаем Tcl скрипт (который теперь создает EXT2 раздел)
67+
time ./pfsshell_test.tcl
68+
69+
- name: Verify EXT2 partition validity
70+
run: |
71+
# Этот скрипт ищет раздел EXT2 в образе и проверяет его целостность
72+
cd test
73+
python3 -c "
74+
import sys, struct
75+
76+
MAGIC = b'\x53\xEF' # 0xEF53 little endian
77+
SB_OFFSET = 1024
78+
MAGIC_OFFSET = 56
79+
IMG_FILE = 'test.img'
80+
OUT_FILE = 'ext2_dump.img'
81+
82+
print(f'Scanning {IMG_FILE} for EXT2 magic signature...')
83+
84+
with open(IMG_FILE, 'rb') as f:
85+
# APA разделы обычно выровнены. Сканируем с шагом 1MB для скорости.
86+
while True:
87+
pos = f.tell()
88+
# Проверяем сигнатуру
89+
f.seek(pos + SB_OFFSET + MAGIC_OFFSET)
90+
magic = f.read(2)
91+
92+
if magic == MAGIC:
93+
print(f'FOUND EXT2 signature at partition offset {pos}')
94+
# Извлекаем 128MB (размер, который мы задали в тесте)
95+
f.seek(pos)
96+
data = f.read(128 * 1024 * 1024)
97+
with open(OUT_FILE, 'wb') as out:
98+
out.write(data)
99+
print(f'Dumped partition to {OUT_FILE}')
100+
sys.exit(0)
101+
102+
# Переходим к следующему блоку (ищем дальше)
103+
f.seek(pos + 1024*1024)
104+
# Проверка конца файла
105+
if not f.read(1):
106+
break
107+
108+
print('EXT2 partition NOT found!')
109+
sys.exit(1)
110+
"
111+
112+
echo "Running e2fsck on extracted partition..."
113+
# Запускаем проверку файловой системы (-f force, -n no changes/readonly)
114+
/sbin/e2fsck -f -n ext2_dump.img
115+
if [ $? -eq 0 ]; then
116+
echo "EXT2 Filesystem is VALID."
117+
else
118+
echo "EXT2 Filesystem is CORRUPT."
119+
exit 1
120+
fi
121+
122+
- uses: actions/upload-artifact@v4
123+
with:
124+
name: pfsshell-ubuntu
125+
path: |
126+
build/pfsshell
127+
build/pfs2tar
128+
129+
- name: Build pfsfuse
130+
run: |
131+
rm -rf build/
132+
meson setup build/ -Denable_pfsfuse=true
133+
meson compile -C build
134+
135+
- uses: actions/upload-artifact@v4
136+
with:
137+
name: pfsfuse-ubuntu
138+
path: build/pfsfuse
139+
140+
# ... (Остальные jobs: build-win32, build-macos и т.д. остаются без изменений) ...
141+
build-win32:
142+
runs-on: ubuntu-latest
143+
timeout-minutes: 20
144+
container:
145+
image: ubuntu:20.04
146+
options: --user 0
147+
steps:
148+
- run: |
149+
apt-get -y update
150+
apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' install build-essential mingw-w64 git p7zip-full
151+
update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
152+
update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
153+
- uses: actions/checkout@v6
154+
with:
155+
submodules: recursive
156+
- uses: actions/setup-python@v3
157+
with:
158+
python-version: 3.13.3
159+
- uses: actions/cache@v3
160+
with:
161+
path: ~/.cache/pip
162+
key: ${{ runner.os }}-pip
163+
restore-keys: ${{ runner.os }}-pip
164+
- run: python -m pip install --upgrade meson ninja
165+
- run: |
166+
meson setup build/ -Denable_pfs2tar=true --cross-file ./external/meson_toolchains/mingw32_meson.ini
167+
meson compile -C build archive
168+
- uses: actions/upload-artifact@v4
169+
with:
170+
name: pfsshell-win32
171+
path: build/*.7z
172+
173+
build-pfsfuse-win32:
174+
runs-on: windows-latest
175+
timeout-minutes: 20
176+
defaults:
177+
run:
178+
shell: msys2 {0}
179+
steps:
180+
- name: Install MSYS2 packages
181+
uses: msys2/setup-msys2@v2
182+
with:
183+
msystem: MINGW32
184+
install: base-devel git make texinfo patch binutils mpc-devel p7zip mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-make mingw-w64-i686-meson
185+
update: true
186+
shell: msys2 {0}
187+
- uses: actions/checkout@v6
188+
with:
189+
submodules: recursive
190+
- name: Enable git symlinks
191+
run: |
192+
git config core.symlinks true
193+
git reset --hard
194+
- name: Build pfsfuse
195+
run: |
196+
meson setup build/ -Denable_pfsfuse=true
197+
meson compile -C build
198+
cp -f external/dokany/license.lgpl.txt build/
199+
- uses: actions/upload-artifact@v4
200+
with:
201+
name: pfsfuse-win32
202+
path: |
203+
build/pfsfuse.exe
204+
build/libdokanfuse*.dll
205+
build/license.lgpl.txt
206+
207+
build-macos:
208+
runs-on: macos-latest
209+
timeout-minutes: 20
210+
steps:
211+
- uses: actions/checkout@v6
212+
with:
213+
submodules: recursive
214+
- uses: actions/setup-python@v3
215+
with:
216+
python-version: 3.x
217+
- uses: actions/cache@v3
218+
with:
219+
path: ~/.cache/pip
220+
key: ${{ runner.os }}-pip
221+
restore-keys: ${{ runner.os }}-pip
222+
- run: python -m pip install --upgrade meson ninja
223+
- run: brew install macfuse coreutils
224+
- run: |
225+
meson setup build/ -Denable_pfs2tar=true
226+
meson compile -C build
227+
- name: Run Test
228+
run: |
229+
cd test
230+
time ./pfsshell_test.tcl
231+
- uses: actions/upload-artifact@v4
232+
with:
233+
name: pfsshell-macos
234+
path: |
235+
build/pfsshell
236+
build/pfs2tar
237+
- run: |
238+
rm -rf build/
239+
meson setup build/ -Denable_pfsfuse=true
240+
meson compile -C build
241+
- uses: actions/upload-artifact@v4
242+
with:
243+
name: pfsfuse-macos
244+
path: build/pfsfuse
245+
246+
create-release:
247+
needs: [build-ubuntu, build-win32, build-macos, build-pfsfuse-win32]
248+
runs-on: ubuntu-latest
249+
timeout-minutes: 20
250+
container:
251+
image: ubuntu:20.04
252+
options: --user 0
253+
if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master'
254+
steps:
255+
- name: Download all artifact
256+
uses: actions/download-artifact@v4
257+
- name: Install build dependancies
258+
run: |
259+
apt-get -y update
260+
apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' install p7zip-full
261+
- name: Prepare artifacts for release
262+
run: |
263+
7z a -tzip pfsshell-ubuntu.zip pfsshell-ubuntu/*
264+
7z a -tzip pfsshell-macos.zip pfsshell-macos/*
265+
7z a -tzip pfsfuse-ubuntu.zip pfsfuse-ubuntu/*
266+
7z a -tzip pfsfuse-macos.zip pfsfuse-macos/*
267+
7z a -tzip pfsfuse-win32.zip pfsfuse-win32/*
268+
- name: Create prerelease
269+
if: github.ref == 'refs/heads/master'
270+
uses: marvinpinto/action-automatic-releases@latest
271+
with:
272+
repo_token: ${{ secrets.GITHUB_TOKEN }}
273+
prerelease: true
274+
automatic_release_tag: latest
275+
title: Latest development builds
276+
files: |
277+
pfsshell-win32/*
278+
pfsfuse-win32.zip
279+
pfsshell-ubuntu.zip
280+
pfsshell-macos.zip
281+
pfsfuse-ubuntu.zip
282+
pfsfuse-macos.zip
283+
- name: Create release
284+
if: startsWith(github.ref, 'refs/tags/v')
285+
uses: marvinpinto/action-automatic-releases@latest
286+
with:
287+
repo_token: ${{ secrets.GITHUB_TOKEN }}
288+
prerelease: ${{ contains(github.ref, '-rc') }}
289+
files: |
290+
pfsshell-win32/*
291+
pfsfuse-win32.zip
292+
pfsshell-ubuntu.zip
293+
pfsshell-macos.zip
294+
pfsfuse-ubuntu.zip
295+
pfsfuse-macos.zip

‎meson.build‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ libhdlfs_dep = libhdlfs_proj.get_variable('libhdlfs_dep')
2323
pfsshell_src = [
2424
'src/startup.c',
2525
'src/hl.c',
26+
'src/mkext2.c',
2627
'src/host_adapter.c',
2728
'src/util.c',
2829
'src/shell.c',

‎src/hl.c‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#endif
99

1010
#include "iomanX_port.h"
11+
#include "mkext2.h"
1112

1213

1314
/* copy file, host to PFS */
@@ -289,8 +290,13 @@ int mkpfs(const char *mount_point)
289290
(void *)&format_arg, sizeof(format_arg)));
290291
}
291292

293+
/* create EXT2 onto an existing partition */
294+
int mkext2(const char *mount_point)
295+
{
296+
return format_ext2_partition(mount_point);
297+
}
292298

293-
/* create partition of any type and format it as PFS if type=0x0100 */
299+
/* create partition of any type and format it as PFS if type=0x0100 or EXT2 if type=0x0083 */
294300
int mkpart(const char *mount_point, long size_in_mb, int format)
295301
{
296302
char tmp[256];
@@ -302,8 +308,10 @@ int mkpart(const char *mount_point, long size_in_mb, int format)
302308
if (result >= 0) {
303309
iomanX_close(result), result = 0;
304310

305-
if (format)
311+
if (format == 0x0100) // PFS
306312
result = mkpfs(mount_point);
313+
else if (format == 0x0083) // EXT2
314+
result = mkext2(mount_point);
307315
}
308316
return (result);
309317
}

‎src/hl.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ int lspart(int lsmode);
1616
/* create PFS onto an existing partition */
1717
int mkpfs(const char *mount_point);
1818

19-
/* create partition of any type and format it as PFS if type=0x0100;
19+
/* create EXT2 onto an existing partition */
20+
int mkext2(const char *mount_point);
21+
22+
/* create partition of any type and format it as PFS if type=0x0100; or if type EXT2
2023
* so far the only sizes supported are powers of 2 */
2124
int mkpart(const char *mount_point, long size_in_mb, int format);
2225

0 commit comments

Comments
 (0)