Skip to content

Commit 953ddf5

Browse files
committed
Function to call make and share env
1 parent 51acc82 commit 953ddf5

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

scripts/build-linux-deb.sh

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,19 @@ get_kernel() {
6969
git clone --depth=1 --branch "${GIT_BRANCH}" "${GIT_REPO}" "${WORK_DIR}"
7070
}
7171

72+
# set some common make args
73+
do_make() {
74+
make -C "${WORK_DIR}" \
75+
ARCH=arm64 \
76+
CROSS_COMPILE=aarch64-linux-gnu- \
77+
DEB_HOST_ARCH=arm64 \
78+
KDEB_SOURCENAME="linux-${FLAVOR}" \
79+
"$@"
80+
}
81+
7282
configure_kernel() {
83+
export LOCALVERSION="-${FLAVOR}"
84+
7385
rm -vf "${WORK_DIR}/kernel/configs/local.config"
7486
for fragment in "$@"; do
7587
log_i "Adding config fragment to local.config: ${fragment}"
@@ -78,22 +90,14 @@ configure_kernel() {
7890
done
7991

8092
if [ -r "${WORK_DIR}/kernel/configs/local.config" ]; then
81-
make -C "${WORK_DIR}" ARCH=arm64 "${CONFIG}" local.config
93+
do_make "${CONFIG}" local.config
8294
else
83-
make -C "${WORK_DIR}" ARCH=arm64 "${CONFIG}"
95+
do_make "${CONFIG}"
8496
fi
8597
}
8698

8799
build_kernel() {
88-
# DEBUG
89-
sed -i '2i set -x' scripts/setlocalversion
90-
LOCALVERSION="-${FLAVOR}" \
91-
make -C "${WORK_DIR}" "-j$(nproc)" \
92-
ARCH=arm64 \
93-
CROSS_COMPILE=aarch64-linux-gnu- \
94-
DEB_HOST_ARCH=arm64 \
95-
KDEB_SOURCENAME="linux-${FLAVOR}" \
96-
deb-pkg
100+
do_make "-j$(nproc)" deb-pkg
97101
}
98102

99103
log_i "Checking build-dependencies"

0 commit comments

Comments
 (0)