Edit diffconfig to match branch version

For Developers
1

I'm taking hyman's advice and compiling from head 23.05, but mydiffconfig is v23.05.2.
I would like to git clone -b openwrt-23.05 instead. Is it possible to only correct that line?

CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05.2"

2

Which it should be. 23.05 is the current release, and 23.05.2 is the latest stable. Should be no difference.

You don't git clone a branch. git clone encompasses all branches.

If you call git branch -a you can see which branch you are currently sitting on. Likely * openwrt-23.05 What does it return?

3

I apologize for the confusion. My goal is to compile from head (since any new commits/fixed seem to land there), while still retaining my current diffconfig.

4

jason@ubuntuserver:~/openwrt$ git branch -a

  • (HEAD detached at v23.05.2)
    master
    remotes/origin/HEAD -> origin/master
    remotes/origin/lede-17.01
    remotes/origin/main
    remotes/origin/master
    remotes/origin/openwrt-18.06
    remotes/origin/openwrt-19.07
    remotes/origin/openwrt-21.02
    remotes/origin/openwrt-22.03
    remotes/origin/openwrt-23.05
5

You are currently on the fixed release commit, not the actual 23.05 branch.

You should do git checkout openwrt-23.05 to get the actual branch.

6

Well, the the fixed 23.05.2 release commit is about 80 commits behind the head of the 23.05 release branch. "Stable" refers to whole 23.05, both the whole branch and the fixed releases made from it.
https://git.openwrt.org/?p=openwrt/openwrt.git;a=shortlog;h=refs/heads/openwrt-23.05

1 Like
7

I understood from the O/P's post that they would likely find they were building from stable 23.05.2 based on their post. That's why i requested the return of git branch -a. I guess I should have used "should" instead of "likely'.

Correct me if I'm wrong, but once using the 23.05 Snapshot, git pull in the normal course of things would add those commits to his build and he could use ./scripts/diffconfig.sh to create a new default config.

8

That's the 23.05.0 branch correct?

9

Hynman’s git checkout openwrt-23.05 will put you at the Head of the 23.05 release.

If you do a git branch -a it should indicate * openwrt-23.05.

Now, if you do a git pull followed by a git log the first line displayed will indicate the latest commit since 23.05.2 was released and clearly indicate you are at the Head of the 23.05 release (I think of it as a Release Snapshot because it evolves and 23.05.1/23.05.2 as Stable/static based on their last commit at release) enter ‘q’ to exit the log.

If still on your 23.05.2 branch, do a git log and note the last commit. Once you move to the 23.05 Head, you can see that in the git log Head has advanced past the 23.05.2 release.

When you run make nconfig/menuconfig It should update your current .config.

2 Likes
10

Just like I wrote above: That will get you the HEAD of the openwrt-23.05 branch. (Not v23.05.0 or v23.05.2 tags)

Think it this way:

  • For each major release, a new release branch is created (e.g. openwrt-23.05 in May 2023), while the actual development always continues on the main/master branch.
  • Fixes are committed into the release branch. Some new stuff can be selectively backported, but not much as the branch is supposed to be "stable". So, largely the main OpenWrt contents in 23.05 remain as in May 2023.

OpenwrtBranches_10_2023
OpenwrtBranches_10_20231500×344 63.3 KB

Building:

  • If you build from the git HEAD of that branch (like you now want), you will get a "snapshot" build of that branch. Buildbot and private builds will show that as 23.05-SNAPSHOT
  • Fixed releases like 23.05.0 and 23.05.2 are made from that same 23.05 branch by creating a release tag like v23.05.2 which you can also checkout (like you originally did). And then build from that tag to "get the release".

Note that if you build

  • from branch HEAD, you will also the packages and LuCI feeds' newer fixes from their 23.05 branch HEADs.
  • from v23.05.2 release tag, also the feeds (packages, LuCI) are locked to the release moment, so your build will not have the fixed 23.05 stuff.

For that reason I always build my own 23.05 builds from the HEAD, not the antique fixed release point.

The fixed releases are visible in the openwrt-2305 branch history, curently some 80-100 commits behind the current HEAD: https://git.openwrt.org/?p=openwrt/openwrt.git;a=shortlog;h=refs/heads/openwrt-23.05

Ps.
The "diffconfig" of the topic title has no role in branch or commit selection.

2 Likes
11

This was the line I was looking for:

CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/23.05-SNAPSHOT"

Ah, thank you for the information on clarification on this. I really appreciate it!

12

This topic was automatically closed 10 days after the last reply. New replies are no longer allowed.