freifunk-franken
/
firmware
9
7
Fork 13
Code Issues 48 Pull Requests 7 Releases 17 Wiki Activity

treewide: set PKG_RELEASE automatically #202

Closed
fbl wants to merge 1 commits from fbl/firmware:autocommit into master
pull from: fbl/firmware:autocommit
merge into: freifunk-franken:master
Conversation 7 Commits 1 Files Changed 32 +32 -32
fbl commented 2022-01-06 01:31:41 +01:00
Owner
Copy Link

COMMITCOUNT allows to have the PKG_RELEASE calculated automatically
based on the number of commits for the package folder.

AUTORELEASE will count the number of commits since the last upstream
bump. This is relevant for packages with PKG_VERSION or
PKG_SOURCE_DATE set, but will not work for us since it assumes the
use of certain identifiers in commit titles.

COMMITCOUNT works fine for most of our packages, with the following
exceptions:

  • fff-nodewatcher would yield a commit count of 55, while the
    current PKG_RELEASE is 61. Thus, we do not touch it for now.

  • Packages that have been renamed will start counting from 1 after
    the rename, since folder renames are not tracked by git. This
    will result in descreasing PKG_RELEASE after the change for
    these packages.
    However, since moving essentially creates a new package anyway,
    counting from 1 makes sense conceptually, and PKG_RELEASE is
    still replaced for these packages.

  • alfred-json and fff-macnock use upstream code and thus would
    normally require AUTORELEASE. As discussed above, this will
    not work for us, so just leave these two untouched.

Note that all this is quite irrelevant for the way we use packages
currently, as without opkg PKG_RELEASE does not matter to us anyway.
So, let's just be happy about not having to bump PKG_RELEASE
anymore, while keeping the basic functionality intact.

The only package where the PKG_RELEASE is actually used for
something is fff-nodewatcher, where the version will be displayed
in the Monitoring.

Signed-off-by: Adrian Schmutzler freifunk@adrianschmutzler.de
[fabian@blaese.de: rebase, add new packages]
Signed-off-by: Fabian Bläse fabian@blaese.de

COMMITCOUNT allows to have the PKG_RELEASE calculated automatically based on the number of commits for the package folder. AUTORELEASE will count the number of commits since the last upstream bump. This is relevant for packages with PKG_VERSION or PKG_SOURCE_DATE set, but will not work for us since it assumes the use of certain identifiers in commit titles. COMMITCOUNT works fine for most of our packages, with the following exceptions: * fff-nodewatcher would yield a commit count of 55, while the current PKG_RELEASE is 61. Thus, we do not touch it for now. * Packages that have been renamed will start counting from 1 after the rename, since folder renames are not tracked by git. This will result in descreasing PKG_RELEASE after the change for these packages. However, since moving essentially creates a new package anyway, counting from 1 makes sense conceptually, and PKG_RELEASE is still replaced for these packages. * alfred-json and fff-macnock use upstream code and thus would normally require AUTORELEASE. As discussed above, this will not work for us, so just leave these two untouched. Note that all this is quite irrelevant for the way we use packages currently, as without opkg PKG_RELEASE does not matter to us anyway. So, let's just be happy about not having to bump PKG_RELEASE anymore, while keeping the basic functionality intact. The only package where the PKG_RELEASE is actually used for something is fff-nodewatcher, where the version will be displayed in the Monitoring. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> [fabian@blaese.de: rebase, add new packages] Signed-off-by: Fabian Bläse <fabian@blaese.de>
fbl added this to the 20220405-beta milestone 2022-01-06 01:31:41 +01:00
fbl added the
build/scripts/tools
 label 2022-01-06 01:31:41 +01:00
fbl self-assigned this 2022-01-06 01:31:41 +01:00
fbl commented 2022-01-06 11:42:40 +01:00
Author
Owner
Copy Link

The two currently missing packages can be fixed by:

  • layer3: Apply snat patchset first
  • fff-web-ui: Use $(shell echo -n $$(( $(COMMITCOUNT) + 20 )))
The two currently missing packages can be fixed by: - layer3: Apply snat patchset first - fff-web-ui: Use `$(shell echo -n $$(( $(COMMITCOUNT) + 20 )))`
fbl force-pushed autocommit from 415081ead4 to d740abea00 2022-01-06 11:43:49 +01:00 Compare
fbl force-pushed autocommit from d740abea00 to ad9a9a72e4 2022-01-06 11:44:41 +01:00 Compare
rohammer commented 2022-01-06 11:48:07 +01:00
Member
Copy Link

