From 384cedae0020f47f598f83f313cb01d7b8b515c5 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Wed, 1 Nov 2023 23:36:16 +0100
Subject: [PATCH] chore: prune folder structure

---
 Dockerfile                                     | 2 +-
 Makefile                                       | 4 ++--
 {docker => packaging/docker}/bin/docker-btmgmt | 0
 {docker => packaging/docker}/bin/entrypoint.sh | 0
 {patch => packaging/patch}/asn1.diff           | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename {docker => packaging/docker}/bin/docker-btmgmt (100%)
 rename {docker => packaging/docker}/bin/entrypoint.sh (100%)
 rename {patch => packaging/patch}/asn1.diff (100%)

diff --git a/Dockerfile b/Dockerfile
index efb6dedc5f..d95643441d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -77,7 +77,7 @@ COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /build/evcc /usr/local/bin/evcc
 
-COPY docker/bin/* /app/
+COPY packaging/docker/bin/* /app/
 
 # mDNS
 EXPOSE 5353/udp
diff --git a/Makefile b/Makefile
index d161e1f50c..7726690bec 100644
--- a/Makefile
+++ b/Makefile
@@ -134,11 +134,11 @@ soc::
 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
+	sudo patch -N -t -d $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte -i $(CURRDIR)/packaging/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"
-	patch -N -t -d $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte -i $(CURRDIR)/patch/asn1.diff
+	patch -N -t -d $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte -i $(CURRDIR)/packaging/patch/asn1.diff
 	cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
diff --git a/docker/bin/docker-btmgmt b/packaging/docker/bin/docker-btmgmt
similarity index 100%
rename from docker/bin/docker-btmgmt
rename to packaging/docker/bin/docker-btmgmt
diff --git a/docker/bin/entrypoint.sh b/packaging/docker/bin/entrypoint.sh
similarity index 100%
rename from docker/bin/entrypoint.sh
rename to packaging/docker/bin/entrypoint.sh
diff --git a/patch/asn1.diff b/packaging/patch/asn1.diff
similarity index 100%
rename from patch/asn1.diff
rename to packaging/patch/asn1.diff