Skip to content

Commit

Permalink
Merge pull request #128 from fbelavenuto/dev2
Browse files Browse the repository at this point in the history
new dbgutils(nano,smartctl)
  • Loading branch information
fbelavenuto committed Aug 23, 2022
2 parents c6ec3a7 + fefd524 commit b939fe5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
A fazer
- Checar se tem como atualizar microcode via addon/modules/whatever...
- Estudar acrescentar modo simples e avançado do menu
- Adicionar mais bnários para o addon dbgutils (nano, trace, etc)
- Retirar o ttyd da memória quando o root do dsm dar boot

Concluidos:
- Generalizar código dos addons
Expand Down Expand Up @@ -31,3 +29,5 @@ Concluidos:
- Mudar synoinfo para ler do modelo e preencher no user_config, para usuário poder deletar entradas do modelo
- Validar netif_num e macX
- Descobrir como é o serial do DS2422+
- Retirar o ttyd da memória quando o root do dsm dar boot
- Adicionar mais binários para o addon dbgutils (nano, strace, etc)
7 changes: 5 additions & 2 deletions docker/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,18 @@ ENV SHELL=/bin/bash \

RUN apt update --yes && \
apt install --yes --no-install-recommends --no-install-suggests \
ca-certificates nano curl bc kmod git gettext texinfo autopoint \
ca-certificates nano curl bc kmod git gettext texinfo autopoint gawk sudo \
build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/* && \
useradd --home-dir /input --no-create-home --shell /bin/bash --uid 1000 arpl && \
echo "arpl ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/arpl

COPY --from=stage /opt /opt
COPY files/ /

WORKDIR /input
VOLUME /input /output
USER arpl

ENTRYPOINT ["/opt/do.sh"]
3 changes: 3 additions & 0 deletions docker/files/opt/do.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ function export-vars() {
export LDFLAGS="-I/opt/${1}/lib"
export LD_LIBRARY_PATH="/opt/${1}/lib"
export ARCH=x86_64
export PATH="/opt/${1}/bin:${PATH}"
export CC="x86_64-pc-linux-gnu-gcc"
export LD="x86_64-pc-linux-gnu-ld"
}

###############################################################################
Expand Down
Binary file modified files/board/arpl/p3/addons/dbgutils/all.tgz
Binary file not shown.

0 comments on commit b939fe5

Please sign in to comment.