Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 62f52e8

Browse files
committed
Prepare nodeos-rootfs to be an independent module
1 parent 1171430 commit 62f52e8

File tree

1 file changed

+54
-32
lines changed

1 file changed

+54
-32
lines changed

‎scripts/build

Lines changed: 54 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,20 @@ GRN="\e[32m"
88
CLR="\e[0m"
99

1010

11-
BAREBONES=`pwd`/../nodeos-barebones
12-
INITRAMFS=`pwd`/../nodeos-initramfs
11+
TOOLCHAIN=`node -p "require('nodeos-cross-toolchain')"`
12+
BAREBONES=`node -p "require('nodeos-barebones')"`
13+
INITRAMFS=`node -p "require('nodeos-initramfs')"`
1314

14-
NODE_DIR=$BAREBONES/deps/node
15+
source$TOOLCHAIN/scripts/adjustEnvVars.sh ||exit$?
1516

16-
TOOLCHAIN=`pwd`/../nodeos-cross-toolchain
17-
TOOLS=$TOOLCHAIN/out
17+
PATH=$TOOLCHAIN/bin:$PATH
1818

19-
source $TOOLCHAIN/scripts/adjustEnvVars.sh || exit $?
19+
20+
# Clean object dir and return the input error
21+
function err(){
22+
rmStep $STEP_DIR
23+
exit 1ドル
24+
}
2025

2126

2227
if [[ -d $OBJECTS ]]; then
@@ -25,26 +30,35 @@ if [[ -d $OBJECTS ]]; then
2530
fi
2631

2732

33+
#
34+
# Define steps paths
35+
#
36+
37+
EFIBOOT_DIR=$OBJECTS/efiboot
38+
EFIBOOT_IMG=$EFIBOOT_DIR.img
39+
IMG_DIR=$OBJECTS/img
40+
ISO_DIR=$OBJECTS/iso
41+
OUT_DIR=`pwd`/out/$CPU
42+
43+
2844
#
2945
# SysLinux
3046
#
3147

3248
SRC_DIR=`pwd`/deps/syslinux
33-
OBJ_DIR=`pwd`/obj/efiboot
34-
EFIBOOT_IMG=`pwd`/obj/efiboot.img
3549

3650

3751
#
3852
# Wrap the system up and pack it
3953
#
4054

41-
GENFATFS=../../node_modules/genfatfs/genfatfs
42-
4355
function createPartitionImage() {
56+
STEP_DIR=$IMG_DIR
57+
4458
# Copy kernel and initramfs on the partition image
4559

46-
cp $BAREBONES/out/latest $OBJECTS/kernel.img &&
47-
cp $INITRAMFS/out/latest $OBJECTS/initram.gz || exit 20
60+
cp $BAREBONES/out/latest $STEP_DIR/kernel.img &&
61+
cp $INITRAMFS/out/latest $STEP_DIR/initram.gz || exit 20
4862

4963
# Create partition image
5064

@@ -55,53 +69,57 @@ function createPartitionImage() {
5569
# DISK_SIZE=`du -ks $OBJECTS | cut -f1`
5670
DISK_SIZE=$((16*1024))
5771

58-
$GENFATFS -b $DISK_SIZE \
59-
--root $OBJECTS \
60-
$OUT_DIR || exit 21
72+
genfatfs -b $DISK_SIZE \
73+
--root $STEP_DIR \
74+
$OUT_DIR || exit 21
6175
}
6276

6377
function createEfiImage() {
64-
rm -rf $OBJ_DIR &&
65-
mkdir -p $OBJ_DIR || exit 30
78+
STEP_DIR=$EFIBOOT_DIR
79+
80+
rm -rf $STEP_DIR &&
81+
mkdir -p $STEP_DIR || exit 30
6682

67-
cp syslinux.cfg $OBJ_DIR || exit 31
83+
cp syslinux.cfg $STEP_DIR || exit 31
6884

6985
# Copy kernel and initramfs on the ISO image
7086

71-
cp $BAREBONES/out/latest $OBJ_DIR/kernel.img &&
72-
cp $INITRAMFS/out/latest $OBJ_DIR/initram.gz || exit 32
87+
cp $BAREBONES/out/latest $STEP_DIR/kernel.img &&
88+
cp $INITRAMFS/out/latest $STEP_DIR/initram.gz || exit 32
7389

7490
# Copy SysLinux files
7591

7692
cp $SRC_DIR/efi$BITS/efi/syslinux.efi \
7793
$SRC_DIR/efi$BITS/com32/elflink/ldlinux/ldlinux.e$BITS \
78-
$OBJ_DIR || exit 33
94+
$STEP_DIR || exit 33
7995

8096
# Create EFI disk image
8197

8298
# DISK_SIZE=`du -ks $OBJECTS | cut -f1`
8399
DISK_SIZE=$((16*1024))
84100

85-
$GENFATFS -b $DISK_SIZE \
86-
--root $OBJ_DIR \
87-
$EFIBOOT_IMG || exit 34
101+
genfatfs -b $DISK_SIZE \
102+
--root $STEP_DIR \
103+
$EFIBOOT_IMG || exit 34
88104
}
89105

90106
function createIsoImage() {
107+
STEP_DIR=$ISO_DIR
108+
91109
# Create EFI boot image
92-
createEfiImage || exit $?
93-
cp $EFIBOOT_IMG $OBJECTS || exit 40
110+
createEfiImage || exit $?
111+
cp $EFIBOOT_IMG $STEP_DIR || exit 40
94112

95113
# Copy kernel and initramfs on the ISO image
96114

97-
cp $BAREBONES/out/latest $OBJECTS/kernel.img &&
98-
cp $INITRAMFS/out/latest $OBJECTS/initram.gz || exit 41
115+
cp $BAREBONES/out/latest $STEP_DIR/kernel.img &&
116+
cp $INITRAMFS/out/latest $STEP_DIR/initram.gz || exit 41
99117

100118
# Copy IsoLinux files
101119

102120
cp $SRC_DIR/bios/core/isolinux.bin \
103121
$SRC_DIR/bios/com32/elflink/ldlinux/ldlinux.c32 \
104-
$OBJECTS || exit 42
122+
$STEP_DIR || exit 42
105123

106124
# Create ISO image
107125

@@ -120,7 +138,7 @@ function createIsoImage() {
120138
-eltorito-alt-boot \
121139
-efi-boot efiboot.img \
122140
-no-emul-boot \
123-
$OBJECTS || exit 43
141+
$STEP_DIR || exit 43
124142

125143
$SRC_DIR/bios/utils/isohybrid $OUT_DIR || exit 44
126144
}
@@ -135,15 +153,19 @@ case $PLATFORM in
135153
;;
136154

137155
pc_iso)
138-
mkdir -p $OBJECTS &&
139-
cp syslinux.cfg $OBJECTS || exit 52
156+
STEP_DIR=$ISO_DIR
157+
158+
mkdir -p $STEP_DIR &&
159+
cp syslinux.cfg $STEP_DIR || exit 52
140160

141161
createIsoImage || exit $?
142162

143163
ln -sf $CPU/iso out/latest || exit 53
144164
;;
145165

146166
raspberry_image)
167+
STEP_DIR=$IMG_DIR
168+
147169
# Copy Raspberry PI extra files
148170
# http://elinux.org/RPi_Advanced_Setup#Setting_up_the_boot_partition
149171
#

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /