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.

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

Update ddvk-hacks: conflict with new hacks #778

Merged
merged 2 commits into from
Dec 8, 2023

Conversation

rM-self-serve
Copy link
Contributor

Conflict with #770 and #772.

@rM-self-serve rM-self-serve changed the title conflict with new hacks Update ddvk-hacks: conflict with new hacks Dec 8, 2023
@Eeems
Copy link
Member

Eeems commented Dec 8, 2023

Is the conflicts in the other packages not enough?

@rM-self-serve
Copy link
Contributor Author

Ah, I thought it was best practice to put conflicts on both packages.

@Eeems
Copy link
Member

Eeems commented Dec 8, 2023

Ah, I thought it was best practice to put conflicts on both packages.

I would say it probably is best practice. I was under the impression we were going to try to resolve the conflict next, so I was just making sure there wasn't an issue this was trying to resolve.

@rM-self-serve rM-self-serve reopened this Dec 8, 2023
@rM-self-serve
Copy link
Contributor Author

No issues other than the issue of ddvk-hacks failing to install/remove if webinterface-onboot or signature-rm has been installed.

@Eeems
Copy link
Member

Eeems commented Dec 8, 2023

No issues other than the issue of ddvk-hacks failing to install/remove if webinterface-onboot or signature-rm has been installed.

Just to clarify, by this you mean that without those packages including conflicts it would fail, right? And now that they include it, you can't get them and ddvk-hacks to install at the same time?

@rM-self-serve
Copy link
Contributor Author

rM-self-serve commented Dec 8, 2023

Yes, I do mean that without #770 and #772 including the conflicts, it would fail.

The conflicts are working correctly when ddvk-hacks is installed then attempting to install #770 or #772.
onboot_conflict

But, when #770 or #772 is installed then attempting to install ddvk-hacks, ddvk-hacks will fail in configure() as the previous packages have changed the shasum.

ddvk-noconflict

@Eeems
Copy link
Member

Eeems commented Dec 8, 2023

Alright, so we do need to make sure that ddvk-hacks has conflicts as well to avoid this. Thanks!

@Eeems Eeems merged commit e242bef into toltec-dev:testing Dec 8, 2023
3 checks passed
@Eeems Eeems added this to the 2023-W49 Merge Window milestone Dec 8, 2023
Eeems added a commit that referenced this pull request Dec 10, 2023
Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
@rM-self-serve rM-self-serve deleted the package/ddvk-hacks branch December 16, 2023 15:43
Eeems added a commit that referenced this pull request Dec 26, 2023
### New Packages
- `webinterface-onboot` 1.2.2-2 - (#770 #721)
  - Allows the usb web interface to start without the USB cable being connected.
- `webinterface-upload-button` - 1.0.1-1 (#771)
  - Adds an upload button to the usb web interface.
- `signature-rm` - 1.0.2-1 (#772)
  - Removes the `Sent from my reMarkable` signature from emails sent by the device.

### Updated Packages
- `linux-stracciatella` - 5.4.70-3 (#742)
  - Updated to RM1XX_5.4.70_v1.3.4 tag from upstream kernel.
  - Added wireguard module.
- `wireguard` - 1.0.20210219-4 (#743 #784)
  - Removed wireguard-tools and wg-quick from wireguard package. These packages are provided by entware already.
- `display` and `rm2fb-client` - 1:0.0.32-2 (#758 #721)
  - Add support for OS 3.3.2.1666
- `rmfm` - 1.5.1-1 (#766)
  - Fix issue where listing a directory with an invalid symlink would crash the application.
- `neofetch` - 1.1.0-1 (#769)
- `webinterface-wifi` - 2.0.0-2 (#768 #721)
- `micro` - 2.0.13-1 (#738)
- `koreader` - 2023.10-2 (#749 #721)
- `ddvk-hacks` - 39.01-2 (#720 #778)
  - Fix issue where `ddvk-hacks` wouldn't be reapplied when using `toltecctl reenable`.
- `draft` - 0.2.0-22 (#721)
- `erode`, `fret`, `oxide`, `rot`, `tarnish`, `decay`, `corrupt`, `anxiety`, `oxide-utils`, `inject_evdev`, and `liboxide` - 2.6-3 (#721)
- `reboot-guard` - 1.0.1-8 (#721)
- `rmfakecloud-proxy` - 0.0.3-4 (#721)
- `genie` - 0.1.6-3 (#721)
- `remux` - 0.2.4-2 (#721)
- `tailscale-systemd` - 0.0.0-2 (#721)
- `toltec-base` - 1.2-3 (#721)
- `xochitl` - 0.0.0-17 (#721)

### Tooling
- New `provides=()` field added for packages.
- Added `unit-exists` and `disable-unit` methods to install-lib

**Note:** 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants