Skip to content

Commit 7a7425a

Browse files
some edits
- no need to chmod with running with bash - ADDITIONAL_CONF to layout install ( false: cause i need to get layout)
1 parent 6effcb2 commit 7a7425a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

core/default/mate/build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ BUILDNAME="mate"
77
ROOT_DIR="$(git rev-parse --show-toplevel)"
88
BUILD_CONFIG_DIR="$ROOT_DIR/core/default"
99
INCLUDE_LIST="$BUILD_CONFIG_DIR/$BUILDNAME/include.list"
10+
EXTRA_INCLUDE_LIST="$BUILD_CONFIG_DIR/$BUILDNAME/include-i.list"
1011
EXTRA_CONFIG_SCRIPT="$BUILD_CONFIG_DIR/$BUILDNAME/extra-config.sh"
1112
OUT_DIR="${ROOT_DIR}/out/${BUILDNAME}"
1213
BUILD_ARCH="aarch64 armhf amd64"
1314
PLUGIN_DIR="${ROOT_DIR}/plugins"
1415
INCLUDE_PACKAGES="$(cat "$INCLUDE_LIST")"
16+
ADDITIONAL_CONF=false
1517
#shellcheck disable=SC2034
1618
ENABLE_EXIT=true
1719
#shellcheck disable=SC2034
@@ -41,8 +43,8 @@ function second_stage()
4143
if [ -f "$EXTRA_CONFIG_SCRIPT" ]; then
4244
echo -e "${GREEN}Stage 2: Running extra config script${NC}"
4345
$SUDO cp "$EXTRA_CONFIG_SCRIPT" "${OUT_DIR}-${_arch}/root"
44-
$SUDO chmod +x "${OUT_DIR}-${_arch}/root/$EXTRA_CONFIG_SCRIPT"
45-
do_chroot_ae "${OUT_DIR}-${_arch}" /bin/bash -c "cd /root && /bin/bash ./extra-config.sh"
46+
$SUDO cp "$EXTRA_INCLUDE_LIST" "${OUT_DIR}-${_arch}/root"
47+
do_chroot_ae "${OUT_DIR}-${_arch}" /bin/bash -c "/root/extra-config.sh"
4648
else
4749
lwarn "No extra config script found"
4850
fi

0 commit comments

Comments
 (0)