container: Correct and test verible installation

target/snitch_cluster/Makefile

@@ -167,6 +167,7 @@ $(GENERATED_DIR):
 
 $(GENERATED_DIR)/snitch_cluster_wrapper.sv: ${CFG} ${CLUSTER_GEN_PREREQ} | $(GENERATED_DIR)
 	$(CLUSTER_GEN) -c $< -o $(GENERATED_DIR) --wrapper
+	$(VERIBLE_FMT) --inplace $@
 
 $(GENERATED_DIR)/link.ld: ${CFG} ${CLUSTER_GEN_PREREQ} | $(GENERATED_DIR)
 	$(CLUSTER_GEN) -c $< -o $(GENERATED_DIR) --linker
@@ -179,9 +180,11 @@ $(GENERATED_DIR)/bootdata.cc: ${CFG} ${CLUSTER_GEN_PREREQ} | $(GENERATED_DIR)
 
 # REGGEN regfile
 $(PERIPH_DIR)/snitch_cluster_peripheral_reg_pkg.sv: $(PERIPH_DIR)/snitch_cluster_peripheral_reg_top.sv
+	$(VERIBLE_FMT) --inplace $@
 $(PERIPH_DIR)/snitch_cluster_peripheral_reg_top.sv: $(PERIPH_DIR)/snitch_cluster_peripheral_reg.hjson
 	@echo "[REGGEN] Generating peripheral regfile"
 	$(REGGEN) -r -t $(PERIPH_DIR) $<
+	$(VERIBLE_FMT) --inplace $@
 
 #############
 # Verilator #

util/container/Dockerfile

@@ -49,8 +49,8 @@ RUN wget https://github.com/pulp-platform/bender/releases/download/v${BENDER_VER
 
 # Install Verible
 RUN wget https://github.com/chipsalliance/verible/releases/download/v${VERIBLE_VERSION}/verible-v${VERIBLE_VERSION}-linux-static-x86_64.tar.gz && \
-    tar -x -f verible-v${VERIBLE_VERSION}-linux-static-x86_64.tar.gz --strip-components=1 -C . && \
-    rm -rf verible-v${VERIBLE_VERSION}-linux-static-x86_64.tar.gz
+    tar xzf verible-v${VERIBLE_VERSION}-linux-static-x86_64.tar.gz && \
+    mv verible-v${VERIBLE_VERSION} verible
 
 # Install Doxygen
 RUN wget https://www.doxygen.nl/files/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz && \
@@ -111,12 +111,13 @@ RUN ${VIRTUAL_ENV}/bin/pip install --upgrade pip && \
 COPY --from=builder /tools/bender /tools/bin/
 # COPY --from=builder /root/.cargo/bin/banshee /tools/bin/
 COPY --from=builder /tools/doxygen/bin/doxygen /tools/bin/
-COPY --from=builder /tools/verible* /tools/bin/
+COPY --from=builder /tools/verible/bin/ /tools/verible
 COPY --from=builder /tools/riscv-llvm /tools/riscv-llvm
 
 # Modify environment and path variables
 ENV VLT="verilator-wrap.sh"
 ENV LLVM_BINROOT="/tools/riscv-llvm/bin"
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 ENV PATH="/tools/bin:${PATH}"
+ENV PATH="/tools/verible/bin:${PATH}"
 ENV PATH="/tools/riscv-llvm/bin:${PATH}"