From c852d993eed7922a15dcc480adcd447b1e18f84a Mon Sep 17 00:00:00 2001
From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com>
Date: Wed, 31 Aug 2022 21:35:48 +0300
Subject: [PATCH] Rename folders, update stapler, fix Readme, add baresip
profiles
---
README.md | 2 +-
{Library => library}/gk7205v200/.dot | 0
{Library => library}/hi3518ev200/.dot | 0
{Library => library}/t31/.dot | 0
.../br-ext-chip-goke/package/ax-agent | 0
.../general/package/ax-agent/Config.in | 0
.../general/package/ax-agent/ax-agent.mk | 0
.../general/package/ax-agent/src/ax-agent.c | 0
.../hi3516ev100_mqtt/Makefile | 0
...unknown_unknown_hi3516ev100_mqtt_defconfig | 0
.../hi3518ev200_cip37210/.dot | 0
.../hi3518ev200_hs303v1/.dot | 0
.../hi3518ev200_hs303v2/.dot | 0
{Projects => projects}/t31_baresip/Makefile | 0
.../t31_baresip/br-ext-chip-ingenic/Config.in | 38 +++++++++++++++++++
.../unknown_unknown_t31_baresip_defconfig | 0
.../br-ext-chip-ingenic/external.mk | 38 +++++++++++++++++++
{Projects => projects}/t31_dbell/Makefile | 0
.../t31_dbell/br-ext-chip-ingenic/Config.in | 0
.../unknown_unknown_t31_dbell_defconfig | 0
.../t31_dbell/br-ext-chip-ingenic/external.mk | 0
.../br-ext-chip-ingenic/package/dbell-ina219 | 0
.../general/overlay/etc/fw_env.config | 0
.../general/package/dbell-ina219/Config.in | 0
.../package/dbell-ina219/dbell-ina219.mk | 0
.../general/package/dbell-ina219/src/ina219.c | 0
{Projects => projects}/t31_vixand/Makefile | 0
.../board/t31/kernel/t31.vixand.config | 0
.../unknown_unknown_t31_vixand_defconfig | 0
.../general/overlay/etc/init.d/S98vtun | 0
.../t31_vixand/general/overlay/etc/modules | 0
.../general/overlay/etc/network/interfaces | 0
.../overlay/etc/ppp/chatscripts/modem.chat | 0
.../general/overlay/etc/ppp/options | 0
.../general/overlay/etc/ppp/peers/provider | 0
.../general/overlay/usr/sbin/tunnel | 0
stapler | 22 ++++++-----
37 files changed, 90 insertions(+), 10 deletions(-)
rename {Library => library}/gk7205v200/.dot (100%)
rename {Library => library}/hi3518ev200/.dot (100%)
rename {Library => library}/t31/.dot (100%)
rename {Projects => projects}/gk7205v200_axiostv/br-ext-chip-goke/package/ax-agent (100%)
rename {Projects => projects}/gk7205v200_axiostv/general/package/ax-agent/Config.in (100%)
rename {Projects => projects}/gk7205v200_axiostv/general/package/ax-agent/ax-agent.mk (100%)
rename {Projects => projects}/gk7205v200_axiostv/general/package/ax-agent/src/ax-agent.c (100%)
rename {Projects => projects}/hi3516ev100_mqtt/Makefile (100%)
rename {Projects => projects}/hi3516ev100_mqtt/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev100_mqtt_defconfig (100%)
rename {Projects => projects}/hi3518ev200_cip37210/.dot (100%)
rename {Projects => projects}/hi3518ev200_hs303v1/.dot (100%)
rename {Projects => projects}/hi3518ev200_hs303v2/.dot (100%)
rename {Projects => projects}/t31_baresip/Makefile (100%)
create mode 100644 projects/t31_baresip/br-ext-chip-ingenic/Config.in
rename {Projects => projects}/t31_baresip/br-ext-chip-ingenic/configs/unknown_unknown_t31_baresip_defconfig (100%)
create mode 100644 projects/t31_baresip/br-ext-chip-ingenic/external.mk
rename {Projects => projects}/t31_dbell/Makefile (100%)
rename {Projects => projects}/t31_dbell/br-ext-chip-ingenic/Config.in (100%)
rename {Projects => projects}/t31_dbell/br-ext-chip-ingenic/configs/unknown_unknown_t31_dbell_defconfig (100%)
rename {Projects => projects}/t31_dbell/br-ext-chip-ingenic/external.mk (100%)
rename {Projects => projects}/t31_dbell/br-ext-chip-ingenic/package/dbell-ina219 (100%)
rename {Projects => projects}/t31_dbell/general/overlay/etc/fw_env.config (100%)
rename {Projects => projects}/t31_dbell/general/package/dbell-ina219/Config.in (100%)
rename {Projects => projects}/t31_dbell/general/package/dbell-ina219/dbell-ina219.mk (100%)
rename {Projects => projects}/t31_dbell/general/package/dbell-ina219/src/ina219.c (100%)
rename {Projects => projects}/t31_vixand/Makefile (100%)
rename {Projects => projects}/t31_vixand/br-ext-chip-ingenic/board/t31/kernel/t31.vixand.config (100%)
rename {Projects => projects}/t31_vixand/br-ext-chip-ingenic/configs/unknown_unknown_t31_vixand_defconfig (100%)
rename {Projects => projects}/t31_vixand/general/overlay/etc/init.d/S98vtun (100%)
rename {Projects => projects}/t31_vixand/general/overlay/etc/modules (100%)
rename {Projects => projects}/t31_vixand/general/overlay/etc/network/interfaces (100%)
rename {Projects => projects}/t31_vixand/general/overlay/etc/ppp/chatscripts/modem.chat (100%)
rename {Projects => projects}/t31_vixand/general/overlay/etc/ppp/options (100%)
rename {Projects => projects}/t31_vixand/general/overlay/etc/ppp/peers/provider (100%)
rename {Projects => projects}/t31_vixand/general/overlay/usr/sbin/tunnel (100%)
diff --git a/README.md b/README.md
index 48d017e..829db5d 100644
--- a/README.md
+++ b/README.md
@@ -6,5 +6,5 @@
## Quick Start - run one command for happiness ;)
```
-https://github.com/ZigFisher/composer.git && cd composer && ./stapler t31_vixand
+git clone https://github.com/ZigFisher/composer.git && cd composer && ./stapler t31_vixand
```
diff --git a/Library/gk7205v200/.dot b/library/gk7205v200/.dot
similarity index 100%
rename from Library/gk7205v200/.dot
rename to library/gk7205v200/.dot
diff --git a/Library/hi3518ev200/.dot b/library/hi3518ev200/.dot
similarity index 100%
rename from Library/hi3518ev200/.dot
rename to library/hi3518ev200/.dot
diff --git a/Library/t31/.dot b/library/t31/.dot
similarity index 100%
rename from Library/t31/.dot
rename to library/t31/.dot
diff --git a/Projects/gk7205v200_axiostv/br-ext-chip-goke/package/ax-agent b/projects/gk7205v200_axiostv/br-ext-chip-goke/package/ax-agent
similarity index 100%
rename from Projects/gk7205v200_axiostv/br-ext-chip-goke/package/ax-agent
rename to projects/gk7205v200_axiostv/br-ext-chip-goke/package/ax-agent
diff --git a/Projects/gk7205v200_axiostv/general/package/ax-agent/Config.in b/projects/gk7205v200_axiostv/general/package/ax-agent/Config.in
similarity index 100%
rename from Projects/gk7205v200_axiostv/general/package/ax-agent/Config.in
rename to projects/gk7205v200_axiostv/general/package/ax-agent/Config.in
diff --git a/Projects/gk7205v200_axiostv/general/package/ax-agent/ax-agent.mk b/projects/gk7205v200_axiostv/general/package/ax-agent/ax-agent.mk
similarity index 100%
rename from Projects/gk7205v200_axiostv/general/package/ax-agent/ax-agent.mk
rename to projects/gk7205v200_axiostv/general/package/ax-agent/ax-agent.mk
diff --git a/Projects/gk7205v200_axiostv/general/package/ax-agent/src/ax-agent.c b/projects/gk7205v200_axiostv/general/package/ax-agent/src/ax-agent.c
similarity index 100%
rename from Projects/gk7205v200_axiostv/general/package/ax-agent/src/ax-agent.c
rename to projects/gk7205v200_axiostv/general/package/ax-agent/src/ax-agent.c
diff --git a/Projects/hi3516ev100_mqtt/Makefile b/projects/hi3516ev100_mqtt/Makefile
similarity index 100%
rename from Projects/hi3516ev100_mqtt/Makefile
rename to projects/hi3516ev100_mqtt/Makefile
diff --git a/Projects/hi3516ev100_mqtt/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev100_mqtt_defconfig b/projects/hi3516ev100_mqtt/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev100_mqtt_defconfig
similarity index 100%
rename from Projects/hi3516ev100_mqtt/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev100_mqtt_defconfig
rename to projects/hi3516ev100_mqtt/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev100_mqtt_defconfig
diff --git a/Projects/hi3518ev200_cip37210/.dot b/projects/hi3518ev200_cip37210/.dot
similarity index 100%
rename from Projects/hi3518ev200_cip37210/.dot
rename to projects/hi3518ev200_cip37210/.dot
diff --git a/Projects/hi3518ev200_hs303v1/.dot b/projects/hi3518ev200_hs303v1/.dot
similarity index 100%
rename from Projects/hi3518ev200_hs303v1/.dot
rename to projects/hi3518ev200_hs303v1/.dot
diff --git a/Projects/hi3518ev200_hs303v2/.dot b/projects/hi3518ev200_hs303v2/.dot
similarity index 100%
rename from Projects/hi3518ev200_hs303v2/.dot
rename to projects/hi3518ev200_hs303v2/.dot
diff --git a/Projects/t31_baresip/Makefile b/projects/t31_baresip/Makefile
similarity index 100%
rename from Projects/t31_baresip/Makefile
rename to projects/t31_baresip/Makefile
diff --git a/projects/t31_baresip/br-ext-chip-ingenic/Config.in b/projects/t31_baresip/br-ext-chip-ingenic/Config.in
new file mode 100644
index 0000000..12fd645
--- /dev/null
+++ b/projects/t31_baresip/br-ext-chip-ingenic/Config.in
@@ -0,0 +1,38 @@
+source "$BR2_EXTERNAL_INGENIC_PATH/linux/Config.ext.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/ingenic-osdrv-t20/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/ingenic-osdrv-t21/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/ingenic-osdrv-t31/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/ingenic_patcher/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/aura-httpd/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/ax-agent/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/dropbear-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/baresip-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/fdk-aac-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/ffmpeg-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/fwprintenv-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/i2c-telemetry/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/ipctool/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/json-c-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/lame-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/libcurl-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/libevent-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/libhv-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/libogg-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/libre-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/librem-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/libsrt-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/libwebsockets-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/linux-firmware-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic-fonts/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/mbedtls-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/microbe-web/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/microsnander/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/motors/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/node-exporter/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/opus-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/rtl8188fu-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/uacme-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/vtund-openipc/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/xmdp/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/yaml-cli/Config.in"
diff --git a/Projects/t31_baresip/br-ext-chip-ingenic/configs/unknown_unknown_t31_baresip_defconfig b/projects/t31_baresip/br-ext-chip-ingenic/configs/unknown_unknown_t31_baresip_defconfig
similarity index 100%
rename from Projects/t31_baresip/br-ext-chip-ingenic/configs/unknown_unknown_t31_baresip_defconfig
rename to projects/t31_baresip/br-ext-chip-ingenic/configs/unknown_unknown_t31_baresip_defconfig
diff --git a/projects/t31_baresip/br-ext-chip-ingenic/external.mk b/projects/t31_baresip/br-ext-chip-ingenic/external.mk
new file mode 100644
index 0000000..a78fc87
--- /dev/null
+++ b/projects/t31_baresip/br-ext-chip-ingenic/external.mk
@@ -0,0 +1,38 @@
+include $(BR2_EXTERNAL_INGENIC_PATH)/linux/linux-ext-ingenic_patcher.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t20/ingenic-osdrv-t20.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t21/ingenic-osdrv-t21.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic_patcher/ingenic_patcher.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/aura-httpd/aura-httpd.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/ax-agent/ax-agent.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/baresip-openipc/baresip-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/dropbear-openipc/dropbear-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/ffmpeg-openipc/ffmpeg-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/fwprintenv-openipc/fwprintenv-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/i2c-telemetry/i2c-telemetry.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/ipctool/ipctool.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/json-c-openipc/json-c-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/lame-openipc/lame-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/libcurl-openipc/libcurl-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/libevent-openipc/libevent-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/libhv-openipc/libhv-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/libogg-openipc/libogg-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/libre-openipc/libre-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/librem-openipc/librem-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/libsrt-openipc/libsrt-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic/majestic.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic-fonts/majestic-fonts.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/microbe-web/microbe-web.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/microsnander/microsnander.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/motors/motors.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/node-exporter/node-exporter.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/opus-openipc/opus-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/rtl8188fu-openipc/rtl8188fu-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/uacme-openipc/uacme-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/vtund-openipc/vtund-openipc.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/xmdp/xmdp.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/yaml-cli/yaml-cli.mk
diff --git a/Projects/t31_dbell/Makefile b/projects/t31_dbell/Makefile
similarity index 100%
rename from Projects/t31_dbell/Makefile
rename to projects/t31_dbell/Makefile
diff --git a/Projects/t31_dbell/br-ext-chip-ingenic/Config.in b/projects/t31_dbell/br-ext-chip-ingenic/Config.in
similarity index 100%
rename from Projects/t31_dbell/br-ext-chip-ingenic/Config.in
rename to projects/t31_dbell/br-ext-chip-ingenic/Config.in
diff --git a/Projects/t31_dbell/br-ext-chip-ingenic/configs/unknown_unknown_t31_dbell_defconfig b/projects/t31_dbell/br-ext-chip-ingenic/configs/unknown_unknown_t31_dbell_defconfig
similarity index 100%
rename from Projects/t31_dbell/br-ext-chip-ingenic/configs/unknown_unknown_t31_dbell_defconfig
rename to projects/t31_dbell/br-ext-chip-ingenic/configs/unknown_unknown_t31_dbell_defconfig
diff --git a/Projects/t31_dbell/br-ext-chip-ingenic/external.mk b/projects/t31_dbell/br-ext-chip-ingenic/external.mk
similarity index 100%
rename from Projects/t31_dbell/br-ext-chip-ingenic/external.mk
rename to projects/t31_dbell/br-ext-chip-ingenic/external.mk
diff --git a/Projects/t31_dbell/br-ext-chip-ingenic/package/dbell-ina219 b/projects/t31_dbell/br-ext-chip-ingenic/package/dbell-ina219
similarity index 100%
rename from Projects/t31_dbell/br-ext-chip-ingenic/package/dbell-ina219
rename to projects/t31_dbell/br-ext-chip-ingenic/package/dbell-ina219
diff --git a/Projects/t31_dbell/general/overlay/etc/fw_env.config b/projects/t31_dbell/general/overlay/etc/fw_env.config
similarity index 100%
rename from Projects/t31_dbell/general/overlay/etc/fw_env.config
rename to projects/t31_dbell/general/overlay/etc/fw_env.config
diff --git a/Projects/t31_dbell/general/package/dbell-ina219/Config.in b/projects/t31_dbell/general/package/dbell-ina219/Config.in
similarity index 100%
rename from Projects/t31_dbell/general/package/dbell-ina219/Config.in
rename to projects/t31_dbell/general/package/dbell-ina219/Config.in
diff --git a/Projects/t31_dbell/general/package/dbell-ina219/dbell-ina219.mk b/projects/t31_dbell/general/package/dbell-ina219/dbell-ina219.mk
similarity index 100%
rename from Projects/t31_dbell/general/package/dbell-ina219/dbell-ina219.mk
rename to projects/t31_dbell/general/package/dbell-ina219/dbell-ina219.mk
diff --git a/Projects/t31_dbell/general/package/dbell-ina219/src/ina219.c b/projects/t31_dbell/general/package/dbell-ina219/src/ina219.c
similarity index 100%
rename from Projects/t31_dbell/general/package/dbell-ina219/src/ina219.c
rename to projects/t31_dbell/general/package/dbell-ina219/src/ina219.c
diff --git a/Projects/t31_vixand/Makefile b/projects/t31_vixand/Makefile
similarity index 100%
rename from Projects/t31_vixand/Makefile
rename to projects/t31_vixand/Makefile
diff --git a/Projects/t31_vixand/br-ext-chip-ingenic/board/t31/kernel/t31.vixand.config b/projects/t31_vixand/br-ext-chip-ingenic/board/t31/kernel/t31.vixand.config
similarity index 100%
rename from Projects/t31_vixand/br-ext-chip-ingenic/board/t31/kernel/t31.vixand.config
rename to projects/t31_vixand/br-ext-chip-ingenic/board/t31/kernel/t31.vixand.config
diff --git a/Projects/t31_vixand/br-ext-chip-ingenic/configs/unknown_unknown_t31_vixand_defconfig b/projects/t31_vixand/br-ext-chip-ingenic/configs/unknown_unknown_t31_vixand_defconfig
similarity index 100%
rename from Projects/t31_vixand/br-ext-chip-ingenic/configs/unknown_unknown_t31_vixand_defconfig
rename to projects/t31_vixand/br-ext-chip-ingenic/configs/unknown_unknown_t31_vixand_defconfig
diff --git a/Projects/t31_vixand/general/overlay/etc/init.d/S98vtun b/projects/t31_vixand/general/overlay/etc/init.d/S98vtun
similarity index 100%
rename from Projects/t31_vixand/general/overlay/etc/init.d/S98vtun
rename to projects/t31_vixand/general/overlay/etc/init.d/S98vtun
diff --git a/Projects/t31_vixand/general/overlay/etc/modules b/projects/t31_vixand/general/overlay/etc/modules
similarity index 100%
rename from Projects/t31_vixand/general/overlay/etc/modules
rename to projects/t31_vixand/general/overlay/etc/modules
diff --git a/Projects/t31_vixand/general/overlay/etc/network/interfaces b/projects/t31_vixand/general/overlay/etc/network/interfaces
similarity index 100%
rename from Projects/t31_vixand/general/overlay/etc/network/interfaces
rename to projects/t31_vixand/general/overlay/etc/network/interfaces
diff --git a/Projects/t31_vixand/general/overlay/etc/ppp/chatscripts/modem.chat b/projects/t31_vixand/general/overlay/etc/ppp/chatscripts/modem.chat
similarity index 100%
rename from Projects/t31_vixand/general/overlay/etc/ppp/chatscripts/modem.chat
rename to projects/t31_vixand/general/overlay/etc/ppp/chatscripts/modem.chat
diff --git a/Projects/t31_vixand/general/overlay/etc/ppp/options b/projects/t31_vixand/general/overlay/etc/ppp/options
similarity index 100%
rename from Projects/t31_vixand/general/overlay/etc/ppp/options
rename to projects/t31_vixand/general/overlay/etc/ppp/options
diff --git a/Projects/t31_vixand/general/overlay/etc/ppp/peers/provider b/projects/t31_vixand/general/overlay/etc/ppp/peers/provider
similarity index 100%
rename from Projects/t31_vixand/general/overlay/etc/ppp/peers/provider
rename to projects/t31_vixand/general/overlay/etc/ppp/peers/provider
diff --git a/Projects/t31_vixand/general/overlay/usr/sbin/tunnel b/projects/t31_vixand/general/overlay/usr/sbin/tunnel
similarity index 100%
rename from Projects/t31_vixand/general/overlay/usr/sbin/tunnel
rename to projects/t31_vixand/general/overlay/usr/sbin/tunnel
diff --git a/stapler b/stapler
index 99712f1..4fa9506 100755
--- a/stapler
+++ b/stapler
@@ -15,6 +15,7 @@ PROJECT="${PROJECT:=t31_vixand}"
TFTPSRV="root@172.17.32.17:/mnt/bigger-2tb/Rotator/TFTP"
OUTTIME=$(date +"%Y%m%d")
+
echo_c() {
# 31 red, 32 green, 33 yellow, 34 blue, 35 magenta, 36 cyan, 37 white, 38 grey
t="\e[1;$1m$2\e[0m" || t="$2"
@@ -23,7 +24,12 @@ echo_c() {
2tftp() {
echo_c 32 "\nStart transferring files to the TFTP server ...\n"
- scp -r $@ ${TFTPSRV}
+ scp -r output/images/rootfs.squashfs.* output/images/uImage.* ${TFTPSRV}
+}
+
+2archive() {
+ mkdir -p ../archive/${PROJECT}_${OUTTIME}
+ cp -av output/images/rootfs.squashfs.* output/images/uImage.* ../archive/${PROJECT}_${OUTTIME}
}
@@ -31,16 +37,14 @@ echo_c() {
echo_c 32 "\nAttention, let's start working on the ${PROJECT} project ...\n"
git pull
-rm -rf Firmware
-git clone --depth=1 https://github.com/OpenIPC/firmware.git Firmware
-cp -afv Projects/${PROJECT}/* Firmware
-cd Firmware
+rm -rf firmware
+git clone --depth=1 https://github.com/OpenIPC/firmware.git firmware
+cp -afv projects/${PROJECT}/* firmware
+cd firmware
./building.sh ${PROJECT}
+2archive; 2tftp
echo_c 35 "\nYou can get the new assembled firmware components here:\n"
-tree -C output/images
-2tftp output/images/rootfs.squashfs.* output/images/uImage.*
-mkdir -p ../Output/${PROJECT}_
-cp -av output/images/rootfs.squashfs.* output/images/uImage.* ../Output/${PROJECT}_${OUTTIME}
+tree -C ../archive/${PROJECT}_${OUTTIME}
echo_c 35 "\nRollback to home ...\n"
cd -