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

anydesk: update to 6.3.0, add armv7 support #47656

Closed
wants to merge 2 commits into from

Conversation

MechDR
Copy link

@MechDR MechDR commented Dec 9, 2023

Updated AnyDesk to version 6.3.0 and added repackage support for ARMv7 on RPi. Should also work on anything that is not an RPi but uses ARMv7HF or ARMv7L.

The binaries are only for the RPi3, so they are 32-bit only. AnyDesk still doesn't have any ARM64 binaries, so no RPi4 support. But, in theory, they should run without a problem on any ARMv7HF/L device.

Don't know if multilib is a thing on ARM64... I presume not...

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, (x86_64-glibc)
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • armv7l
    • armv7hf

srcpkgs/anydesk/template Outdated Show resolved Hide resolved
srcpkgs/anydesk/template Outdated Show resolved Hide resolved
srcpkgs/anydesk/template Outdated Show resolved Hide resolved
@classabbyamp
Copy link
Member

I would suggest not using the web ui, you're just making it harder for yourself when you need to squash these commits.

@MechDR
Copy link
Author

MechDR commented Dec 10, 2023

I would suggest not using the web ui, you're just making it harder for yourself when you need to squash these commits.

I know, but I'm not doing this from one place (from one PC).

@classabbyamp
Copy link
Member

don't see how that matters, you can have your branches on multiple computers.

@MechDR
Copy link
Author

MechDR commented Dec 10, 2023

I'd have to sync all the tiime, don't I?

@MechDR
Copy link
Author

MechDR commented Dec 10, 2023

Commits so far are OK BTW, packages built for all noted acrhitectures.

@classabbyamp
Copy link
Member

classabbyamp commented Dec 10, 2023

I'd have to sync all the tiime, don't I?

only if you made changes on the other computer (i.e. just git pull --rebase)

@MechDR
Copy link
Author

MechDR commented Dec 10, 2023

That means I'd have to be logged in to github on all user profiles/PCs I'm doing this from... I'd rather not. I'll see if I can do it from one PC only, makes it way easier.

@classabbyamp
Copy link
Member

not sure why you'd need to do this on multiple computers, you can cross-build to armv7, and you can get around having to log in by setting up ssh for the git repo

@MechDR
Copy link
Author

MechDR commented Dec 10, 2023

I just do this when I have time, at work or at home, and I don't usually work on only one PC when I'm at work. I do usually use one laptop when I'm at home though... but I don't get to use it quite that often (obligations).

And I do cross-compile.

@MechDR
Copy link
Author

MechDR commented Dec 10, 2023

It should be OK now, correct?

@classabbyamp
Copy link
Member

It should be OK now, correct?

other than what i just suggested, the template looks fine now, but it needs to all be 1 commit, and you don't need all that description in it, just AnyDesk: update to 6.3.0, add armv7 support is enough

@MechDR
Copy link
Author

MechDR commented Dec 11, 2023

/void-packages/srcpkgs/anydesk/template: line 35: anydesk-6.3.0/LICENSE: No such file or directory
=> ERROR: anydesk-6.3.0_1: do_install: 'echo "See: https://anydesk.com/en/terms" > "${pkgname}-${version}"/LICENSE' exited with 1
=> ERROR:   in do_install() at srcpkgs/anydesk/template:35

Maybe like this?

mkdir -p "${pkgname}-${version}"
echo "See: https://anydesk.com/en/terms" > "${pkgname}-${version}"/LICENSE
vlicense "${pkgname}-${version}"/LICENSE
rm -rf "${pkgname}-${version}"

@MechDR MechDR changed the title AnyDesk: update to v6.3.0 and added RPi3 armv7hf/armv7l support AnyDesk: update to 6.3.0, add armv7 support Dec 11, 2023
@MechDR
Copy link
Author

MechDR commented Dec 13, 2023

@classabbyamp ?

@classabbyamp
Copy link
Member

this needs to be squashed into 1 commit

@MechDR
Copy link
Author

MechDR commented Dec 14, 2023

@classabbyamp what about the errors?

#47656 (comment)

Is my suggestion OK?

@classabbyamp
Copy link
Member

what errors? it works fine in CI as-is

@MechDR
Copy link
Author

MechDR commented Dec 14, 2023

Reported errors when building with xbps-src on my rig...

/void-packages/srcpkgs/anydesk/template: line 35: anydesk-6.3.0/LICENSE: No such file or directory
=> ERROR: anydesk-6.3.0_1: do_install: 'echo "See: https://anydesk.com/en/terms" > "${pkgname}-${version}"/LICENSE' exited with 1
=> ERROR:   in do_install() at srcpkgs/anydesk/template:35

@classabbyamp
Copy link
Member

did you xbps-src clean in between runs?

@MechDR
Copy link
Author

MechDR commented Dec 14, 2023

@classabbyamp sorry, I tried it again, it succeeded now... maybe I didn't clean/zap xbps-src before I rebuilt.

I'll squash all commits.

@MechDR MechDR force-pushed the anydesk branch 2 times, most recently from 4bd724c to 071f0c2 Compare December 14, 2023 01:55
@MechDR
Copy link
Author

MechDR commented Dec 14, 2023

