From 8a1be43c870f167721ed70c5f61300f6afbf26db Mon Sep 17 00:00:00 2001
From: Vyacheslav <64684523+adeepn@users.noreply.github.com>
Date: Sat, 9 Jul 2022 12:46:40 +0300
Subject: [PATCH] Update oneshot service for eth reset at system start.
 (AR-1098) (#3965)

---
 config/sources/families/jethub.conf                         | 6 +++---
 packages/bsp/jethub/{jethubj80 => }/jethub-ethreset         | 0
 packages/bsp/jethub/{jethubj80 => }/jethub-ethreset.service | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/bsp/jethub/{jethubj80 => }/jethub-ethreset (100%)
 rename packages/bsp/jethub/{jethubj80 => }/jethub-ethreset.service (100%)

diff --git a/config/sources/families/jethub.conf b/config/sources/families/jethub.conf
index 923815c770..e8236e34dd 100644
--- a/config/sources/families/jethub.conf
+++ b/config/sources/families/jethub.conf
@@ -188,10 +188,10 @@ family_tweaks_bsp() {
 	cp "$SRC/packages/bsp/jethub/${BOARD}/jethub-init" "$destination/usr/lib/armbian/" || exit_with_error "Unable to copy jethub-init"
 
 
+	# AR-1098 userland fix for net interface does not up at boot
+	cp "$SRC/packages/bsp/jethub/jethub-ethreset.service" "$destination/lib/systemd/system/" || exit_with_error "Unable to copy jethub-ethreset.service"
+	cp "$SRC/packages/bsp/jethub/jethub-ethreset" "$destination/usr/lib/armbian/" || exit_with_error "Unable to copy jethub-ethreset"
 	if [[ "$BOARD" == jethubj80 ]]; then
-		# AR-1098 userland fix for net interface does not up at boot
-		cp "$SRC/packages/bsp/jethub/jethubj80/jethub-ethreset.service" "$destination/lib/systemd/system/" || exit_with_error "Unable to copy jethub-ethreset.service"
-		cp "$SRC/packages/bsp/jethub/jethubj80/jethub-ethreset" "$destination/usr/lib/armbian/" || exit_with_error "Unable to copy jethub-ethreset"
 
 		# Ethernet LED setup
 		cp "$SRC/packages/bsp/jethub/$BOARD/05-jethub_set_eth_leds.rules" "$destination/etc/udev/rules.d/"
diff --git a/packages/bsp/jethub/jethubj80/jethub-ethreset b/packages/bsp/jethub/jethub-ethreset
similarity index 100%
rename from packages/bsp/jethub/jethubj80/jethub-ethreset
rename to packages/bsp/jethub/jethub-ethreset
diff --git a/packages/bsp/jethub/jethubj80/jethub-ethreset.service b/packages/bsp/jethub/jethub-ethreset.service
similarity index 100%
rename from packages/bsp/jethub/jethubj80/jethub-ethreset.service
rename to packages/bsp/jethub/jethub-ethreset.service