-
Notifications
You must be signed in to change notification settings - Fork 60
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
Stable merge window for week 49 of 2023 #782
Conversation
* Add package for wireguard-tools * Pull in provides from #600 * Add provides to wireguard packages * add conflicts --------- Co-authored-by: Nathaniel van Diepen <[email protected]>
…reguard (#742) * linux-stracciatella: update sources to RM1XX_5.4.70_v1.3.4 * Bump build image to v3.1 * Add wireguard module to linux-stracciatella * Move wireguard config out of sources * Remove debug symbols for rM1 --------- Co-authored-by: Nathaniel van Diepen <[email protected]>
Add support for OS 3.3.2.1666
Co-authored-by: Nathaniel van Diepen <[email protected]>
* Update neofetch to v1.1.0 * inform config update * optional config msg
* Update webinterface-wifi to v2.0.0 * reload daemon if running on upgrade --------- Co-authored-by: Nathaniel van Diepen <[email protected]>
* Add package webinterface-onboot 1.2.2 * daemon opt/bin * fmt * correct error reporting; conflict ddvk * reinstall on upgrade --------- Co-authored-by: Nathaniel van Diepen <[email protected]>
* Update micro to 2.0.12 Release notes: https://github.com/zyedidia/micro/releases/tag/v2.0.12 * Update micro to 2.0.13
Co-authored-by: Nathaniel van Diepen <[email protected]>
* Add package: webinterface-upload-button v1.0.1 * auto apply/revert; reinstall on reenable * remove alias
* Add package: signature-rM v1.0.2 * auto apply/revert; reinstall on reenable * conflicts=(ddvk-hacks) * remove error suppression * #770 and #772 conflict --------- Co-authored-by: Nathaniel van Diepen <[email protected]>
Todo
|
I can install |
I've opened #784 to resolve the issue. It will need to be included before this can merge to stable. |
I did some testing on rm2 this evening: rmfm, display/rm2fb, remux, neofetch all behave well. I expect to test most of the other rm2 packages sometime before the end of the weekend... except for linux-stracciatella probably, in case someone else with an rm2 wants to pick it up. |
Is there a chance that you could review/test #784 in the next day or two so we can get it merged and tested as well? I was hoping to get another merge window started before this weekend, as this merge window was supposed to merge on Sunday. |
Did what I could! |
* Remove wireguard-tools from wireguard and mark it as depending on wireguard-tools * Dropping wireguard-tools as entware has it and wg-quick already
Thanks! It's now merged and ready for further testing. |
TestingI did some testing with an ApproachExtreme, but works.
Using a local-repo with build artifactsLocally (computer)Firstly, download the PR-specific build artifacts. Then: scp repo.zip rm: Remotely (rM)mkdir -p ~/packages/local/
cd ~/packages/local/
mv ~/repo.zip ./repo.zip
unzip repo.zip
cat > /opt/etc/opkg.conf.d/16-local.conf << EOF
src/gz local-rmall file:///home/root/packages/local/rmall
src/gz local-rm2 file:///home/root/packages/local/rm2
EOF
toltecctl generate-opkg-conf
opkg update
opkg upgrade Packages to install (mentioned in PR)opkg install webinterface-onboot webinterface-upload-button signature-rm linux-stracciatella wireguard display rm2fb-client rmfm neofetch webinterface-wifi micro koreader ddvk-hacks draft erode fret oxide rot tarnish decay corrupt anxiety oxide-utils liboxide inject_evdev reboot-guard rmfakecloud-proxy genie remux tailscale-systemd toltec-base xochitl ResultsNew Packages
Updated Packages
Summary
|
The code for uninstall that runs is as follows: _restore() {
echo "Reverting /usr/bin/xochitl"
if signature-rm has-backup > /dev/null; then
signature-rm revert --backup -y > /dev/null
else
signature-rm revert --reverse -y > /dev/null
fi
echo "Success"
echo
} Did you at least see the |
Yes, here's the full output of an installation and removal on my device:
I think the |
Hmm, that is kind of odd, what does |
Nothing at all. |
What is the output of EDIT: Oh, I just noticed you added rm1 to your conf file, you should remove that line and regenerate your opkg.conf, as rm1 packages are not meant to be installed on a rM2. That is probably why this is happening. |
Noting that the setup of the last 3 local ones is described in my initial message. |
This line would be causing issues, as any packages included here have the |
Indeed, it's now a clean output:
I thought I could just add both without thinking much about it 😅. I also fixed my initial message with the code block for future reference. |
Alright, I'm happy with the testing as-is now. @beelux you may want to open an issue about rm-signature/webinterface-onboot/webinterface-upload-button not instructing the user to restart xochitl, that way @rM-self-serve can weigh in on it. In my opinion, it does not block this stable merge. |
I would be happy to add the 'restart xochitl' line to the onboot/signature-rm packages. I believe my thinking with onboot was that the name implied rebooting and then I likely copied that to signature-rM. @Eeems would you like me to push that out really quick or are you looking to merge asap? Upload-button does not need to restart xochitl. |
It's not needed for this stable merge. I'd actually like to have it be done using the new |
New Packages
webinterface-onboot
1.2.2-2 - (Add package webinterface-onboot v1.2.2 #770 Clean up systemd unit disable logic #721)webinterface-upload-button
- 1.0.1-1 (Add package: webinterface-upload-button v1.0.1 #771)signature-rm
- 1.0.2-1 (Add package: signature-rm v1.0.2 #772)Sent from my reMarkable
signature from emails sent by the device.Updated Packages
linux-stracciatella
- 5.4.70-3 (linux-stracciatella: update sources to RM1XX_5.4.70_v1.3.4 and add wireguard #742)wireguard
- 1.0.20210219-4 (Add package for wireguard-tools #743 Remove wireguard-tools from wireguard #784)display
andrm2fb-client
- 1:0.0.32-2 (Update display/rm2fb-client to v0.0.32 #758 Clean up systemd unit disable logic #721)rmfm
- 1.5.1-1 (rmfm: Update to 1.5.1 #766)neofetch
- 1.1.0-1 (Update neofetch to v1.1.0 #769)webinterface-wifi
- 2.0.0-2 (Update webinterface-wifi to v2.0.0 #768 Clean up systemd unit disable logic #721)micro
- 2.0.13-1 (Update micro to 2.0.13 #738)koreader
- 2023.10-2 (Update KOReader to v2023.10 #749 Clean up systemd unit disable logic #721)ddvk-hacks
- 39.01-2 (Force ddvk-hacks to be reinstalled on upgrade #720 Update ddvk-hacks: conflict with new hacks #778)ddvk-hacks
wouldn't be reapplied when usingtoltecctl reenable
.draft
- 0.2.0-22 (Clean up systemd unit disable logic #721)erode
,fret
,oxide
,rot
,tarnish
,decay
,corrupt
,anxiety
,oxide-utils
,inject_evdev
, andliboxide
- 2.6-3 (Clean up systemd unit disable logic #721)reboot-guard
- 1.0.1-8 (Clean up systemd unit disable logic #721)rmfakecloud-proxy
- 0.0.3-4 (Clean up systemd unit disable logic #721)genie
- 0.1.6-3 (Clean up systemd unit disable logic #721)remux
- 0.2.4-2 (Clean up systemd unit disable logic #721)tailscale-systemd
- 0.0.0-2 (Clean up systemd unit disable logic #721)toltec-base
- 1.2-3 (Clean up systemd unit disable logic #721)xochitl
- 0.0.0-17 (Clean up systemd unit disable logic #721)Tooling
provides=()
field added for packages.unit-exists
anddisable-unit
methods to install-libNote: This doesn't change what OS version that toltec supports, as full support still requires various packages to be updated, removed, or replaced. Along with proper testing of all packages in the repository, as well as the upgrade process. https://github.com/toltec-dev/toltec/milestone/7 contains the current list of issues and pull requests required for 3.x support.