Skip to content

Commit

Permalink
pillar: drop pillar-patches
Browse files Browse the repository at this point in the history
2 patches from the pillar-patches folder are merged to the zededa/go-qemu
repo, which is the clone of the digitalocean/go-qemu. No need to maintain
patches, do vendoring instead.

Signed-off-by: Roman Penyaev <[email protected]>
  • Loading branch information
rouming authored and eriknordmark committed Nov 23, 2023
1 parent 74e74dd commit 8dd3700
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 138 deletions.
6 changes: 0 additions & 6 deletions pkg/pillar/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,6 @@ ENV GOARCH=${TARGETARCH}
ENV CC=${CROSS_COMPILE_ENV}gcc
ARG GOPKGVERSION

COPY pillar-patches/* /patches/
RUN set -e && for patch in ../patches/*.patch; do \
echo "Applying $patch"; \
patch -p1 --no-backup-if-mismatch -r /tmp/deleteme.rej < "$patch"; \
done

# hadolint ignore=DL4006
RUN --mount=type=cache,target=/root/.cache/go-build echo "Running go vet" && go vet ./... && \
echo "Running go fmt" && ERR="$(find . -name \*.go | grep -v /vendor/ | xargs gofmt -d -e -l -s)" && \
Expand Down
21 changes: 0 additions & 21 deletions pkg/pillar/pillar-patches/003-go-qemu-qmp-hung-listener.patch

This file was deleted.

This file was deleted.

0 comments on commit 8dd3700

Please sign in to comment.