Ja, her damit!

Reviewed-by: Robert Langhammer <rlanghammer@web.de>
Ja, her damit! ``` Reviewed-by: Robert Langhammer <rlanghammer@web.de> ```
jkimmel commented 2022-01-06 19:02:18 +01:00
Owner
Copy Link

Interessehalber, was ist mit

  • alfred-json
  • fff-nodewatcher
  • fff-macnock
  • fff-web-mqtt

?

Interessehalber, was ist mit * `alfred-json` * `fff-nodewatcher` * `fff-macnock` * `fff-web-mqtt` ?
fbl force-pushed autocommit from ad9a9a72e4 to bdd1908126 2022-01-06 19:04:45 +01:00 Compare
fbl commented 2022-01-06 19:04:49 +01:00
Author
Owner
Copy Link

alfred-json, fff-nodewatcher und fff-macnock stehen in der commitmessage.

fff-web-mqtt ist mir tatsächlich durchgeruscht. Frag mich nicht, wie ich das geschafft habe, ist ergänzt.

alfred-json, fff-nodewatcher und fff-macnock stehen in der commitmessage. fff-web-mqtt ist mir tatsächlich durchgeruscht. Frag mich nicht, wie ich das geschafft habe, ist ergänzt.
fbl closed this pull request 2022-01-06 19:04:49 +01:00
fbl reopened this pull request 2022-01-06 19:04:53 +01:00
jkimmel commented 2022-01-06 19:11:43 +01:00
Owner
Copy Link

Richtig kapier ich das noch nicht:

  • alfred-json, fff-macnock
    Das sind doch unsere Pakete. Da können wir doch tun und lassen was wir wollen, oder?
  • fff-nodewatcher
    Kann man das nicht einfach auch per offset regeln?
Richtig kapier ich das noch nicht: * alfred-json, fff-macnock Das sind doch unsere Pakete. Da können wir doch tun und lassen was wir wollen, oder? * fff-nodewatcher Kann man das nicht einfach auch per offset regeln?
jkimmel commented 2022-01-06 19:57:30 +01:00
Owner
Copy Link

Ok, die Pakete lassen wir erst einmal. Erst einmal noch alfred-json und fff-machnock hier aufs gitea umziehen und dann bei der Gelegenheit anpassen.

fff-nodewatcher machen wir ebenfalls später, dass alles zur originalen Commitmessage passt.

Deshalb:

Reviewed-by: Johannes Kimmel <fff@bareminimum.eu>

Ok, die Pakete lassen wir erst einmal. Erst einmal noch `alfred-json` und `fff-machnock` hier aufs gitea umziehen und dann bei der Gelegenheit anpassen. `fff-nodewatcher` machen wir ebenfalls später, dass alles zur originalen Commitmessage passt. Deshalb: `Reviewed-by: Johannes Kimmel <fff@bareminimum.eu>`
fbl commented 2022-01-09 23:11:19 +01:00
Author
Owner
Copy Link

Wechsel zu $(COMMITCOUNT) für fff-layer3-snat ergänzt und applied.

Wechsel zu $(COMMITCOUNT) für fff-layer3-snat ergänzt und applied.
fbl closed this pull request 2022-01-09 23:11:19 +01:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
RFC

   
RFT

   
WIP

   
blocked

   
bsp

touching bsp files or adding devices

  
bug

Something is not working

  
build/scripts/tools

touching buildscript or other tools

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
fixed

Issue that got resolved

  
layer3

only for layer3 FW

  
mantis

Imported from mantis

  
more details required

Reported information is insufficient to debug the issue

  
needs changes

   
node

only for node FW

  
packages/fff

touching our packages

  
rejected

Rejected or won't fix

  
security

   
trivial

simple non-functional changes that are mostly matter of taste

  
upstream

touching upstream version, build or feed patches

No Label
RFC
RFT
WIP
blocked
bsp
bug
build/scripts/tools
duplicate
feature
fixed
layer3
mantis
more details required
needs changes
node
packages/fff
rejected
security
trivial
upstream
Milestone
Clear milestone
No items
No Milestone
20220405-beta
Assignees
Clear assignees
No Assignees
fbl
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: freifunk-franken/firmware#202
No description provided.
Delete Branch "fbl/firmware:autocommit"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?