Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add ddvk-hacks #247

Merged
merged 10 commits into from
Mar 5, 2021
Merged

Add ddvk-hacks #247

merged 10 commits into from
Mar 5, 2021

Conversation

matteodelabre
Copy link
Member

Patches Xochitl on install, restores original binary on remove. Tested on rM1, version 2.5.0.27.

@matteodelabre matteodelabre added the packages Add or improve packages of the repository label Jan 19, 2021
@raisjn
Copy link
Contributor

raisjn commented Jan 19, 2021

awesome! this day has been a long time coming :-D

cc @ddvk

Eeems
Eeems reviewed Jan 19, 2021
View reviewed changes
package/ddvk-hacks/package Outdated
Comment on lines 146 to 147
echo "Invalid Xochitl checksum"
echo "Maybe ddvk-hacks are already installed?"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps check the backup location that xochitl gets placed in when using @ddvk's script?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. If we detect its presence, should we just warn the user and ask them to do the cleanup? Or use the upstream script’s backup to restore Xochitl, then re-run our script as normal?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not quite sure. @ddvk what are you comfortable with?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably it is better to let the user do the cleanup

@LinusCDE
Copy link
Member

Works great on my rM 2! Best tag me in discord once the details are fleshed out. I can re-review (and most likely approve) it then.

Eeems
Eeems previously approved these changes Jan 20, 2021
View reviewed changes
Copy link
Member

@Eeems Eeems left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works fine for me on my rM1

@matteodelabre matteodelabre mentioned this pull request Jan 22, 2021
Open
28 tasks
@Eeems
Copy link
Member

Eeems commented Jan 27, 2021

Just waiting on input from @ddvk before approving.

@ddvk
Copy link

ddvk commented Jan 28, 2021

Just waiting on input from @ddvk before approving.

what happens after the device has been upgraded?
the way i see it, the package has to be foce reinstalled

@LinusCDE
Copy link
Member

LinusCDE commented Jan 29, 2021 •
edited
Loading

To loosely repeat some of the discussions in discord relating to this ([starting here])(https://discordapp.com/channels/385916768696139794/756853330382422037/804318381644972033)):

The package doesn't contain any files outside of /opt and /home/root so I won't get automatically reinstalled after an upgrade. This behaviour also may not be fully wished or has to be altered since right after an update, there will most likely not be a patch for the new xochitl.

There was also some discussion on how to treat and where to store the backup of the xochitl binary do we don't accidentally downgrade it.

@Eeems
Copy link
Member

Eeems commented Mar 2, 2021

So what is this waiting on?

@matteodelabre
Copy link
Member Author

I don’t see any remaining issue with the PR. So this is just waiting on someone to review it.

@matteodelabre matteodelabre merged commit 2da7b91 into testing Mar 5, 2021
@matteodelabre matteodelabre deleted the package/ddvk-hacks branch March 5, 2021 08:50
raisjn pushed a commit to rmkit-dev/toltec that referenced this pull request Mar 23, 2021
stable merge for week XX of 2021:
e3a11cf 
new packages:
    [ddvk-hacks] Add ddvk-hacks (toltec-dev#247)

updated packages:
    [wireguard][1.0.20210219] - Updated package (and include wireguard-tools) (toltec-dev#285)
    [rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) (toltec-dev#301)
    [recrossable] Update recrossable (toltec-dev#312)
    [wikipedia] Initial wikipedia package.
    [appmarkable] Update appmarkable to 0.0.0-9 and rmservewacominput to 0.3.0-1 (toltec-dev#308) with rm2 support
    [rmkit] patch genie to fix crash in testing (toltec-dev#304)
    [oxide] Update Oxide to v2.1.2 (toltec-dev#241)
    [rm2fb] update rm2fb with wait ioctl and no-op on rM1 (toltec-dev#298)
    [rmkit] add bufshot app, add lamp, add iago, add changelog (toltec-dev#276)
    [rmkit] update rmkit to latest (2021-02-17) (toltec-dev#286)
    [zshelf][0.3.1] - Updated Package (toltec-dev#287)

tooling:
    Pin the Ubuntu version used in workflows to 20.04 (toltec-dev#316)
    Provide better version number error messages (toltec-dev#314)
    util.auto_extract: Extract broken symlinks and missing directories (toltec-dev#302)
    change web background color to #fcfaf8 (toltec-dev#280)
    Implement build-time package dependencies (toltec-dev#274)
    Rewrite repo-build-web in Python (toltec-dev#266)
    Print last 50 lines of output on build error (toltec-dev#263)
    Hardcode REMOTE_HTTP secret in PR workflows (toltec-dev#262)
    Rewrite repo-build and package-build in Python (toltec-dev#218)
    Make bootstrap execution conditional on hash verification (toltec-dev#257)
    Add Toltec web home page (toltec-dev#193)
@raisjn raisjn mentioned this pull request Mar 23, 2021
Merged
matteodelabre added a commit that referenced this pull request Mar 31, 2021
@raisjn @matteodelabre
Stable merge for week 13 of 2021 (#320)
83dfead 
New packages:

* bufshot - 0.1.0-2 (#276)
* ddvk-hacks - 17.04-1 (#247)
* iago - 0.1.0-1 (#276)
* lamp - 0.1.0-1 (#276)
* libdlib, libdlib-dev - 19.21-1 (#274)
* libvncserver, libvncserver-dev - 0.9.13-1 (#274)
* wikipedia - 0.1.0-2 (#311)

Updated packages:

* appmarkable - 0.0.0-9 (#308)
* decay - 2.1.2~1 (#241)
* erode - 2.1.2~1 (#241)
* fret - 2.1.2~1 (#241)
* genie - 0.1.4-2 (#304)
* harmony - 0.1.2-1 (#286)
* mines - 0.1.2-1 (#286)
* nao - 0.1.2-1 (#286)
* oxide - 2.1.2~1 (#241)
* recrossable - 0.0.0-5 (#274, #312)
* remux - 0.1.8-1 (#286)
* rm2fb - 1.0.1-1 (#298, #301)
* rmservewacominput - 0.3.0-1 (#308)
* rot - 2.1.2~1 (#241)
* simple - 0.1.3-1 (#286)
* tarnish - 2.1.2~1 (#241)
* vnsee - 0.3.1-2 (#274)

Tooling:

* Pin the Ubuntu version used in workflows to 20.04 (#316)
* Provide better version number error messages (#314)
* util.auto_extract: Extract broken symlinks and missing directories (#302)
* change web background color to #fcfaf8 (#280)
* Implement build-time package dependencies (#274)
* Rewrite repo-build-web in Python (#266)
* Print last 50 lines of output on build error (#263)
* Hardcode REMOTE_HTTP secret in PR workflows (#262)
* Rewrite repo-build and package-build in Python (#218)
* Make bootstrap execution conditional on hash verification (#257)
* Add Toltec web home page (#193)

Co-authored-by: okay <okay@arkose>
Co-authored-by: Mattéo Delabre <spam@delab.re>
danshick pushed a commit to danshick/toltec that referenced this pull request May 5, 2021
@matteodelabre @Eeems @danshick
Add ddvk-hacks (toltec-dev#247)
fea3845 
Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
danshick added a commit to danshick/toltec that referenced this pull request May 5, 2021
@danshick
Revert "Add ddvk-hacks (toltec-dev#247)"
2c8a5a6 
This reverts commit fea3845.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ddvk ddvk ddvk left review comments

@Eeems Eeems Eeems approved these changes

Assignees
No one assigned
Labels
packages Add or improve packages of the repository
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@matteodelabre @raisjn @LinusCDE @Eeems @ddvk