| Message ID | 20200102223441.1491-1-freifunk@adrianschmutzler.de |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile index 42bf78e2..9c2f76d9 100644 --- a/src/packages/fff/fff-boardname/Makefile +++ b/src/packages/fff/fff-boardname/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-boardname -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname similarity index 100% rename from src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname rename to src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
Hi Adrian, da gibt's nicht viel zu sagen, ist so. Reviewed-by: Robert Langhammer <rlanghammer@web.de> Am 02.01.20 um 23:34 schrieb Adrian Schmutzler: > The WiFi configuration scripts have been moved to an earlier point > in initialization sequence in c39de8f7d5c5 ("fff-wireless: initialize > WiFi config before setting up wXsta"), which has them run before > the script setting board name in uci config files. Since the script > setting manual antenna gain and fixing rssileds depends on having a > board name, though, the move broke this functionality. > > Since the board name set up script itself does not depend on anything > else in the uci-defaults scripts, let's move this one to a relatively > early point in initialization (and save us from touching anything > else). > > Fixes: c39de8f7d5c5 ("fff-wireless: initialize WiFi config before setting up wXsta") > Fixes: #135 > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-boardname/Makefile | 2 +- > .../etc/uci-defaults/{50-fff-boardname => 15-fff-boardname} | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename src/packages/fff/fff-boardname/files/etc/uci-defaults/{50-fff-boardname => 15-fff-boardname} (100%) > > diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile > index 42bf78e2..9c2f76d9 100644 > --- a/src/packages/fff/fff-boardname/Makefile > +++ b/src/packages/fff/fff-boardname/Makefile > @@ -1,7 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-boardname > -PKG_RELEASE:=5 > +PKG_RELEASE:=6 > > PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) > > diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname > similarity index 100% > rename from src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname > rename to src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
Hi guter Fund danke Reviewed-by: Christian Dresel <fff@chrisi01.de> Gruß Christian On 02.01.20 23:34, Adrian Schmutzler wrote: > The WiFi configuration scripts have been moved to an earlier point > in initialization sequence in c39de8f7d5c5 ("fff-wireless: initialize > WiFi config before setting up wXsta"), which has them run before > the script setting board name in uci config files. Since the script > setting manual antenna gain and fixing rssileds depends on having a > board name, though, the move broke this functionality. > > Since the board name set up script itself does not depend on anything > else in the uci-defaults scripts, let's move this one to a relatively > early point in initialization (and save us from touching anything > else). > > Fixes: c39de8f7d5c5 ("fff-wireless: initialize WiFi config before setting up wXsta") > Fixes: #135 > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-boardname/Makefile | 2 +- > .../etc/uci-defaults/{50-fff-boardname => 15-fff-boardname} | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename src/packages/fff/fff-boardname/files/etc/uci-defaults/{50-fff-boardname => 15-fff-boardname} (100%) > > diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile > index 42bf78e2..9c2f76d9 100644 > --- a/src/packages/fff/fff-boardname/Makefile > +++ b/src/packages/fff/fff-boardname/Makefile > @@ -1,7 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-boardname > -PKG_RELEASE:=5 > +PKG_RELEASE:=6 > > PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) > > diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname > similarity index 100% > rename from src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname > rename to src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname >
Reviewed-by: Fabian Bläse <fabian@blaese.de> und applied. Gruß Fabian On 02.01.20 23:34, Adrian Schmutzler wrote: > The WiFi configuration scripts have been moved to an earlier point > in initialization sequence in c39de8f7d5c5 ("fff-wireless: initialize > WiFi config before setting up wXsta"), which has them run before > the script setting board name in uci config files. Since the script > setting manual antenna gain and fixing rssileds depends on having a > board name, though, the move broke this functionality. > > Since the board name set up script itself does not depend on anything > else in the uci-defaults scripts, let's move this one to a relatively > early point in initialization (and save us from touching anything > else). > > Fixes: c39de8f7d5c5 ("fff-wireless: initialize WiFi config before setting up wXsta") > Fixes: #135 > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-boardname/Makefile | 2 +- > .../etc/uci-defaults/{50-fff-boardname => 15-fff-boardname} | 0 > 2 files changed, 1 insertion(+), 1 deletion(-) > rename src/packages/fff/fff-boardname/files/etc/uci-defaults/{50-fff-boardname => 15-fff-boardname} (100%) > > diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile > index 42bf78e2..9c2f76d9 100644 > --- a/src/packages/fff/fff-boardname/Makefile > +++ b/src/packages/fff/fff-boardname/Makefile > @@ -1,7 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-boardname > -PKG_RELEASE:=5 > +PKG_RELEASE:=6 > > PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) > > diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname > similarity index 100% > rename from src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname > rename to src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname >
The WiFi configuration scripts have been moved to an earlier point in initialization sequence in c39de8f7d5c5 ("fff-wireless: initialize WiFi config before setting up wXsta"), which has them run before the script setting board name in uci config files. Since the script setting manual antenna gain and fixing rssileds depends on having a board name, though, the move broke this functionality. Since the board name set up script itself does not depend on anything else in the uci-defaults scripts, let's move this one to a relatively early point in initialization (and save us from touching anything else). Fixes: c39de8f7d5c5 ("fff-wireless: initialize WiFi config before setting up wXsta") Fixes: #135 Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- src/packages/fff/fff-boardname/Makefile | 2 +- .../etc/uci-defaults/{50-fff-boardname => 15-fff-boardname} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/packages/fff/fff-boardname/files/etc/uci-defaults/{50-fff-boardname => 15-fff-boardname} (100%)