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

Add package for wireguard-tools #743

Merged
merged 8 commits into from
Nov 27, 2023
Merged

Conversation

Etn40ff
Copy link

@Etn40ff Etn40ff commented Sep 27, 2023

This PR adds the required binaries to use the wireguard module installed via linux-stracciatella (or by any other mean).

This new package, together with #742, supersedes the package wireguard.

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.

Since this supersedes the wireguard package, it will need to indicate as such. We currently have replaces and conflicts for this. #600 also adds provides support, which I think would be preferable here. You can mark this as conflicts with wireguard, as well as update the wireguard package to provide wireguard-tools.

For #600, I just need someone to let me know that it works on a rM2 and I can merge it as I tested on my rM1.

@Eeems Eeems added this to the 2023-W39 Merge Window milestone Oct 3, 2023
@Eeems Eeems added the packages Add or improve packages of the repository label Oct 21, 2023
@Etn40ff
Copy link
Author

Etn40ff commented Oct 28, 2023

Still waiting on #600

@Eeems
Copy link
Member

Eeems commented Oct 28, 2023

Still waiting on #600

You could pull the changes required from that PR into this.

@Eeems Eeems self-requested a review November 22, 2023 00:05
@Eeems
Copy link
Member

Eeems commented Nov 27, 2023

reMarkable: ~/ opkg install wireguard
Installing wireguard (1.0.20210219-3) to root...
Downloading https://toltec-dev.org/testing/rmall/wireguard_1.0.20210219-3_rmall.ipk
Configuring wireguard.
reMarkable: ~/ cd ./packages/
reMarkable: ~/packages/ opkg install ./wireguard-tools_1.0.20210914-1_rmall.ipk 
Installing wireguard-tools (1.0.20210914-1) to root...
Collected errors:
 * check_conflicts_for: The following packages conflict with wireguard-tools:
 * check_conflicts_for: 	wireguard * 
 * opkg_install_cmd: Cannot install package wireguard-tools.
reMarkable: ~/packages/ opkg remove wireguard
Removing package wireguard from root...
Wireguard has been removed.
The kernel module will remain loaded until you reboot, or you can attempt
to manually remove it by running "modprobe -r wireguard".
reMarkable: ~/packages/ opkg install ./wireguard-tools_1.0.20210914-1_rmall.ipk 
Installing wireguard-tools (1.0.20210914-1) to root...
Configuring wireguard-tools.

Looks like it works as expected

@Eeems Eeems merged commit 8115ee4 into toltec-dev:testing Nov 27, 2023
3 checks passed
Eeems added a commit that referenced this pull request Dec 10, 2023
* 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]>
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
packages Add or improve packages of the repository
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants