maintainer-tools.git
4 days agomakebranch: update default branch from master to main master
Christian Marangi [Thu, 31 Oct 2024 21:46:42 +0000 (22:46 +0100)]
makebranch: update default branch from master to main

Update default branch from master to main to make the script usable
again.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
3 months agogithub-merge-pr: doc: Install extra git-filter-repo
Hauke Mehrtens [Sat, 6 Jul 2024 16:07:25 +0000 (18:07 +0200)]
github-merge-pr: doc: Install extra git-filter-repo

The git filter-repo command is not available by default.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
3 months agogithub-merge-pr: Add option to ignore .mergeable
Hauke Mehrtens [Sat, 6 Jul 2024 16:07:24 +0000 (18:07 +0200)]
github-merge-pr: Add option to ignore .mergeable

The option IGNORE_MERGEABLE allows to ignore if the PR is mergeable.
This allows to prepare PRs which can not be force pushed with this
script.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
3 months agogithub-merge-pr: Add option for no remote operations
Hauke Mehrtens [Sat, 6 Jul 2024 16:07:23 +0000 (18:07 +0200)]
github-merge-pr: Add option for no remote operations

This adds the new option GITHUB_NO_PUSH which will prevent the script
from doing any changes to remote repositories.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
3 months agogithub-merge-pr: Use GITHUB_TOKEN for API access
Hauke Mehrtens [Sat, 6 Jul 2024 16:07:22 +0000 (18:07 +0200)]
github-merge-pr: Use GITHUB_TOKEN for API access

Use the GITHUB_TOKEN also for the public https://api.github.com
accesses. Over some networks like public hotspots github is blocking
unauthenticated access.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
6 months agogithub-merge-pr: fix loading .config if symbolic link is used
Christian Marangi [Thu, 2 May 2024 12:26:40 +0000 (14:26 +0200)]
github-merge-pr: fix loading .config if symbolic link is used

Fix loading of .config is symbolic link is used to reference the
github-merge-pr.sh script.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
6 months agogithub-merge-pr: correctly reference .config from script directory
Christian Marangi [Mon, 29 Apr 2024 21:27:15 +0000 (23:27 +0200)]
github-merge-pr: correctly reference .config from script directory

Currently the script reference the .config from the current directory
instead of using the directory where the script is located.

Use dirname $0 to correctly reference the .config in the script
directory instead of the current directory where the script is executed.

Fixes: a598bb477585 ("github-merge-pr: move script config to separate file")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
6 months agogithub-merge-pr: remove newline on removing SoB from committer
Christian Marangi [Mon, 29 Apr 2024 21:26:11 +0000 (23:26 +0200)]
github-merge-pr: remove newline on removing SoB from committer

Remove newline on removing SoB from committer if necessary to keep
commit description tags tidy.

Fixes: c1f80d0258a7 ("github-merge-pr: add Link: tag and Committer SoB")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
6 months agogithub-merge-pr: move script config to separate file
Christian Marangi [Mon, 29 Apr 2024 10:40:17 +0000 (12:40 +0200)]
github-merge-pr: move script config to separate file

Move script config to separate file, .config, to make it easier to
update the script and pull changes without having to rebase or re-set
values.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
6 months agogithub-merge-pr: use --force for filter-repo commands
Christian Marangi [Mon, 29 Apr 2024 10:22:37 +0000 (12:22 +0200)]
github-merge-pr: use --force for filter-repo commands

Use --force for filter-repo commands to handle special branch merged by
Committer that wouldn't be fresh copy as required by filter-repo
commands.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
6 months agogithub-merge-pr: follow GITHUB_REPO_OWNER/GITHUB_REPO_NAME for Link tag
Christian Marangi [Mon, 29 Apr 2024 10:21:13 +0000 (12:21 +0200)]
github-merge-pr: follow GITHUB_REPO_OWNER/GITHUB_REPO_NAME for Link tag

Follow GITHUB_REPO_OWNER/GITHUB_REPO_NAME for Link tag instead of
hardcoding to openwrt/openwrt.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
6 months agogithub-merge-pr: add Link: tag and Committer SoB
Christian Marangi [Sat, 27 Apr 2024 11:31:33 +0000 (13:31 +0200)]
github-merge-pr: add Link: tag and Committer SoB

