Skip to content

Commit

Permalink
[+] Merge conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
alienatedsec committed Jan 31, 2024
2 parents afb3f0c + e17aee7 commit bd032dd
Show file tree
Hide file tree
Showing 52 changed files with 1,638 additions and 300 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
path = src/uClibc/uClibc
url = https://github.com/kraj/uClibc.git
ignore = dirty
[submodule "src/busybox/busybox"]
path = src/busybox/busybox
url = https://github.com/mirror/busybox.git
ignore = dirty
[submodule "src/proxychains-ng/proxychains-ng"]
path = src/proxychains-ng/proxychains-ng
url = https://github.com/rofl0r/proxychains-ng.git
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.0
0.4.1d
15 changes: 14 additions & 1 deletion scripts/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ compile_module()
printf "MOD_COMPILE: %s\n" "$MOD_COMPILE"
printf "MOD_INSTALL: %s\n" "$MOD_INSTALL"

echo "Compile $MOD_NAME"
cd "$MOD_DIR"

if [ ! -f $MOD_INIT ]; then
Expand Down Expand Up @@ -89,10 +90,22 @@ mkdir -p "$(get_script_dir)/../build/home"
mkdir -p "$(get_script_dir)/../build/rootfs"

SRC_DIR=$(get_script_dir)/../src
SELECTED_MODULE=$1
if [ -n ${SELECTED_MODULE} ]; then
echo "SELECTED_MODULE: $SELECTED_MODULE"
fi

for SUB_DIR in $SRC_DIR/* ; do
if [ -d ${SUB_DIR} ]; then # Will not run if no directories are available
compile_module $(normalize_path "$SUB_DIR") || exit 1
if [ -n ${SELECTED_MODULE} ]; then
if [[ $SUB_DIR == *"$SELECTED_MODULE"* ]]; then
compile_module $(normalize_path "$SUB_DIR") || exit 1
else
echo "Skip $SUB_DIR"
fi
else
compile_module $(normalize_path "$SUB_DIR") || exit 1
fi
fi
done

Expand Down
4 changes: 2 additions & 2 deletions scripts/pack_fw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,11 @@ printf "done!\n\n"

# home
# Disabled after 0.3.8
#pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR
pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR

# rootfs
# Disabled after 0.3.8
#pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR
pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR

# pack files for release
pack_files $WORK_DIR $CAMERA_NAME $VERSION_ID
Expand Down

0 comments on commit bd032dd

Please sign in to comment.