Skip to content

Commit d3ed424

Browse files
committed
refactor(tool): Prelimiary refactor to support go compilation
* Only pass source path to compile_and_install * Remove unneeded output directory creation Signed-off-by: Takahiro Itazuri <[email protected]>
1 parent 8ac6d29 commit d3ed424

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

resources/rebuild.sh

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@ function prepare_docker {
4040
}
4141

4242
function compile_and_install {
43-
local C_FILE=$1
44-
local BIN_FILE=$2
45-
local OUTPUT_DIR=$(dirname $BIN_FILE)
46-
mkdir -pv $OUTPUT_DIR
47-
gcc -Wall -o $BIN_FILE $C_FILE
43+
local SRC=$1
44+
local BIN="${SRC%.*}"
45+
gcc -Wall -o $BIN $SRC
4846
}
4947

5048
# Build a rootfs
@@ -190,22 +188,23 @@ function build_al_kernel {
190188
}
191189

192190
function prepare_and_build_rootfs {
193-
BIN=overlay/usr/local/bin
191+
BIN_DIR=overlay/usr/local/bin
194192

195-
tools=(init fillmem fast_page_fault_helper readmem)
193+
SRCS=(init.c fillmem.c fast_page_fault_helper.c readmem.c)
196194
if [ $ARCH == "aarch64" ]; then
197-
tools+=(devmemread)
195+
SRCS+=(devmemread.c)
198196
fi
199197

200-
for tool in ${tools[@]}; do
201-
compile_and_install $BIN/$tool.c $BIN/$tool
198+
for SRC in ${SRCS[@]}; do
199+
compile_and_install $BIN_DIR/$SRC
202200
done
203201

204202
build_rootfs ubuntu-24.04 noble
205203
build_initramfs
206204

207-
for tool in ${tools[@]}; do
208-
rm $BIN/$tool
205+
for SRC in ${SRCS[@]}; do
206+
BIN="${SRC%.*}"
207+
rm $BIN_DIR/$BIN
209208
done
210209
}
211210

0 commit comments

Comments
 (0)