Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Commit

Permalink
Merge pull request #108 from fbelavenuto/dev
Browse files Browse the repository at this point in the history
Fix bugs into MAC-related stuff, organizing modules
  • Loading branch information
fbelavenuto authored Aug 17, 2022
2 parents 178956c + a9d4085 commit 9c680d5
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV SHELL=/bin/bash \

RUN apt update --yes && \
apt install --yes --no-install-recommends --no-install-suggests \
ca-certificates nano curl bc kmod git \
ca-certificates nano curl bc kmod git gettext texinfo autopoint \
build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion files/board/arpl/overlayfs/opt/arpl/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
# Initialize with real MAC
writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"
writeConfigKey "cmdline.netif_num" "1" "${USER_CONFIG_FILE}"
writeConfigKey "cmdline.mac1" "${MACF}" "${USER_CONFIG_FILE}"
fi
writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"

# Set custom MAC if defined
MAC1=`readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"`
Expand Down
2 changes: 1 addition & 1 deletion files/board/arpl/overlayfs/opt/arpl/menu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ function cmdlineMenu() {
dialog --backtitle "`backtitle`" --title "User cmdline" \
--inputbox "Type a custom MAC address" 0 0 "${CMDLINE['mac1']}"\
2>${TMP_PATH}/resp
[ $? -ne 0 ] && continue
[ $? -ne 0 ] && break
MAC="`<"${TMP_PATH}/resp"`"
[ -z "${MAC}" ] && MAC="`readConfigKey "original-mac" "${USER_CONFIG_FILE}"`"
MAC1="`echo "${MAC}" | sed 's/://g'`"
Expand Down
Binary file added files/board/arpl/p3/addons/dbgutils/all.tgz
Binary file not shown.
14 changes: 14 additions & 0 deletions files/board/arpl/p3/addons/dbgutils/manifest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 1
name: dbgutils
description: "Binaries to facilitate debug in the junior mode"
all:
install-script: "install.sh"
copy: "all"
available-for:
bromolow-3.10.108:
apollolake-4.4.180:
broadwell-4.4.180:
broadwellnk-4.4.180:
denverton-4.4.180:
geminilake-4.4.180:
v1000-4.4.180:
Binary file modified files/board/arpl/p3/addons/maxdisks/all.tgz
Binary file not shown.
Binary file modified files/board/arpl/p3/modules/apollolake-4.4.180.tgz
Binary file not shown.
Binary file modified files/board/arpl/p3/modules/broadwell-4.4.180.tgz
Binary file not shown.
Binary file modified files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz
Binary file not shown.
Binary file modified files/board/arpl/p3/modules/bromolow-3.10.108.tgz
Binary file not shown.
Binary file modified files/board/arpl/p3/modules/denverton-4.4.180.tgz
Binary file not shown.
Binary file modified files/board/arpl/p3/modules/geminilake-4.4.180.tgz
Binary file not shown.
Binary file modified files/board/arpl/p3/modules/v1000-4.4.180.tgz
Binary file not shown.

0 comments on commit 9c680d5

Please sign in to comment.