Hi @riban ,
after your latest updates for stable, staging and testing, I tried to update again, but the update icon is still not vanishing.
Update log: see below. Important notice is, that my local branch seemed to be ahead to the github repositories. But I didn’t change anything in these directories.
Now I decided to rebase the local git repository in zynthian-ui, zynthian-sys and zynthian-webconf with git pull --rebase
After this action vangelis works again with the correct green heart visible on the upper right corner.
The only inconsistency I found, was that in zynthian-webconf the “git status” results in:
Untracked files:
(use "git add <file>..." to include in what will be committed)
cert/
There seemed to be a little bit of updating process confusion during the last commits.
Regards
update log:
Checking 'zynthian-ui' for updates...
Updating vangelis
Already on 'vangelis'
Your branch is ahead of 'origin/vangelis' by 5 commits.
(use "git push" to publish your local commits)
Checking 'zynthian-sys' for updates...
Updating vangelis
Already on 'vangelis'
Your branch is ahead of 'origin/vangelis' by 3 commits.
(use "git push" to publish your local commits)
Checking 'zynthian-webconf' for updates...
Updating vangelis
Already on 'vangelis'
Your branch and 'origin/vangelis' have diverged,
and have 12 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
Checking 'zynthian-data' for updates...
Checking 'zyncoder' for updates...
Updating System configuration...
SOUNDCARD_MIXER is OK
BOOT LOG DISABLED
OVERCLOCKING => None
RBPI AUDIO ENABLED
OTG ENABLED
SOUNDCARD CONFIG => dtoverlay=hifiberry-dacplusadcpro\nforce_eeprom_read=0
DISPLAY CONFIG => display_lcd_rotate=2
CUSTOM CONFIG =>
Configuring X11 inverted display ...
Executing update recipes...
Current patch level: 20241222.1
END OF PATCHES
NO NEW PATCHES TO APPLY.
Reading package lists...
Building dependency tree...
Reading state information...
0 upgraded, 0 newly installed, 0 to remove and 8 not upgraded.
Reading package lists...
Building dependency tree...
Reading state information...
Checking 'zynthian-data' for updates...
Updating System configuration...
SOUNDCARD_MIXER is OK
BOOT LOG DISABLED
OVERCLOCKING => None
RBPI AUDIO ENABLED
OTG ENABLED
SOUNDCARD CONFIG => dtoverlay=hifiberry-dacplusadcpro\nforce_eeprom_read=0
DISPLAY CONFIG => display_lcd_rotate=2
CUSTOM CONFIG =>
Configuring X11 inverted display ...
Updating zyncoder...
Updated 0 paths from the index
/zynthian/zyncoder /zynthian/zyncoder
/zynthian/zyncoder/build /zynthian/zyncoder /zynthian/zyncoder
++ Defined MCP23017_ENCODERS
++ TPA6130 kernel driver LOADED. Omitting user space driver.
++ Building for Wiring Layout V5
-- Configuring done
-- Generating done
-- Build files have been written to: /zynthian/zyncoder/build
[ 68%] Built target zyncore
[ 89%] Built target tpa6130_set_volume
[100%] Built target zyncoder_test
/zynthian/zyncoder /zynthian/zyncoder
/zynthian/zyncoder
Updating zynthian-ui...
Updated 0 paths from the index
/zynthian/zynthian-ui/zynlibs/zynmixer /zynthian/zynthian-ui
/zynthian/zynthian-ui/zynlibs/zynmixer/build /zynthian/zynthian-ui/zynlibs/zynmixer /zynthian/zynthian-ui
-- Configuring done
-- Generating done
-- Build files have been written to: /zynthian/zynthian-ui/zynlibs/zynmixer/build
[100%] Built target zynmixer
/zynthian/zynthian-ui/zynlibs/zynmixer /zynthian/zynthian-ui
/zynthian/zynthian-ui
/zynthian/zynthian-ui/zynlibs/zynaudioplayer /zynthian/zynthian-ui
/zynthian/zynthian-ui/zynlibs/zynaudioplayer/build /zynthian/zynthian-ui/zynlibs/zynaudioplayer /zynthian/zynthian-ui
OSC disabled
-- Configuring done
-- Generating done
-- Build files have been written to: /zynthian/zynthian-ui/zynlibs/zynaudioplayer/build
[100%] Built target zynaudioplayer
/zynthian/zynthian-ui/zynlibs/zynaudioplayer /zynthian/zynthian-ui
/zynthian/zynthian-ui
/zynthian/zynthian-ui/zynlibs/zynseq /zynthian/zynthian-ui
/zynthian/zynthian-ui/zynlibs/zynseq/build /zynthian/zynthian-ui/zynlibs/zynseq /zynthian/zynthian-ui
-- Configuring done
-- Generating done
-- Build files have been written to: /zynthian/zynthian-ui/zynlibs/zynseq/build
[100%] Built target zynseq
/zynthian/zynthian-ui/zynlibs/zynseq /zynthian/zynthian-ui
/zynthian/zynthian-ui
/zynthian/zynthian-ui/zynlibs/zynsmf /zynthian/zynthian-ui
/zynthian/zynthian-ui/zynlibs/zynsmf/build /zynthian/zynthian-ui/zynlibs/zynsmf /zynthian/zynthian-ui
-- Configuring done
-- Generating done
-- Build files have been written to: /zynthian/zynthian-ui/zynlibs/zynsmf/build
[100%] Built target zynsmf
/zynthian/zynthian-ui/zynlibs/zynsmf /zynthian/zynthian-ui
/zynthian/zynthian-ui
Updating zynthian-webconf...
Updated 0 paths from the index
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
Regenerating engines DB: engines ...
INFO:root:Command took 11s
Running Flag Actions from '/zynthian/zynthian-sys/scripts/update_zynthian.sh'...
Saving state...
Restarting zynthian service...
Restarting zynthian-webconf service...
I had to abandon the fixes to update-available indication due to issues with the rollout. I will look at it when things settle down. For now, if you are updated then ignore it until you hear something here.
[Edit] The rebase may have broken things. If you have merged the bad changes from yesterday then your machine is likely in a bad state which subsequent updates are unlikely to fix.