If we can rebase the Pull Request, append the Link: tag and Committer SoB
tag to the end of the commit message to better reference the source of
the commit and who Approved/Committed.

In theory any modification to the commit should always have a SoB hence
a committer rebasing the Pull Request should add the SoB tag.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
8 months agoupdate_git_source_package.sh: misc fixes
Jo-Philipp Wich [Wed, 21 Feb 2024 20:52:16 +0000 (21:52 +0100)]
update_git_source_package.sh: misc fixes

 - Canonicalize TOPDIR
 - Fix github issue reference URLs

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
8 months agogithub-merge-pr: permit to target other repository name
Christian Marangi [Fri, 16 Feb 2024 14:13:46 +0000 (15:13 +0100)]
github-merge-pr: permit to target other repository name

Add support to target other repository name by passing the repository as
a 3rd arg to the script.

Example:

github-merge-pr.sh 23 main ubus

Will rebase and merge PR 23 in branch main for repository ubus.

Also add additional info on the additional args the script supports.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
8 months agogithub-merge-pr: add generic enough instruction on how to use the script
Christian Marangi [Thu, 15 Feb 2024 20:56:45 +0000 (21:56 +0100)]
github-merge-pr: add generic enough instruction on how to use the script

Add generic enough instruction on how to use the github-merge-pr script.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
8 months agogithub-merge-pr: default to main branch if not specified
Christian Marangi [Thu, 15 Feb 2024 20:54:58 +0000 (21:54 +0100)]
github-merge-pr: default to main branch if not specified

Default to main branch if not specified to align to openwrt branch using
main instead of master as the default branch.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
8 months agogithub-merge-pr: add option to use SSH key for github auth
Christian Marangi [Thu, 15 Feb 2024 20:53:55 +0000 (21:53 +0100)]
github-merge-pr: add option to use SSH key for github auth

Add option to use SSH key for github auth.

To enable this, edit the script and uncomment the USE_SSH=1 line.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
11 months agoupdate_git_source_package: override CONFIG_SRC_TREE_OVERRIDE
Felix Fietkau [Tue, 21 Nov 2023 21:15:26 +0000 (22:15 +0100)]
update_git_source_package: override CONFIG_SRC_TREE_OVERRIDE

Fixes download when git-src is present and CONFIG_SRC_TREE_OVERRIDE is set

Signed-off-by: Felix Fietkau <nbd@nbd.name>
11 months agoupdate_git_source_package: add STAGING_DIR_HOST to PATH
Felix Fietkau [Mon, 20 Nov 2023 18:15:08 +0000 (19:15 +0100)]
update_git_source_package: add STAGING_DIR_HOST to PATH

Avoids relying on incompatible/missing system utilities

Signed-off-by: Felix Fietkau <nbd@nbd.name>
11 months agoupdate_git_source_package: add fixed issues to commit message
Jo-Philipp Wich [Tue, 14 Nov 2023 14:36:08 +0000 (15:36 +0100)]
update_git_source_package: add fixed issues to commit message

Add some heuristics to map `Fixes:` tags in commit messages to issue URLs.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
11 months agoupdate_git_source_package: use 12 char long hash for bump commits
Christian Marangi [Fri, 10 Nov 2023 12:15:33 +0000 (13:15 +0100)]
update_git_source_package: use 12 char long hash for bump commits

The default value for abbrev commit is too small and might pose invalid
hash referencing one hash with another. Use the current common size of
12 char for abbrev hash to better reference them following how it's done
on linux kernel and github.com.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
11 months agoadd a script for bumping packages using Git repository sources
Jo-Philipp Wich [Fri, 10 Nov 2023 11:07:40 +0000 (12:07 +0100)]
add a script for bumping packages using Git repository sources

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
12 months agogithub-merge-pr: be more conservative with git fetch
Christian Marangi [Thu, 2 Nov 2023 19:36:06 +0000 (20:36 +0100)]
github-merge-pr: be more conservative with git fetch

Be more conservative with git fetch and fetch only the require branch
for both origin and PR branch.

