Revert "EEbus: simplify build"

This reverts commit 8060096bef.

.github/workflows/default.yml

@@ -44,7 +44,7 @@ jobs:
         id: go
 
       - name: Patch ASN1
-        run: sudo make patch-asn1
+        run: make patch-asn1-sudo
 
       - name: Build
         run: make build
@@ -63,7 +63,7 @@ jobs:
         id: go
 
       - name: Patch ASN1
-        run: sudo make patch-asn1
+        run: make patch-asn1-sudo
 
       - name: Test
         run: make test

.github/workflows/nightly.yml

@@ -82,7 +82,7 @@ jobs:
         run: pip install --upgrade cloudsmith-cli
 
       - name: Patch ASN1
-        run: sudo make patch-asn1
+        run: make patch-asn1-sudo
 
       - name: Create nightly build
         uses: goreleaser/goreleaser-action@v3

.github/workflows/release.yml

@@ -68,7 +68,7 @@ jobs:
         run: pip install --upgrade cloudsmith-cli
 
       - name: Patch ASN1
-        run: sudo make patch-asn1
+        run: make patch-asn1-sudo
 
       # gokrazy image
       # - name: Prepare Image

Makefile

@@ -127,6 +127,12 @@ soc::
 	go build $(BUILD_TAGS) $(BUILD_ARGS) github.com/evcc-io/evcc/cmd/soc
 
 # patch asn1.go to allow Elli buggy certificates to be accepted with EEBUS
+patch-asn1-sudo::
+	# echo $(GOROOT)
+	cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
+	sudo patch -N -t -d $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte -i $(CURRDIR)/patch/asn1.diff
+	cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
+
 patch-asn1::
 	# echo $(GOROOT)
 	cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"