Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scripts: Kernel bumper script #14713

Merged
merged 1 commit into from Mar 11, 2024
Merged

scripts: Kernel bumper script #14713

merged 1 commit into from Mar 11, 2024

Commits on Mar 11, 2024

  1. scripts: Kernel bumper script

    For years, we have struggled and been frustrated at loosing history of
    files in git, due to the 'copy + add' strategy. This could have been
    prevented with a double-commit 'mv + add' trick.
    
    On the mailing list [0] the discussion was started to put the
    instructions in a wiki. Instead, it is much better to just script it and
    put it in the repo.
    
    Instead of doing mv + copy, which leads to two commits, but no history
    on the copied files, it uses move, + copy and merge, which results in
    three (merge) commits, but keeps the history of all files. As always
    with renames, `--follow` will be needed.
    
    The tool is trivial and works either in the OpenWrt git root directory,
    or in the actual target directory.
    
    Tested on the `realtek` and generic targets.
    
    Note, that the tool does not do any of the labor needed after the move,
    such as updating configs, dropping patches etc.
    
    To make sure this script is easily found by any developer, who just
    wants to do a kernel bump, the script is added here and not to
    maintainer-tools repo as those scripts are a little bit more specialized.
    Bumping a kernel is a trivial task that often regular developers do,
    where most do not even know the existence of maintainer tools, are not
    part of the main repo they'd clone, not part of the docker container
    they'd use and so discoverability is probably much more important.
    
    [0]: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html
    
    Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
    Tested-by: Robert Marko <robimarko@gmail.com>
    Tested-by: Weijie Gao <hackpascal@gmail.com>
    oliv3r authored and robimarko committed Mar 11, 2024
    Copy the full SHA
    3561015 View commit details
    Browse the repository at this point in the history