From e11477b9cfcccb6d18115c838b583321ccce55a5 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@tele2.at>
Date: Thu, 10 May 2018 14:15:44 +0200
Subject: [PATCH] Remove common product configuration

The simplification of the overide behaviour may be worth the slight
duplication overhead.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
---
 {product/common => board/alix}/LDPATH  |  0
 product/common/ROOTFS                  | 20 --------------------
 product/router/ROOTFS                  | 20 ++++++++++++++++++++
 product/{common => router}/dhcpcd.conf |  0
 util/misc.sh                           |  7 -------
 5 files changed, 20 insertions(+), 27 deletions(-)
 rename {product/common => board/alix}/LDPATH (100%)
 delete mode 100644 product/common/ROOTFS
 rename product/{common => router}/dhcpcd.conf (100%)

diff --git a/product/common/LDPATH b/board/alix/LDPATH
similarity index 100%
rename from product/common/LDPATH
rename to board/alix/LDPATH
diff --git a/product/common/ROOTFS b/product/common/ROOTFS
deleted file mode 100644
index 9eefe77..0000000
--- a/product/common/ROOTFS
+++ /dev/null
@@ -1,20 +0,0 @@
-coreutils
-bash
-bash-completion
-nano
-util-linux
-grep
-less
-xz
-gzip
-bzip2
-tar
-diffutils
-findutils
-sed
-gawk
-shadow
-procps-ng
-psmisc
-file
-init
diff --git a/product/router/ROOTFS b/product/router/ROOTFS
index 39750e1..d84b5f7 100644
--- a/product/router/ROOTFS
+++ b/product/router/ROOTFS
@@ -1,3 +1,23 @@
+coreutils
+bash
+bash-completion
+nano
+util-linux
+grep
+less
+xz
+gzip
+bzip2
+tar
+diffutils
+findutils
+sed
+gawk
+shadow
+procps-ng
+psmisc
+file
+init
 unbound
 dnsmasq
 openssh
diff --git a/product/common/dhcpcd.conf b/product/router/dhcpcd.conf
similarity index 100%
rename from product/common/dhcpcd.conf
rename to product/router/dhcpcd.conf
diff --git a/util/misc.sh b/util/misc.sh
index 64ec99b..cfdcd64 100644
--- a/util/misc.sh
+++ b/util/misc.sh
@@ -11,10 +11,6 @@ file_path_override() {
 		echo "$SCRIPTDIR/board/$BOARD/$1"
 		return
 	fi
-	if [ -e "$SCRIPTDIR/product/common/$1" ]; then
-		echo "$SCRIPTDIR/product/common/$1"
-		return
-	fi
 }
 
 cat_file_override() {
@@ -35,9 +31,6 @@ cat_file_merge() {
 	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
 		cat "$SCRIPTDIR/board/$BOARD/$1"
 	fi
-	if [ -e "$SCRIPTDIR/product/common/$1" ]; then
-		cat "$SCRIPTDIR/product/common/$1"
-	fi
 }
 
 apply_patches() {