Making iterative changes to core.git

[lattera]

It has been a while since I last did any development in core.git. I've made my initial DVD ISO image of a custom build of OPNsense 20.7. After building that initial DVD ISO, I made changes to core.git.

I tried running `make clean-dvd clean-core dvd` to try to pick up the changes I made to core.git (related to Suricata), but the newly-built DVD ISO didn't pick up the changes. Am I missing a step or doing something wrong?

Any non-XKCD pointers would be very much appreciated. Thanks!

[lattera]

I even did a `make clean` to start afresh and my changes to core.git aren't being pulled in. What am I doing wrong?

[franco]

Hi Shawn,

Have you committed your changes? Have you set COREBRANCH= accordingly? Are you using a production or development package?

It might help inspecting the packages set to see which version got built.


Cheers,
Franco

[lattera]

I haven't committed the changes. I'm on the master branch in tools.git and set SETTINGS to 20.7. Do the changes need to be committed before the build framework picks them up?

Output of `git status` in core.git:

On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/generalSettings.xml
        modified:   src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml

no changes added to commit (use "git add" and/or "git commit -a")

[lattera]

Problem solved through discussion over IRC. Thanks, fitch, for the help!

[franco]

PS: changes need to be committed in order to bake them into an image.