This should speedup git fetch and save on disk space as only the
required history and changes are downloaded.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
13 months agogithub-merge-pr: add support for merging PR that can't be rebased
Christian Marangi [Thu, 5 Oct 2023 10:33:40 +0000 (12:33 +0200)]
github-merge-pr: add support for merging PR that can't be rebased

Add support for merging PR that can't be rebased if the user didn't
permit force push by maintainers. The script will fetch the remote
origin and try to merge with --ff-only without rebasing.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
21 months agogithub-merge-pr: add check for working on clean branch
Christian Marangi [Wed, 11 Jan 2023 15:21:11 +0000 (16:21 +0100)]
github-merge-pr: add check for working on clean branch

With error it may happen to work on a dirty branch and unintended
changes may be merged on merging a different pull request.

Add a check for it and exit with an error text.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
21 months agogithub-merge-pr: ask for confirmation before pushing to git
Christian Marangi [Wed, 11 Jan 2023 15:01:50 +0000 (16:01 +0100)]
github-merge-pr: ask for confirmation before pushing to git

Ask for confirmation before pushing to git. This can be useful to give
an extra and last look at the merging pull request.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2 years agogithub-merge-pr: handle user using master as pushing repo
Christian Marangi [Fri, 14 Oct 2022 12:48:48 +0000 (14:48 +0200)]
github-merge-pr: handle user using master as pushing repo

Some user may use master or other openwrt repo as the pr repo. This is
problematic as we checkout with the pr repo name and this may conflict
with the current openwrt branch name.

Fix it and checkout the local branch with the pr repo name + the pr
author.

Example:

usertest123:master is checkout to master-usertest123

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2 years agogithub-merge-pr: fix typo and correctly exit on error
Christian Marangi [Mon, 19 Sep 2022 18:07:05 +0000 (20:07 +0200)]
github-merge-pr: fix typo and correctly exit on error

Fix typo where echo is used instead of exit for exit error condition.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2 years agogithub-merge-pr: introduce new script to merge pr on github
Christian Marangi [Tue, 13 Sep 2022 22:08:11 +0000 (00:08 +0200)]
github-merge-pr: introduce new script to merge pr on github

Introduce a new script github-merge-pr.sh to facilitate merging pr from
github by flagging them as actually merged.

Assuming you are in the github repo.

Usage: github-merge-pr.sh <PR-ID> [rebase-branch] [dry-run]

PR-ID is PR #ID
rebase-branch is master to be rebased on (master,openwrt2..03...)
dry-run doesn't execute anything and is used to check what command will
be executed

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2 years agomake-changelog.pl: modify to read GitHub instead of FlySpray issues
Jo-Philipp Wich [Tue, 26 Apr 2022 18:08:26 +0000 (20:08 +0200)]
make-changelog.pl: modify to read GitHub instead of FlySpray issues

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2 years agomaketag.sh/makebranch.sh: Add https to https://downloads.openwrt.org
Hauke Mehrtens [Sat, 23 Apr 2022 20:10:15 +0000 (22:10 +0200)]
maketag.sh/makebranch.sh: Add https to https://downloads.openwrt.org

Since OpenWrt 21.02 we are using https to download the packages. Change
the default to https://downloads.openwrt.org. OpenWrt 19.07 was the last
release which did not support https.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2 years agomaketag.sh/makebranch.sh: Support src-git-full in feed
Hauke Mehrtens [Wed, 20 Apr 2022 22:54:36 +0000 (00:54 +0200)]
maketag.sh/makebranch.sh: Support src-git-full in feed

Add support for feeds added with src-git-full instead of src-git.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2 years agoupdate_kernel.sh: fix unified version file updates
Rui Salvaterra [Tue, 8 Feb 2022 13:17:03 +0000 (13:17 +0000)]
update_kernel.sh: fix unified version file updates

The previous commit broke the kernel-version.mk automated update, since the
kernel version files are now split. However, older branches still use the
unified file, so compatibility must be kept.

Check for the presence of the kernel version-specific file. If it doesn't exist,
assume we're using the unified file and do the version update accordingly.