@classabbyamp is it OK now?

@MechDR MechDR force-pushed the anydesk branch 2 times, most recently from 4359521 to a7961d6 Compare December 15, 2023 01:59
@0x5c
Copy link
Contributor

0x5c commented Dec 22, 2023

Why does this commit have me as "author"?

commit a7961d677fc38a7abc92719ed180902d07f13616 (HEAD -> anydesk)
Author: 0x5c <dev@0x5c.io>
Date:   Wed Dec 13 18:49:04 2023 -0500

    AnyDesk

image

@MechDR
Copy link
Author

MechDR commented Dec 23, 2023

@0x5c Maybe @classabbyamp assigned you as author as well 🤷.

Does the lint template check failing means this won't get accepted? Because I rarely use tabs, I use white spaces (makes commenting more easily visible, the line is indented).

@classabbyamp
Copy link
Member

I did nothing. that info in the commit has nothing to do with github, it's purely displaying git commit metadata.

Does the lint template check failing means this won't get accepted?

yes. we have our formatting style and you'll need to use it.

@MechDR
Copy link
Author

MechDR commented Dec 23, 2023

@classabbyamp OK, I'll correct the template with tabs.

@0x5c
Copy link
Contributor

0x5c commented Dec 23, 2023

Please fix your git config to use your (not mine) name/username and email

@classabbyamp
Copy link
Member

the commit message should also be in the style described in CONTRIBUTING.md

@MechDR
Copy link
Author

MechDR commented Dec 23, 2023

@0x5c I am using mine 🤨.

@classabbyamp OK, I'll read it and fix the PR.

May I mention you if I have any questions regarding the contributing guidelines?

@0x5c
Copy link
Contributor

0x5c commented Dec 23, 2023

Run this and paste the result here

git config --get user.name && git config --get user.email

@MechDR
Copy link
Author

MechDR commented Dec 23, 2023

@0x5c

MechDR

@MechDR MechDR force-pushed the anydesk branch 3 times, most recently from d853e03 to 9062af0 Compare December 23, 2023 22:51
@MechDR MechDR changed the title AnyDesk: update to 6.3.0, add armv7 support anydesk: update to 6.3.0, add armv7 support Dec 23, 2023
@MechDR
Copy link
Author

MechDR commented Dec 23, 2023

@classabbyamp Should be OK now.

@classabbyamp
Copy link
Member

are you committing with --amend or something?
image

@MechDR
Copy link
Author

MechDR commented Dec 23, 2023

@classabbyamp Yes, I folowed what was written in this comment. I thought the procedure was the same.

@0x5c
Copy link
Contributor

0x5c commented Dec 24, 2023

If you follow those steps exactly each time you commit, you overwrite two commits of history at a time and delete commits that existed before yours. Merging the PR as-is could cause problems.

Do not blindly follow those instructions, they were specific to the situation in which they were given and incorrect in all others.

@MechDR
Copy link
Author

MechDR commented Dec 24, 2023

@0x5c OK, how do I fix this?

vlicense "${pkgname}-${version}"/copyright
rm -rf "${pkgname}-${version}"
vcopy "*" /
echo "See: https://anydesk.com/en/terms" > LICENSE
Copy link
Member

Choose a reason for hiding this comment

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

This is not an acceptable license. Fetch the web content at build time place that content in the LICENSE file.

Copy link
Member

Choose a reason for hiding this comment

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

with T&C like (it's not just a copyright licence) this the ones that apply are usually the ones that exist at the present moment, not what existed at build time, so for packages like this and chrome and discord I've moved them to this style.

Copy link
Member

Choose a reason for hiding this comment

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

You agree to the terms when you install the software. Unless those terms expressly include a clause that you agree to abide by any future changes to the terms, the provider is not able to change the terms after the fact. Regardless, it would be most appropriate to capture the terms as they exist when they are enacted.

If there's an argument that build and install time might be materially different (which is less likely to be true for restricted packages), the right thing to do is fetch the license in an INSTALL script.

Copy link
Author

@MechDR MechDR Dec 25, 2023

Choose a reason for hiding this comment

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

The license is included in the generic Linux build only, which is x64 only. I just opted for a cleaner resolution (suggested by @classabbyamp) in which both of the builds are fetched from the deb packages, which do not include the license file.

As it's a service based software, I presume the license and T&C might change over time, so in order to be up to date with the license/T&C, it's best to refer the user to the web page, instead of looking at an older license file which is not up to date.

The software is backwards compatible (can work/connect) with older versions of it, up to 2 or 3 major versions behind the current build, so it is actually more practical to include the current "state of affairs" rather than what used to be "the norm" at install time.

The Windows installer has no T&C/license acceptance when installing (maybe it has, but I haven't noticed to be honest). The Debian builds as well (they don't even have the license file in the packages, only the generic Linux builds have that), so I really don't see a problem if the user is just pointed at a web page to look at the current state of legal affairs regarding using the software.

@ahesford
Copy link
Member

You fix this by learning to use git. While we will are happy to provide occasional guidance on these matters, we are not a tutorial service. There are plenty of online guides you can seek for more information about git and GitHub.

@classabbyamp
Copy link
Member

#47970

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.

None yet

5 participants