[ABANDON] osmo-bts[master]: lc15: use directory instead of symlink
Max has abandoned this change. Change subject: lc15: use directory instead of symlink .. Abandoned -- To view, visit https://gerrit.osmocom.org/2935 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I6208a1f7d62cac7ef64459e62f8e6083b0025580 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Minh-Quang Nguyen
osmo-bts[master]: lc15: use directory instead of symlink
Patch Set 2: Code-Review-1 I think we should drop this, avoiding any unneccessary incompatibility between lc15 and sbts2100 -- To view, visit https://gerrit.osmocom.org/2935 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6208a1f7d62cac7ef64459e62f8e6083b0025580 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Minh-Quang Nguyen Gerrit-HasComments: No
[PATCH] osmo-bts[master]: lc15: use directory instead of symlink
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/2935 to look at the new patch set (#2). lc15: use directory instead of symlink Use the runtime directory populated by lc15-sysdev-remap.service directly instead of symlink to it to simplify OE builds and troubleshooting. Change-Id: I6208a1f7d62cac7ef64459e62f8e6083b0025580 Related: SYS#3686 --- M src/osmo-bts-litecell15/hw_misc.c M src/osmo-bts-litecell15/misc/lc15bts_bid.c M src/osmo-bts-litecell15/misc/lc15bts_clock.c M src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c M src/osmo-bts-litecell15/misc/lc15bts_power.c M src/osmo-bts-litecell15/misc/lc15bts_temp.c 6 files changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/2935/2 diff --git a/src/osmo-bts-litecell15/hw_misc.c b/src/osmo-bts-litecell15/hw_misc.c index 49232b2..ba6bd54 100644 --- a/src/osmo-bts-litecell15/hw_misc.c +++ b/src/osmo-bts-litecell15/hw_misc.c @@ -63,7 +63,7 @@ return -EINVAL; } - fd = open("/var/lc15/leds/led0/brightness", O_WRONLY); + fd = open("/run/lc15/leds/led0/brightness", O_WRONLY); if (fd < 0) return -ENODEV; @@ -73,7 +73,7 @@ } close(fd); - fd = open("/var/lc15/leds/led1/brightness", O_WRONLY); + fd = open("/run/lc15/leds/led1/brightness", O_WRONLY); if (fd < 0) return -ENODEV; diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.c b/src/osmo-bts-litecell15/misc/lc15bts_bid.c index 06a126a..07f7e9e 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_bid.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_bid.c @@ -27,8 +27,8 @@ #include "lc15bts_bid.h" -#define BOARD_REV_SYSFS"/var/lc15/platform/revision" -#define BOARD_OPT_SYSFS"/var/lc15/platform/option" +#define BOARD_REV_SYSFS"/run/lc15/platform/revision" +#define BOARD_OPT_SYSFS"/run/lc15/platform/option" static const int option_type_mask[_NUM_OPTION_TYPES] = { [LC15BTS_OPTION_OCXO] = 0x07, diff --git a/src/osmo-bts-litecell15/misc/lc15bts_clock.c b/src/osmo-bts-litecell15/misc/lc15bts_clock.c index f4df5d3..65f79b7 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_clock.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_clock.c @@ -27,15 +27,15 @@ #include "lc15bts_clock.h" -#define CLKERR_ERR_SYSFS "/var/lc15/clkerr/clkerr1_average" -#define CLKERR_ACC_SYSFS "/var/lc15/clkerr/clkerr1_average_accuracy" -#define CLKERR_INT_SYSFS "/var/lc15/clkerr/clkerr1_average_interval" -#define CLKERR_FLT_SYSFS "/var/lc15/clkerr/clkerr1_fault" -#define CLKERR_RFS_SYSFS "/var/lc15/clkerr/refresh" -#define CLKERR_RST_SYSFS "/var/lc15/clkerr/reset" +#define CLKERR_ERR_SYSFS "/run/lc15/clkerr/clkerr1_average" +#define CLKERR_ACC_SYSFS "/run/lc15/clkerr/clkerr1_average_accuracy" +#define CLKERR_INT_SYSFS "/run/lc15/clkerr/clkerr1_average_interval" +#define CLKERR_FLT_SYSFS "/run/lc15/clkerr/clkerr1_fault" +#define CLKERR_RFS_SYSFS "/run/lc15/clkerr/refresh" +#define CLKERR_RST_SYSFS "/run/lc15/clkerr/reset" -#define OCXODAC_VAL_SYSFS "/var/lc15/ocxo/voltage" -#define OCXODAC_ROM_SYSFS "/var/lc15/ocxo/eeprom" +#define OCXODAC_VAL_SYSFS "/run/lc15/ocxo/voltage" +#define OCXODAC_ROM_SYSFS "/run/lc15/ocxo/eeprom" /* clock error */ static int clkerr_fd_err = -1; diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c index 903c5fe..9a1de6c 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c @@ -47,7 +47,7 @@ #include #include -#define ETH0_ADDR_SYSFS"/var/lc15/net/eth0/address" +#define ETH0_ADDR_SYSFS"/run/lc15/net/eth0/address" static struct osmo_fd nl_fd; diff --git a/src/osmo-bts-litecell15/misc/lc15bts_power.c b/src/osmo-bts-litecell15/misc/lc15bts_power.c index 5b01d36..b20d374 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_power.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_power.c @@ -30,18 +30,18 @@ #define LC15BTS_PA_VOLTAGE 2400 -#define PA_SUPPLY_MIN_SYSFS "/var/lc15/pa-supply/min_microvolts" -#define PA_SUPPLY_MAX_SYSFS "/var/lc15/pa-supply/max_microvolts" +#define PA_SUPPLY_MIN_SYSFS "/run/lc15/pa-supply/min_microvolts" +#define PA_SUPPLY_MAX_SYSFS "/run/lc15/pa-supply/max_microvolts" static const char *power_enable_devs[_NUM_POWER_SOURCES] = { - [LC15BTS_POWER_PA0] = "/var/lc15/pa-state/pa0/state", - [LC15BTS_POWER_PA1] = "/var/lc15/pa-state/pa1/state", + [LC15BTS_POWER_PA0] = "/run/lc15/pa-state/pa0/state", + [LC15BTS_POWER_PA1] = "/run/lc15/pa-state/pa1/state", }; static const char *power_sensor_devs[_NUM_POWER_SOURCES] = { - [LC15BTS_POWER_SUPPLY] =
osmo-bts[master]: lc15: use directory instead of symlink
Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/2935 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6208a1f7d62cac7ef64459e62f8e6083b0025580 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
osmo-bts[master]: lc15: use directory instead of symlink
Patch Set 1: It would be even better to use RuntimeDirectory= option for script's oneshot service but this would require modifications to lc15-sysdev-remap to use /run paths. -- To view, visit https://gerrit.osmocom.org/2935 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6208a1f7d62cac7ef64459e62f8e6083b0025580 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
[PATCH] osmo-bts[master]: lc15: use directory instead of symlink
Review at https://gerrit.osmocom.org/2935 lc15: use directory instead of symlink Use the directory populated by lc15-sysdev-remap directly instead of symlink to it to simplify OE builds and troubleshooting. Change-Id: I6208a1f7d62cac7ef64459e62f8e6083b0025580 Related: SYS#3686 --- M src/osmo-bts-litecell15/hw_misc.c M src/osmo-bts-litecell15/misc/lc15bts_bid.c M src/osmo-bts-litecell15/misc/lc15bts_clock.c M src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c M src/osmo-bts-litecell15/misc/lc15bts_power.c M src/osmo-bts-litecell15/misc/lc15bts_temp.c 6 files changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/2935/1 diff --git a/src/osmo-bts-litecell15/hw_misc.c b/src/osmo-bts-litecell15/hw_misc.c index 49232b2..a2ec31b 100644 --- a/src/osmo-bts-litecell15/hw_misc.c +++ b/src/osmo-bts-litecell15/hw_misc.c @@ -63,7 +63,7 @@ return -EINVAL; } - fd = open("/var/lc15/leds/led0/brightness", O_WRONLY); + fd = open("/var/volatile/lc15/leds/led0/brightness", O_WRONLY); if (fd < 0) return -ENODEV; @@ -73,7 +73,7 @@ } close(fd); - fd = open("/var/lc15/leds/led1/brightness", O_WRONLY); + fd = open("/var/volatile/lc15/leds/led1/brightness", O_WRONLY); if (fd < 0) return -ENODEV; diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.c b/src/osmo-bts-litecell15/misc/lc15bts_bid.c index 06a126a..bd88f7e 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_bid.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_bid.c @@ -27,8 +27,8 @@ #include "lc15bts_bid.h" -#define BOARD_REV_SYSFS"/var/lc15/platform/revision" -#define BOARD_OPT_SYSFS"/var/lc15/platform/option" +#define BOARD_REV_SYSFS"/var/volatile/lc15/platform/revision" +#define BOARD_OPT_SYSFS"/var/volatile/lc15/platform/option" static const int option_type_mask[_NUM_OPTION_TYPES] = { [LC15BTS_OPTION_OCXO] = 0x07, diff --git a/src/osmo-bts-litecell15/misc/lc15bts_clock.c b/src/osmo-bts-litecell15/misc/lc15bts_clock.c index f4df5d3..0d62a35 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_clock.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_clock.c @@ -27,15 +27,15 @@ #include "lc15bts_clock.h" -#define CLKERR_ERR_SYSFS "/var/lc15/clkerr/clkerr1_average" -#define CLKERR_ACC_SYSFS "/var/lc15/clkerr/clkerr1_average_accuracy" -#define CLKERR_INT_SYSFS "/var/lc15/clkerr/clkerr1_average_interval" -#define CLKERR_FLT_SYSFS "/var/lc15/clkerr/clkerr1_fault" -#define CLKERR_RFS_SYSFS "/var/lc15/clkerr/refresh" -#define CLKERR_RST_SYSFS "/var/lc15/clkerr/reset" +#define CLKERR_ERR_SYSFS "/var/volatile/lc15/clkerr/clkerr1_average" +#define CLKERR_ACC_SYSFS "/var/volatile/lc15/clkerr/clkerr1_average_accuracy" +#define CLKERR_INT_SYSFS "/var/volatile/lc15/clkerr/clkerr1_average_interval" +#define CLKERR_FLT_SYSFS "/var/volatile/lc15/clkerr/clkerr1_fault" +#define CLKERR_RFS_SYSFS "/var/volatile/lc15/clkerr/refresh" +#define CLKERR_RST_SYSFS "/var/volatile/lc15/clkerr/reset" -#define OCXODAC_VAL_SYSFS "/var/lc15/ocxo/voltage" -#define OCXODAC_ROM_SYSFS "/var/lc15/ocxo/eeprom" +#define OCXODAC_VAL_SYSFS "/var/volatile/lc15/ocxo/voltage" +#define OCXODAC_ROM_SYSFS "/var/volatile/lc15/ocxo/eeprom" /* clock error */ static int clkerr_fd_err = -1; diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c b/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c index 903c5fe..8fcd7e6 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr_nl.c @@ -47,7 +47,7 @@ #include #include -#define ETH0_ADDR_SYSFS"/var/lc15/net/eth0/address" +#define ETH0_ADDR_SYSFS"/var/volatile/lc15/net/eth0/address" static struct osmo_fd nl_fd; diff --git a/src/osmo-bts-litecell15/misc/lc15bts_power.c b/src/osmo-bts-litecell15/misc/lc15bts_power.c index 5b01d36..6d01608 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_power.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_power.c @@ -30,18 +30,18 @@ #define LC15BTS_PA_VOLTAGE 2400 -#define PA_SUPPLY_MIN_SYSFS "/var/lc15/pa-supply/min_microvolts" -#define PA_SUPPLY_MAX_SYSFS "/var/lc15/pa-supply/max_microvolts" +#define PA_SUPPLY_MIN_SYSFS "/var/volatile/lc15/pa-supply/min_microvolts" +#define PA_SUPPLY_MAX_SYSFS "/var/volatile/lc15/pa-supply/max_microvolts" static const char *power_enable_devs[_NUM_POWER_SOURCES] = { - [LC15BTS_POWER_PA0] = "/var/lc15/pa-state/pa0/state", - [LC15BTS_POWER_PA1] = "/var/lc15/pa-state/pa1/state", + [LC15BTS_POWER_PA0] = "/var/volatile/lc15/pa-state/pa0/state", + [LC15BTS_POWER_PA1] = "/var/volatile/lc15/pa-state/pa1/state", }; static const char *power_sensor_devs[_NUM_POWER_SOURCES] = { -