Fixes: cbb9d08 ("update_kernel.sh: update it to new kernel hash/version file way")
Tested-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2 years agoupdate_kernel.sh: update it to new kernel hash/version file way
Ansuel Smith [Sun, 16 Jan 2022 20:35:32 +0000 (21:35 +0100)]
update_kernel.sh: update it to new kernel hash/version file way

OpenWrt changed how the hash/version of the various kernels are declared and
saved.
They are now placed in dedicated files. Fix the update_kernel.sh script to
update the kernel version/hash in the correct file.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[fix typos/wrapping]
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
3 years agomaketag.sh/makebranch.sh: handle https download URLs
Hauke Mehrtens [Mon, 19 Apr 2021 19:23:30 +0000 (21:23 +0200)]
maketag.sh/makebranch.sh: handle https download URLs

Since OpenWrt 21.02 we use https for our download server, detect these
URLs too.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
4 years agocheck-abi-version.pl: add ABI version checker
Jo-Philipp Wich [Fri, 31 Jan 2020 21:08:13 +0000 (22:08 +0100)]
check-abi-version.pl: add ABI version checker

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agomake-signatures.pl: LEDE => OpenWrt
Jo-Philipp Wich [Fri, 31 Jan 2020 21:05:47 +0000 (22:05 +0100)]
make-signatures.pl: LEDE => OpenWrt

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agomake-changelog.pl: update to revised version
Jo-Philipp Wich [Fri, 31 Jan 2020 21:05:02 +0000 (22:05 +0100)]
make-changelog.pl: update to revised version

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agoadd a Perl script to check for ABI_VERSION related things in packages
Jo-Philipp Wich [Thu, 24 Jan 2019 09:31:26 +0000 (10:31 +0100)]
add a Perl script to check for ABI_VERSION related things in packages

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agocount-contributions.sh: add script to count number of commits
Jo-Philipp Wich [Sun, 4 Nov 2018 15:59:50 +0000 (16:59 +0100)]
count-contributions.sh: add script to count number of commits

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
4 years agosob2from.sh: don't fail on author names with single quotes
Jo-Philipp Wich [Sun, 4 Nov 2018 14:02:45 +0000 (15:02 +0100)]
sob2from.sh: don't fail on author names with single quotes

Also only rewrite the author if the existing commit author does not appear
in any Signed-off-by line.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
5 years agogithub-apply: Added thank you to the PR close comment
Petr Štetiar [Mon, 25 Mar 2019 09:34:04 +0000 (10:34 +0100)]
github-apply: Added thank you to the PR close comment

Signed-off-by: Petr Štetiar <ynezz@true.cz>
6 years agopatchwork-apply.sh: use gsed for mac compatibility
Kevin Darbyshire-Bryant [Wed, 19 Sep 2018 08:04:15 +0000 (09:04 +0100)]
patchwork-apply.sh: use gsed for mac compatibility

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
6 years agoFix detection of lede branch.
Hauke Mehrtens [Sun, 15 Jul 2018 19:00:17 +0000 (21:00 +0200)]
Fix detection of lede branch.

The branch name looks like this for lede-17.01:
refs/heads/lede-17.01

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
6 years agomaketag.sh: decide LEDE/OpenWrt distro automatically
Jo-Philipp Wich [Sun, 15 Jul 2018 18:43:59 +0000 (20:43 +0200)]
maketag.sh: decide LEDE/OpenWrt distro automatically

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agomake-changelog.pl: fix reference to openwrt/openwrt.git
Jo-Philipp Wich [Sun, 15 Jul 2018 12:50:21 +0000 (14:50 +0200)]
make-changelog.pl: fix reference to openwrt/openwrt.git

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agomake-changelog.pl: use a cache directory, improve bug number detection
Jo-Philipp Wich [Sun, 15 Jul 2018 12:45:56 +0000 (14:45 +0200)]
make-changelog.pl: use a cache directory, improve bug number detection

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agomaketag.sh: adjust defaults for OpenWrt
Jo-Philipp Wich [Fri, 22 Jun 2018 10:34:45 +0000 (12:34 +0200)]
maketag.sh: adjust defaults for OpenWrt

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agopatchwork-apply.sh: remove explicit commit references
Jo-Philipp Wich [Sun, 4 Feb 2018 12:59:56 +0000 (13:59 +0100)]
patchwork-apply.sh: remove explicit commit references

