From 303454c2218f09f7413664105c6af7f9e9cb6dfa Mon Sep 17 00:00:00 2001
From: Attila Lendvai <attila@lendvai.name>
Date: Sat, 11 Jul 2015 02:01:26 +0200
Subject: [PATCH] reorganize image-extras

---
 build.sh                                              | 11 ++++++-----
 image-extras.TLMR3020/etc/config/network              | 11 -----------
 image-extras/TLMR3020/etc/config/placeholder          |  1 +
 image-extras/{ => common}/etc/config/fstab            |  0
 .../{ => common}/etc/dropbear/authorized_keys         |  0
 image-extras/{ => common}/etc/logrotate.d/syslog.conf |  0
 image-extras/{ => common}/etc/rc.local                |  0
 .../{ => common}/root/autoprovision-functions.sh      |  0
 .../{ => common}/root/autoprovision-stage1.sh         |  0
 .../{ => common}/root/autoprovision-stage2.sh         |  0
 10 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 image-extras.TLMR3020/etc/config/network
 create mode 100644 image-extras/TLMR3020/etc/config/placeholder
 rename image-extras/{ => common}/etc/config/fstab (100%)
 rename image-extras/{ => common}/etc/dropbear/authorized_keys (100%)
 rename image-extras/{ => common}/etc/logrotate.d/syslog.conf (100%)
 rename image-extras/{ => common}/etc/rc.local (100%)
 rename image-extras/{ => common}/root/autoprovision-functions.sh (100%)
 rename image-extras/{ => common}/root/autoprovision-stage1.sh (100%)
 rename image-extras/{ => common}/root/autoprovision-stage2.sh (100%)

diff --git a/build.sh b/build.sh
index 647a2a8..3585344 100755
--- a/build.sh
+++ b/build.sh
@@ -25,8 +25,8 @@ fi
 BUILD=`dirname "$0"`"/build/"
 BUILD=`absolutize $BUILD`
 IMGTEMPDIR="${BUILD}/openwrt-build-image-extras"
-IMGBUILDERDIR="${BUILD}/OpenWrt-ImageBuilder-15.05-rc1-ar71xx-generic.Linux-x86_64"
-IMGBUILDERURL="https://downloads.openwrt.org/chaos_calmer/15.05-rc1/ar71xx/generic/OpenWrt-ImageBuilder-15.05-rc1-ar71xx-generic.Linux-x86_64.tar.bz2"
+IMGBUILDERDIR="${BUILD}/OpenWrt-ImageBuilder-15.05-rc2-ar71xx-generic.Linux-x86_64"
+IMGBUILDERURL="https://downloads.openwrt.org/chaos_calmer/15.05-rc2/ar71xx/generic/OpenWrt-ImageBuilder-15.05-rc2-ar71xx-generic.Linux-x86_64.tar.bz2"
 
 PREINSTALLED_PACKAGES="wireless-tools firewall iptables"
 PREINSTALLED_PACKAGES+=" ppp ppp-mod-pppoe ppp-mod-pppol2tp ppp-mod-pptp kmod-ppp kmod-pppoe"
@@ -36,9 +36,10 @@ PREINSTALLED_PACKAGES+=" luci"
 mkdir --parents ${BUILD}
 
 rm -rf $IMGTEMPDIR
-cp -r image-extras $IMGTEMPDIR
-if [ -e image-extras.$TARGET_PLATFORM/ ]; then
-    rsync -pr image-extras.$TARGET_PLATFORM/ $IMGTEMPDIR/
+cp -r image-extras/common $IMGTEMPDIR
+PER_PLATFORM_IMAGE_EXTRAS=image-extras/${TARGET_PLATFORM}/
+if [ -e $PER_PLATFORM_IMAGE_EXTRAS ]; then
+    rsync -pr $PER_PLATFORM_IMAGE_EXTRAS $IMGTEMPDIR/
 fi
 
 if [ ! -e ${IMGBUILDERDIR} ]; then
diff --git a/image-extras.TLMR3020/etc/config/network b/image-extras.TLMR3020/etc/config/network
deleted file mode 100644
index 7208bd1..0000000
--- a/image-extras.TLMR3020/etc/config/network
+++ /dev/null
@@ -1,11 +0,0 @@
-
-config interface 'loopback'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'lan'
-	option ifname 'eth0'
-	option type 'bridge'
-	option proto 'dhcp'
diff --git a/image-extras/TLMR3020/etc/config/placeholder b/image-extras/TLMR3020/etc/config/placeholder
new file mode 100644
index 0000000..fd98c94
--- /dev/null
+++ b/image-extras/TLMR3020/etc/config/placeholder
@@ -0,0 +1 @@
+# this is just a file to show how platform specific image extras can be specified
diff --git a/image-extras/etc/config/fstab b/image-extras/common/etc/config/fstab
similarity index 100%
rename from image-extras/etc/config/fstab
rename to image-extras/common/etc/config/fstab
diff --git a/image-extras/etc/dropbear/authorized_keys b/image-extras/common/etc/dropbear/authorized_keys
similarity index 100%
rename from image-extras/etc/dropbear/authorized_keys
rename to image-extras/common/etc/dropbear/authorized_keys
diff --git a/image-extras/etc/logrotate.d/syslog.conf b/image-extras/common/etc/logrotate.d/syslog.conf
similarity index 100%
rename from image-extras/etc/logrotate.d/syslog.conf
rename to image-extras/common/etc/logrotate.d/syslog.conf
diff --git a/image-extras/etc/rc.local b/image-extras/common/etc/rc.local
similarity index 100%
rename from image-extras/etc/rc.local
rename to image-extras/common/etc/rc.local
diff --git a/image-extras/root/autoprovision-functions.sh b/image-extras/common/root/autoprovision-functions.sh
similarity index 100%
rename from image-extras/root/autoprovision-functions.sh
rename to image-extras/common/root/autoprovision-functions.sh
diff --git a/image-extras/root/autoprovision-stage1.sh b/image-extras/common/root/autoprovision-stage1.sh
similarity index 100%
rename from image-extras/root/autoprovision-stage1.sh
rename to image-extras/common/root/autoprovision-stage1.sh
diff --git a/image-extras/root/autoprovision-stage2.sh b/image-extras/common/root/autoprovision-stage2.sh
similarity index 100%
rename from image-extras/root/autoprovision-stage2.sh
rename to image-extras/common/root/autoprovision-stage2.sh