Revert "Merge pull request #483 from rocket-pool/dev_v2"

This reverts commit c9b391e, reversing
changes made to d1e38af.

Author: jclapis

.gitignore

@@ -33,5 +33,5 @@ pkg
 .vscode-ctags
 
 # Binaries
-v2/rocketpool-cli/rocketpool-cli
-v2/rocketpool-daemon/rocketpool-daemon
+src/rocketpool-cli/rocketpool-cli
+src/rocketpool-daemon/rocketpool-daemon

docker/cli.dockerfile

@@ -2,7 +2,7 @@
 FROM golang:1.21-bookworm AS builder
 COPY . /rocketpool
 ENV CGO_ENABLED=0
-WORKDIR /rocketpool/v2/rocketpool-cli
+WORKDIR /rocketpool/src/rocketpool-cli
 
 # Build x64 version
 RUN GOOS=linux GOARCH=amd64 go build -o /build/rocketpool-cli-linux-amd64

docker/daemon-build.dockerfile

@@ -5,14 +5,14 @@ COPY . /rocketpool
 ENV CGO_ENABLED=1
 ENV CGO_CFLAGS="-O -D__BLST_PORTABLE__"
 RUN if [ "$BUILDPLATFORM" = "linux/amd64" -a "$TARGETARCH" = "arm64" ]; then \
-    # Install the GCC cross compiler
-    apt update && apt install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && \
-    export CC=aarch64-linux-gnu-gcc && export CC_FOR_TARGET=gcc-aarch64-linux-gnu; \
+        # Install the GCC cross compiler
+        apt update && apt install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && \
+        export CC=aarch64-linux-gnu-gcc && export CC_FOR_TARGET=gcc-aarch64-linux-gnu; \
     elif [ "$BUILDPLATFORM" = "linux/arm64" -a "$TARGETARCH" = "amd64" ]; then \
-    apt update && apt install -y gcc-x86-64-linux-gnu g++-x86-64-linux-gnu && \
-    export CC=x86_64-linux-gnu-gcc && export CC_FOR_TARGET=gcc-x86-64-linux-gnu; \
+        apt update && apt install -y gcc-x86-64-linux-gnu g++-x86-64-linux-gnu && \
+        export CC=x86_64-linux-gnu-gcc && export CC_FOR_TARGET=gcc-x86-64-linux-gnu; \
     fi && \
-    cd /rocketpool/v2/rocketpool-daemon && \
+    cd /rocketpool/src/rocketpool-daemon && \
     GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /build/rocketpool-daemon
 
 # Copy the output

install/packages/debian/package.dockerfile

@@ -5,17 +5,17 @@ ARG BUILDPLATFORM
 # Debian packages need a very particular folder structure, so we're basically converting the repo structure into what it wants here 
 COPY ./install/packages/debian/debian /rocketpool/debian/debian
 COPY ./install/deploy /rocketpool/debian/deploy
-COPY ./v2/ /rocketpool/debian/
+COPY ./src/ /rocketpool/debian/
 WORKDIR /rocketpool/debian
 
 # Build the native arch package and source package
 RUN DEB_BUILD_OPTIONS=noautodbgsym debuild -us -uc
 
 # Build the other package (binary only since we already made the source)
 RUN if [ "$BUILDPLATFORM" = "linux/arm64" ]; then \
-    REMOTE_ARCH=amd64; \
+        REMOTE_ARCH=amd64; \
     else \
-    REMOTE_ARCH=arm64; \
+        REMOTE_ARCH=arm64; \
     fi && \
     DEB_BUILD_OPTIONS=noautodbgsym debuild -us -uc -b -a${REMOTE_ARCH} --no-check-builddeps