From 1c321237c29202e0ed5c168c625cc89fcabb609c Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 Nov 2019 14:48:17 +0100 Subject: [PATCH] ramips: split further base-files across subtargets As started in 19724e28c81e ("ramips: split base-files into subtargets"), this moves some smaller left-over files to the appropriate base-files folder of their subtarget: - /etc/init.d/bootcount - /etc/uci-defaults/04_led_migration Signed-off-by: Adrian Schmutzler --- .../etc/uci-defaults/04_led_migration | 18 --------------- .../mt7621/base-files/etc/init.d/bootcount | 11 ++++++++++ .../etc/uci-defaults/04_led_migration | 16 ++++++++++++++ .../base-files/etc/init.d/bootcount | 3 --- .../etc/uci-defaults/04_led_migration | 22 +++++++++++++++++++ .../etc/uci-defaults/04_led_migration | 19 ++++++++++++++++ 6 files changed, 68 insertions(+), 21 deletions(-) rename target/linux/ramips/{ => mt7620}/base-files/etc/uci-defaults/04_led_migration (69%) create mode 100755 target/linux/ramips/mt7621/base-files/etc/init.d/bootcount create mode 100644 target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration rename target/linux/ramips/{ => mt76x8}/base-files/etc/init.d/bootcount (72%) create mode 100644 target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration create mode 100644 target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration diff --git a/target/linux/ramips/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt7620/base-files/etc/uci-defaults/04_led_migration similarity index 69% rename from target/linux/ramips/base-files/etc/uci-defaults/04_led_migration rename to target/linux/ramips/mt7620/base-files/etc/uci-defaults/04_led_migration index e84d02331b..ba1a0df7e6 100644 --- a/target/linux/ramips/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ramips/mt7620/base-files/etc/uci-defaults/04_led_migration @@ -6,12 +6,6 @@ board=$(board_name) case "$board" in -fon,fonera-20n) - migrate_leds "^fonera20n:=fonera-20n:" - ;; -intenso,memory2move) - migrate_leds "^m2m:=memory2move:" - ;; lenovo,newifi-y1) migrate_leds "^y1:=newifi-y1:" ;; @@ -21,30 +15,18 @@ lenovo,newifi-y1s) netgear,wn3000rp-v3) migrate_leds "^wn3000rpv3:=wn3000rp-v3:" ;; -netgear,wndr3700-v5) - migrate_leds "^wndr3700v5:=wndr3700-v5:" - ;; tplink,archer-c2-v1) migrate_leds "^c2-v1:=archer-c2-v1:" ;; tplink,archer-c20-v1) migrate_leds "^c20-v1:=archer-c20-v1:" ;; -tplink,archer-c20-v4) - migrate_leds "^c20-v4:=archer-c20-v4:" - ;; tplink,archer-c20i) migrate_leds "^c20i:=archer-c20i:" ;; tplink,archer-c50-v1) migrate_leds "^c50:=archer-c50-v1:" ;; -tplink,archer-c50-v3) - migrate_leds "^c50-v3:=archer-c50-v3:" - ;; -tplink,archer-c50-v4) - migrate_leds "^c50-v4:=archer-c50-v4:" - ;; tplink,archer-mr200) migrate_leds "^mr200:=archer-mr200:" ;; diff --git a/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount b/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount new file mode 100755 index 0000000000..807801a34f --- /dev/null +++ b/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount @@ -0,0 +1,11 @@ +#!/bin/sh /etc/rc.common + +START=99 + +boot() { + case $(board_name) in + samknows,whitebox-v8) + fw_setenv bootcount 0 + ;; + esac +} diff --git a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration new file mode 100644 index 0000000000..e745c2c5d4 --- /dev/null +++ b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration @@ -0,0 +1,16 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/functions/migrations.sh + +board=$(board_name) + +case "$board" in +netgear,wndr3700-v5) + migrate_leds "^wndr3700v5:=wndr3700-v5:" + ;; +esac + +migrations_apply system + +exit 0 diff --git a/target/linux/ramips/base-files/etc/init.d/bootcount b/target/linux/ramips/mt76x8/base-files/etc/init.d/bootcount similarity index 72% rename from target/linux/ramips/base-files/etc/init.d/bootcount rename to target/linux/ramips/mt76x8/base-files/etc/init.d/bootcount index ad3dd97402..0d64deb9e0 100755 --- a/target/linux/ramips/base-files/etc/init.d/bootcount +++ b/target/linux/ramips/mt76x8/base-files/etc/init.d/bootcount @@ -4,9 +4,6 @@ START=99 boot() { case $(board_name) in - samknows,whitebox-v8) - fw_setenv bootcount 0 - ;; xiaomi,miwifi-nano) fw_setenv flag_boot_success 1 ;; diff --git a/target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration new file mode 100644 index 0000000000..3f9f615c10 --- /dev/null +++ b/target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration @@ -0,0 +1,22 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/functions/migrations.sh + +board=$(board_name) + +case "$board" in +tplink,archer-c20-v4) + migrate_leds "^c20-v4:=archer-c20-v4:" + ;; +tplink,archer-c50-v3) + migrate_leds "^c50-v3:=archer-c50-v3:" + ;; +tplink,archer-c50-v4) + migrate_leds "^c50-v4:=archer-c50-v4:" + ;; +esac + +migrations_apply system + +exit 0 diff --git a/target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration new file mode 100644 index 0000000000..b1a94bf81b --- /dev/null +++ b/target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration @@ -0,0 +1,19 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/functions/migrations.sh + +board=$(board_name) + +case "$board" in +fon,fonera-20n) + migrate_leds "^fonera20n:=fonera-20n:" + ;; +intenso,memory2move) + migrate_leds "^m2m:=memory2move:" + ;; +esac + +migrations_apply system + +exit 0