Mentioning explicit commit hashes proved to be unreliable, especially
when frequently rebasing the tree, so only post generic repository
references instead.

Also avoid clobbering subjects in the form "[TAG] subject [foo]" where
the prevously used sed pattern would reduce the entire subject to an
empty string.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agogithub-apply.sh: remove unused variable
Jo-Philipp Wich [Sun, 4 Feb 2018 12:42:08 +0000 (13:42 +0100)]
github-apply.sh: remove unused variable

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agogithub-apply.sh: add script to rebase, merge and close Github pull requests
Jo-Philipp Wich [Sun, 4 Feb 2018 12:39:15 +0000 (13:39 +0100)]
github-apply.sh: add script to rebase, merge and close Github pull requests

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agomakebranch.sh: add helper script for creating release branches
Jo-Philipp Wich [Sun, 4 Feb 2018 12:27:20 +0000 (13:27 +0100)]
makebranch.sh: add helper script for creating release branches

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agopatchwork-apply.sh: handle OpenWrt repository structure
Jo-Philipp Wich [Sun, 4 Feb 2018 11:59:58 +0000 (12:59 +0100)]
patchwork-apply.sh: handle OpenWrt repository structure

Also cope with patch files lacking a file extensions, certain versions
of the Python patchwork client appear to omit it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agomake-changelog.pl: change references to openwrt.org
Jo-Philipp Wich [Sun, 4 Feb 2018 11:30:56 +0000 (12:30 +0100)]
make-changelog.pl: change references to openwrt.org

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1 from ldir-EDB0/master
Jo-Philipp Wich [Sun, 4 Feb 2018 11:23:21 +0000 (12:23 +0100)]
Merge pull request #1 from ldir-EDB0/master

update_kernel.sh: fix syntax error

6 years agoupdate_kernel.sh: fix syntax error
Kevin Darbyshire-Bryant [Sun, 4 Feb 2018 10:40:24 +0000 (10:40 +0000)]
update_kernel.sh: fix syntax error

Replace while [ $# > 0 ]; with while [ $# -gt 0 ]

The former redirects $# to a file '0' creating a stray file as the least
worrying of side effects.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
6 years agoupdate_kernel.sh: improve cross platform support
Kevin Darbyshire-Bryant [Sat, 23 Dec 2017 09:45:37 +0000 (09:45 +0000)]
update_kernel.sh: improve cross platform support

Use staging_dir/host for sed.  Improves compatibility with MacOS

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
6 years agoadd a script for updating the kernel
Jonas Gorski [Sun, 9 Apr 2017 15:05:27 +0000 (17:05 +0200)]
add a script for updating the kernel

Add a script for easily updating a kernel to a newer release, while
refreshing the patches, ensuring they still apply (and optionally also
ensure they build).

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
6 years agoadd a script to rewrite the commit author to reflect whats in Signed-off-by
Jo-Philipp Wich [Sat, 23 Dec 2017 11:03:19 +0000 (12:03 +0100)]
add a script to rewrite the commit author to reflect whats in Signed-off-by

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoadd a script to fetch patchwork patch, apply it and confirm it in patchwork and via...
Jo-Philipp Wich [Sat, 23 Dec 2017 11:02:18 +0000 (12:02 +0100)]
add a script to fetch patchwork patch, apply it and confirm it in patchwork and via email

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoadd a Perl script to update the key signature listing
Jo-Philipp Wich [Sat, 23 Dec 2017 10:59:54 +0000 (11:59 +0100)]
add a Perl script to update the key signature listing

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoadd a script for creating release tags
Jo-Philipp Wich [Sat, 23 Dec 2017 10:57:50 +0000 (11:57 +0100)]
add a script for creating release tags

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoadd a simple Perl script to generate a Git changelog in wiki markup format
Jo-Philipp Wich [Sat, 23 Dec 2017 10:56:15 +0000 (11:56 +0100)]
add a simple Perl script to generate a Git changelog in wiki markup format

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoinitial commit
Jonas Gorski [Sat, 23 Dec 2017 10:54:52 +0000 (11:54 +0100)]
initial commit