<peterm6881>
new kernel out, so as an exercise I'm gonna update my build directory, yesy the kernel, and try to push it
<peterm6881>
test *
<peterm6881>
but I wanted to ask you
<peterm6881>
whats the correct way to update the version stamp on the image
<Xogium>
you mean release another version ?
<peterm6881>
yeah
<Xogium>
hmm typically I use a utility from git-extra, which adds commands to git that simplify this
<Xogium>
something like git release -c 2022-08-18
<Xogium>
that opens the changelog with all the commits since a release has been made and lets you edit it if you need, for example if the kernel has been bumped several times between 2 releases I usually only keep the latest one
<peterm6881>
whats git-extra?
<Xogium>
and then when you save the file it automatically pushes and tag the release for you
<peterm6881>
hmm...not sure what im supposed to do with that git
<Xogium>
there is an installation guide
<peterm6881>
got it, I named it git-extra by mistake, its in the Ubuntu repos
<peterm6881>
thanks Xogium
<Xogium>
you have to get the release number correct and such from the first shot, otherwise it will be a bit of a mess and you'll have to delete tags and the likes
<peterm6881>
kernel checked out ok
<peterm6881>
ok when I did git release 2022-08-18 as you said it fires up the changelog, what do I do with that?
<peterm6881>
just save it?
<Xogium>
feel free to tweak it however you like, rearrange lines, delete some if they are redundant like multiple kernel updates, etc
<Xogium>
then once you're done, you save it and it will automatically push the stuff on github and make a release
<peterm6881>
i think i'll just edit the kernel version
<peterm6881>
or should i take out everything except the changed kernel version
<Xogium>
you don't need to touch the top header that set the date and such
<Xogium>
and you shouldn't remove the lines from previous releases either
<Xogium>
but other than that, well. It is your project, feel free to do things however you like
<peterm6881>
this is what it currently is, wait
<peterm6881>
2022-08-18 / 2022-08-18
<peterm6881>
* Update README.md
<peterm6881>
* Update README.md
<peterm6881>
=======================
<peterm6881>
* board/speedsaver: bump kernel to 5.19.1.
<peterm6881>
* board/speedsaver: switch to bash as shell and enable bash-completion.
<peterm6881>
* board/speedsaver: switch to the non dock device tree.
<peterm6881>
* Revert "board/speedsaver: removed led patches."
<peterm6881>
* Revert "board/speedsaver: added patch to enable the blue led."
<peterm6881>
* board/speedsaver: added patch to enable the blue led.
<peterm6881>
* board/speedsaver: removed led patches.
<peterm6881>
* board/speedsaver: added u-boot patch to disable the green led.
<peterm6881>
* board/speedsaver: provide a kernel patch which disables the green led.
<peterm6881>
2022-07-12 / 2022-07-12
<peterm6881>
=======================
<peterm6881>
* Added changelog file.
<peterm6881>
* board/speedsaver: update kernel to 5.18.11.
<Xogium>
the release will only include committed work, so you do have to commit the kernel version bump before you make a release, otherwise it will not be included in one
<peterm6881>
ok
<Xogium>
now the problem is even if you exit without saving that git release will be made, far as I remember
<Xogium>
so you will have to get rid of the release manually and everything
<Xogium>
I can do that for you if you are fine with starting with a fresh git clone afterwards
<peterm6881>
remote: Support for password authentication was removed on August 13, 2021.
<Speedsaver>
Title: Creating a personal access token - GitHub Docs (at docs.github.com)
<Xogium>
tokens are trying to be a safer alternative than using your account password to push stuff into a repo or do other things. If someone somehow gets one of your token, they can only fuck up that repo. They can't take over your entire github account
<Xogium>
think of them a bit like application passwords a la google
<Xogium>
at least that was my understanding
<peterm6881>
do you just put the token in instead of the password?
<peterm6881>
surely if it did something the bot would have notified us
<Xogium>
interesting, so it did not push your release after all
<Xogium>
well that's a good thing, cause now you can work on committing that kernel update
<peterm6881>
thats what I thought i was doing when i typed git push
<Xogium>
well
<Xogium>
what did you do so far ?
<Xogium>
for the kernel update, I mean
<Xogium>
went in menuconfig, bumped it there, did the update-defconfig danse ?
<Xogium>
did you git add and git commit this ?
<peterm6881>
edit kernel version to current Stable version from kernel.org
<peterm6881>
Follow steps as per git pull
<peterm6881>
didnt do git add and git commit, wait
<peterm6881>
where do I do that from?
<Xogium>
git commit -m "board/speedsaver: update kernel to 5.19.2."
<Xogium>
or something similar
<Xogium>
anywhere in the git repo
<Xogium>
git add configs then tab should autocomplete the speedsaver_defconfig
<Xogium>
when you've done a git commit, you can see it plus the changes it brought with git show
<Xogium>
git show without any parameters will just display the very latest commit
<peterm6881>
wait, stop, please
<peterm6881>
peter@peter-powermatemlxxx:~/buildroot-speedsaver-lichee$ git commit -m "board/speedsaver: update kernel to 5.19.2."
<peterm6881>
On branch master
<peterm6881>
(use "git add <file>..." to update what will be committed)
<peterm6881>
Changes not staged for commit:
<peterm6881>
Your branch is up-to-date with 'origin/master'.
<peterm6881>
(use "git restore <file>..." to discard changes in working directory)
<peterm6881>
modified: changelog.md
<peterm6881>
no changes added to commit (use "git add" and/or "git commit -a")
<peterm6881>
its an absolute fucking nightmare
<Xogium>
I thought you noted the instructions I gave the other day for git ? Git add, git commit and such
<peterm6881>
ok take a step back. im in the git directory, it has the right kernel. What is STEP ONE
<Xogium>
sorry I'm just very confused
<Xogium>
you only ran menuconfig step
<Xogium>
you didn't do update-defconfig
<Xogium>
otherwise git status would show you have modified the config
<Xogium>
btw, best do a git restore on the changelog file, so it is not modified yet from what the current upstream is
<peterm6881>
i ran menuconfig, edited the kernel version, then ran make BR2_EXTERNAL=/home/peter/buildroot-speedsaver-lichee O=output/speedsaver speedsaver_defconfig from the buildroot directory and ran a new build
<peterm6881>
oh and i did a make distclean too
<peterm6881>
my build directory is fine, the image with the new kernel has been tested
<peterm6881>
I just need to know step one to commit that
<Xogium>
sorry I'm just having a hard time focusing rn, we're about to eat
<Xogium>
so I'm like confused because the other day I did explain you need to do another step for this to even work
<Xogium>
if you mondify with menuconfig, then you do a make distclean plus defconfig straight after, it will not save things
<peterm6881>
ok take a step back
<peterm6881>
i did git restore changelog.md
<Xogium>
you need to menuconfig, then make update-defconfig for your defconfig to actually be updated with what you have changed in menuconfig
<peterm6881>
so now we are back to git status
<peterm6881>
Your branch is up-to-date with 'origin/master'.
<peterm6881>
On branch master
<peterm6881>
nothing to commit, working tree clean
<Xogium>
good state to start with
<Xogium>
so
<Xogium>
make menuconfig in your build directory
<Xogium>
then modify kernel version
<Xogium>
and then
<Xogium>
make update-defconfig
<peterm6881>
thats already done
<peterm6881>
ok wait
<Xogium>
is it ? Note what I said above
<peterm6881>
im updating notes at the same time
<Xogium>
if you modify with menuconfig, then you do a make distclean plus defconfig straight after, it will not save things
<Xogium>
menuconfig modify a file in your build directory, .config. Which you atomize the second you do a distclean
<Xogium>
if you want to save what you have changed there, you need to make update-defconfig
<peterm6881>
i run make menuconfig from buildroot-2022.02.4/output/speedsaver right?
<Xogium>
yes
<peterm6881>
just making sure that part is right
<peterm6881>
ok wait
<peterm6881>
need to open a pure console again
<Xogium>
yep
<peterm6881>
well you were right, it reverted to 5.19.1 :)
<peterm6881>
wait
<Xogium>
of course ;) I mean I know buildroot or I don't, right
<peterm6881>
ok next step
<peterm6881>
make update-defconfig right?
<Xogium>
yes
<peterm6881>
from the same directory, buildroot-2022.02.4/output/speedsaver right?
<Xogium>
yes that should work
<Xogium>
then you move back to the external buildroot tree
<Xogium>
and try a git status over there
<peterm6881>
make update-defconfig
<peterm6881>
GEN /home/peter/buildroot-2022.02.4/output/speedsaver/Makefile
<peterm6881>
looks good, whats next step
<peterm6881>
ok wait
<Xogium>
I'll be gone for about 1 hour while I eat, will you be around after ?
<peterm6881>
On branch master
<peterm6881>
Your branch is up-to-date with 'origin/master'.
<peterm6881>
(use "git restore <file>..." to discard changes in working directory)
<peterm6881>
(use "git add <file>..." to update what will be committed)