CONFIG-Option "VERSION_NICK" has been dropped upstream

freifunk-berlin / firmware

DEPRECATED: Build system for Berlin firmware. Please user the pinned falter-repos instead

https://berlin.freifunk.net

GNU General Public License v3.0

73 stars 34 forks source link

CONFIG-Option "VERSION_NICK" has been dropped upstream #515

Closed SvenRoederer closed 5 years ago

SvenRoederer commented 6 years ago

In https://github.com/openwrt/openwrt/commit/d573b1287e1b4ace7680d5dbfde20ba25e428b17 wurde in OpenWRT die CONFIG-Option "VERSION_NICK" abgeschafft. In diesem Feld haben wir bisher immer unseren Releasename ("Kathleen", "Hedy", ...) gehabt. Ich sehe folgende Möglichkeiten:

wir verzichten drauf, dass der Releasename in der Firmware auftaucht und haben dann einfach nur die Versionsnummern
wir legen die Parameter "VERSION_DIST" und "VERSION_NICK" zusammen ("VERSION_DIST=Freifunk Berlin Hedy")

SvenRoederer commented 6 years ago

lt. Commit https://github.com/openwrt/openwrt/commit/d23e1e1e1a3eede59d7da21cafe0ba69c0e81458#diff-973cc0b123811266b40567a4554dd8a6R44 kann es sein, dass die Leerzeichen, die wir nutzen das "opkg" verwirren wird. Mit https://github.com/freifunk-berlin/firmware/commit/a1d918c69291deb9f2117cdd69813837358582cb probier ich das mal aus.

bobster-galore commented 6 years ago

We should consider that it doesn't break the here https://github.com/freifunk-berlin/firmware/issues/22#issuecomment-357826321 mentioned autoupdater ( app ).

bobster-galore commented 5 years ago

And what was the outcome of ur test? Is it still valid? Is it a blocker?

bobster-galore commented 5 years ago

As proposed by @SvenRoederer we combine to ("VERSION_DIST=Freifunk_Berlin_Hedy") and use underscores to circumvent problems which probably arise from whitespaces?

SvenRoederer commented 5 years ago

Please comment my idea from https://github.com/freifunk-berlin/firmware/commit/359e7ff2f5ea8d8ceb6bcea9b2f1740f043a9e6d.

As the CONFIG-Values directly map to /etc/openwrt_release

DISTRIB_ID='Freifunk Berlin' <-- CONFIG_VERSION_DIST DISTRIB_RELEASE='2018-alpha' <-- CONFIG_VERSION_NUMBER DISTRIB_REVISION='6e8f9f1' <-- git-version / git-tag

this ensues we have the Release only in one datafield (DISTRIB_RELEASE) and not spread over ID and RELEASE, which will make parsing more painful

SvenRoederer commented 5 years ago

Any progress in deciding if we will go like 0a16b523d46a6d9febef5c17daf91c675ab1953f or 6bda7f7 ?

SvenRoederer commented 5 years ago

fixed by 38d417268b53db0803038f36ac4ef4bc26f219de + f8847ffb682a6f0c615f6afd9624ca8ae16f2969