AsteroidOS / meta-asteroid

OpenEmbedded layer that provides the basis of AsteroidOS
GNU General Public License v2.0
78 stars 45 forks source link

Add the usb-moded file location for serial number #109

Closed beroset closed 2 years ago

beroset commented 2 years ago

This patches nemo-qml-plugin-systemsettings to allow that plugin to correctly fetch the serial number for AsteroidOS and parallels a change already made to upstream in commit 96b6ae08c6ce47dbcb6625227905eda21383e2bc.

Signed-off-by: Ed Beroset beroset@ieee.org

beroset commented 2 years ago

This is a complementary change to https://github.com/AsteroidOS/asteroid-settings/pull/52 and helps address https://github.com/AsteroidOS/asteroid-settings/issues/33 by allowing the About page to fetch the serial number.

FlorentRevest commented 2 years ago

Have you considered updating nemo-qml-plugin-systemsettings instead ?

Also, to keep the attribution correct, could you just apply this patch: https://github.com/sailfishos/nemo-qml-plugin-systemsettings/commit/96b6ae08c6ce47dbcb6625227905eda21383e2bc.patch ? (a git am under devtool should do iiuc)

beroset commented 2 years ago

I prepared the patch before I discovered the upstream patch, but your idea is good. I'll redo this.

beroset commented 2 years ago

Actually, I can't do that. The upstream patch cannot apply cleanly because the context lines are different. I think we may be stuck with this until we update our version of nemo-qml-plugin-systemsettings to something more recent.

FlorentRevest commented 2 years ago

It's quite usual that a patch doesn't apply cleanly but if under devtool you use git am and then fix the conflict manually (most likely in this case a patch -p1 < 96b6ae08c6ce47dbcb6625227905eda21383e2bc.patch and git am --continue you'll get a commit with the right attribution.

Alternatively, you could edit the patch file to set the right "From:"

beroset commented 2 years ago

OK, I think this will do it.

FlorentRevest commented 2 years ago

Thank you!