* [PR PATCH] New package: reform-tools-1.68+e378e651
@ 2025-03-02 0:44 joe-albanese
2025-03-02 1:39 ` [PR REVIEW] " classabbyamp
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-02 0:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1228 bytes --]
There is a new pull request by joe-albanese against master on the void-packages repository
https://github.com/joe-albanese/void-packages reform-tools
https://github.com/void-linux/void-packages/pull/54543
New package: reform-tools-1.68+e378e651
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/54543.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-reform-tools-54543.patch --]
[-- Type: text/x-diff, Size: 1667 bytes --]
From f173c12c3e5cfbf225d54d5b896de44e06a6f789 Mon Sep 17 00:00:00 2001
From: Joe Albanese <joe-albanese@protonmail.com>
Date: Sat, 1 Mar 2025 19:40:44 -0500
Subject: [PATCH] New package: reform-tools-1.68+e378e651
---
srcpkgs/reform-tools/files/reform-hw-setup/run | 5 +++++
srcpkgs/reform-tools/template | 18 ++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 srcpkgs/reform-tools/files/reform-hw-setup/run
create mode 100644 srcpkgs/reform-tools/template
diff --git a/srcpkgs/reform-tools/files/reform-hw-setup/run b/srcpkgs/reform-tools/files/reform-hw-setup/run
new file mode 100644
index 00000000000000..8a21289e80b0b0
--- /dev/null
+++ b/srcpkgs/reform-tools/files/reform-hw-setup/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec 2>&1
+reform-hw-setup
+exec chpst -b reform-hw-setup pause
diff --git a/srcpkgs/reform-tools/template b/srcpkgs/reform-tools/template
new file mode 100644
index 00000000000000..4c92652086ff36
--- /dev/null
+++ b/srcpkgs/reform-tools/template
@@ -0,0 +1,18 @@
+# Template file for 'reform-tools'
+pkgname=reform-tools
+version=1.68+e378e651
+revision=1
+archs="aarch64 aarch64-musl"
+depends="gcc make"
+short_desc="Tools for using MNT Reform hardware"
+maintainer="Joe Albanese <joe@joe-albanese.com>"
+license="AGPL-3.0-or-later"
+homepage="https://source.mnt.re/reform/reform-tools"
+distfiles="https://source.mnt.re/reform/reform-tools/-/archive/e378e651190e7ae61914f36598406c16d4d81213/reform-tools-e378e651190e7ae61914f36598406c16d4d81213.tar.gz"
+checksum=452a7ddbdcf95debbf9a816936d40beffad1640476711987132f30fd4d3e146b
+
+do_install() {
+
+ vlicense LICENSE.txt
+ vsv reform-hw-setup
+}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] New package: reform-tools-1.68+e378e651
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
@ 2025-03-02 1:39 ` classabbyamp
2025-03-02 1:39 ` classabbyamp
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2025-03-02 1:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54543#discussion_r1976521471
Comment:
```suggestion
archs="aarch64*"
```
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] New package: reform-tools-1.68+e378e651
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
2025-03-02 1:39 ` [PR REVIEW] " classabbyamp
2025-03-02 1:39 ` classabbyamp
@ 2025-03-02 1:39 ` classabbyamp
2025-03-02 2:48 ` joe-albanese
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2025-03-02 1:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54543#discussion_r1976521513
Comment:
```suggestion
do_install() {
```
probably `post_install`?
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] New package: reform-tools-1.68+e378e651
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
2025-03-02 1:39 ` [PR REVIEW] " classabbyamp
@ 2025-03-02 1:39 ` classabbyamp
2025-03-02 1:39 ` classabbyamp
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2025-03-02 1:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54543#discussion_r1976521443
Comment:
we only package releases, not arbitrary commits
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] New package: reform-tools-1.68+e378e651
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (2 preceding siblings ...)
2025-03-02 1:39 ` classabbyamp
@ 2025-03-02 2:48 ` joe-albanese
2025-03-02 3:50 ` [PR PATCH] [Updated] " joe-albanese
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-02 2:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
New review comment by joe-albanese on void-packages repository
https://github.com/void-linux/void-packages/pull/54543#discussion_r1976528786
Comment:
Thanks for the feedback! The project I'm packaging this stuff from is between full releases of these tools, and some of the patches required for them to work on Void are in master but not in a tagged release yet.
I can work with them to see if I can convince them to tag this commit 1.69 and will update
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: reform-tools-1.68+e378e651
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (3 preceding siblings ...)
2025-03-02 2:48 ` joe-albanese
@ 2025-03-02 3:50 ` joe-albanese
2025-03-05 5:11 ` [PR PATCH] [Updated] New package: reform-tools-1.69 joe-albanese
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-02 3:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]
There is an updated pull request by joe-albanese against master on the void-packages repository
https://github.com/joe-albanese/void-packages reform-tools
https://github.com/void-linux/void-packages/pull/54543
New package: reform-tools-1.68+e378e651
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/54543.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-reform-tools-54543.patch --]
[-- Type: text/x-diff, Size: 1639 bytes --]
From 3866615e03f6bb9fd383eb71761a48cf97b4f2d3 Mon Sep 17 00:00:00 2001
From: Joe Albanese <joe-albanese@protonmail.com>
Date: Sat, 1 Mar 2025 19:40:44 -0500
Subject: [PATCH] New package: reform-tools-1.69
---
srcpkgs/reform-tools/files/reform-hw-setup/run | 5 +++++
srcpkgs/reform-tools/template | 18 ++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 srcpkgs/reform-tools/files/reform-hw-setup/run
create mode 100644 srcpkgs/reform-tools/template
diff --git a/srcpkgs/reform-tools/files/reform-hw-setup/run b/srcpkgs/reform-tools/files/reform-hw-setup/run
new file mode 100644
index 00000000000000..8a21289e80b0b0
--- /dev/null
+++ b/srcpkgs/reform-tools/files/reform-hw-setup/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec 2>&1
+reform-hw-setup
+exec chpst -b reform-hw-setup pause
diff --git a/srcpkgs/reform-tools/template b/srcpkgs/reform-tools/template
new file mode 100644
index 00000000000000..3246e43fd14d15
--- /dev/null
+++ b/srcpkgs/reform-tools/template
@@ -0,0 +1,18 @@
+# Template file for 'reform-tools'
+pkgname=reform-tools
+version=1.69
+revision=1
+archs="aarch64*"
+depends="gcc make"
+short_desc="Tools for using MNT Reform hardware"
+maintainer="Joe Albanese <joe@joe-albanese.com>"
+license="AGPL-3.0-or-later"
+homepage="https://source.mnt.re/reform/reform-tools"
+distfiles="https://source.mnt.re/reform/reform-tools/-/archive/e378e651190e7ae61914f36598406c16d4d81213/reform-tools-e378e651190e7ae61914f36598406c16d4d81213.tar.gz"
+checksum=452a7ddbdcf95debbf9a816936d40beffad1640476711987132f30fd4d3e146b
+
+post_install() {
+
+ vlicense LICENSE.txt
+ vsv reform-hw-setup
+}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (4 preceding siblings ...)
2025-03-02 3:50 ` [PR PATCH] [Updated] " joe-albanese
@ 2025-03-05 5:11 ` joe-albanese
2025-03-06 4:21 ` [PR REVIEW] " classabbyamp
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-05 5:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
There is an updated pull request by joe-albanese against master on the void-packages repository
https://github.com/joe-albanese/void-packages reform-tools
https://github.com/void-linux/void-packages/pull/54543
New package: reform-tools-1.69
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/54543.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-reform-tools-54543.patch --]
[-- Type: text/x-diff, Size: 1639 bytes --]
From 9fd9e4c48448dd811e480173d295738606fd71a9 Mon Sep 17 00:00:00 2001
From: Joe Albanese <joe-albanese@protonmail.com>
Date: Sat, 1 Mar 2025 19:40:44 -0500
Subject: [PATCH] New package: reform-tools-1.69
---
srcpkgs/reform-tools/files/reform-hw-setup/run | 5 +++++
srcpkgs/reform-tools/template | 18 ++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 srcpkgs/reform-tools/files/reform-hw-setup/run
create mode 100644 srcpkgs/reform-tools/template
diff --git a/srcpkgs/reform-tools/files/reform-hw-setup/run b/srcpkgs/reform-tools/files/reform-hw-setup/run
new file mode 100644
index 00000000000000..8a21289e80b0b0
--- /dev/null
+++ b/srcpkgs/reform-tools/files/reform-hw-setup/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec 2>&1
+reform-hw-setup
+exec chpst -b reform-hw-setup pause
diff --git a/srcpkgs/reform-tools/template b/srcpkgs/reform-tools/template
new file mode 100644
index 00000000000000..3246e43fd14d15
--- /dev/null
+++ b/srcpkgs/reform-tools/template
@@ -0,0 +1,18 @@
+# Template file for 'reform-tools'
+pkgname=reform-tools
+version=1.69
+revision=1
+archs="aarch64*"
+depends="gcc make"
+short_desc="Tools for using MNT Reform hardware"
+maintainer="Joe Albanese <joe@joe-albanese.com>"
+license="AGPL-3.0-or-later"
+homepage="https://source.mnt.re/reform/reform-tools"
+distfiles="https://source.mnt.re/reform/reform-tools/-/archive/e378e651190e7ae61914f36598406c16d4d81213/reform-tools-e378e651190e7ae61914f36598406c16d4d81213.tar.gz"
+checksum=452a7ddbdcf95debbf9a816936d40beffad1640476711987132f30fd4d3e146b
+
+post_install() {
+
+ vlicense LICENSE.txt
+ vsv reform-hw-setup
+}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (5 preceding siblings ...)
2025-03-05 5:11 ` [PR PATCH] [Updated] New package: reform-tools-1.69 joe-albanese
@ 2025-03-06 4:21 ` classabbyamp
2025-03-08 2:31 ` [PR PATCH] [Updated] " joe-albanese
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: classabbyamp @ 2025-03-06 4:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/54543#discussion_r1982666108
Comment:
you probably also want to add a build style or actually run the makefile, right now it only installs what's specified in post_install
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (6 preceding siblings ...)
2025-03-06 4:21 ` [PR REVIEW] " classabbyamp
@ 2025-03-08 2:31 ` joe-albanese
2025-03-08 6:17 ` joe-albanese
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-08 2:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
There is an updated pull request by joe-albanese against master on the void-packages repository
https://github.com/joe-albanese/void-packages reform-tools
https://github.com/void-linux/void-packages/pull/54543
New package: reform-tools-1.69
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/54543.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-reform-tools-54543.patch --]
[-- Type: text/x-diff, Size: 1639 bytes --]
From ea5872d8bf4bffb9b8f67268393043e3c5378748 Mon Sep 17 00:00:00 2001
From: Joe Albanese <joe-albanese@protonmail.com>
Date: Sat, 1 Mar 2025 19:40:44 -0500
Subject: [PATCH] New package: reform-tools-1.69
---
srcpkgs/reform-tools/files/reform-hw-setup/run | 5 +++++
srcpkgs/reform-tools/template | 18 ++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 srcpkgs/reform-tools/files/reform-hw-setup/run
create mode 100644 srcpkgs/reform-tools/template
diff --git a/srcpkgs/reform-tools/files/reform-hw-setup/run b/srcpkgs/reform-tools/files/reform-hw-setup/run
new file mode 100644
index 00000000000000..8a21289e80b0b0
--- /dev/null
+++ b/srcpkgs/reform-tools/files/reform-hw-setup/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec 2>&1
+reform-hw-setup
+exec chpst -b reform-hw-setup pause
diff --git a/srcpkgs/reform-tools/template b/srcpkgs/reform-tools/template
new file mode 100644
index 00000000000000..3246e43fd14d15
--- /dev/null
+++ b/srcpkgs/reform-tools/template
@@ -0,0 +1,18 @@
+# Template file for 'reform-tools'
+pkgname=reform-tools
+version=1.69
+revision=1
+archs="aarch64*"
+depends="gcc make"
+short_desc="Tools for using MNT Reform hardware"
+maintainer="Joe Albanese <joe@joe-albanese.com>"
+license="AGPL-3.0-or-later"
+homepage="https://source.mnt.re/reform/reform-tools"
+distfiles="https://source.mnt.re/reform/reform-tools/-/archive/e378e651190e7ae61914f36598406c16d4d81213/reform-tools-e378e651190e7ae61914f36598406c16d4d81213.tar.gz"
+checksum=452a7ddbdcf95debbf9a816936d40beffad1640476711987132f30fd4d3e146b
+
+post_install() {
+
+ vlicense LICENSE.txt
+ vsv reform-hw-setup
+}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (7 preceding siblings ...)
2025-03-08 2:31 ` [PR PATCH] [Updated] " joe-albanese
@ 2025-03-08 6:17 ` joe-albanese
2025-03-11 5:16 ` joe-albanese
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-08 6:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
There is an updated pull request by joe-albanese against master on the void-packages repository
https://github.com/joe-albanese/void-packages reform-tools
https://github.com/void-linux/void-packages/pull/54543
New package: reform-tools-1.69
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/54543.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-reform-tools-54543.patch --]
[-- Type: text/x-diff, Size: 1676 bytes --]
From 8dc5c4888d356824a107ac1a1d4c3018f8689656 Mon Sep 17 00:00:00 2001
From: Joe Albanese <joe-albanese@protonmail.com>
Date: Sat, 1 Mar 2025 19:40:44 -0500
Subject: [PATCH] New package: reform-tools-1.69
---
.../reform-tools/files/reform-hw-setup/run | 5 +++++
srcpkgs/reform-tools/template | 19 +++++++++++++++++++
2 files changed, 24 insertions(+)
create mode 100644 srcpkgs/reform-tools/files/reform-hw-setup/run
create mode 100644 srcpkgs/reform-tools/template
diff --git a/srcpkgs/reform-tools/files/reform-hw-setup/run b/srcpkgs/reform-tools/files/reform-hw-setup/run
new file mode 100644
index 00000000000000..8a21289e80b0b0
--- /dev/null
+++ b/srcpkgs/reform-tools/files/reform-hw-setup/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec 2>&1
+reform-hw-setup
+exec chpst -b reform-hw-setup pause
diff --git a/srcpkgs/reform-tools/template b/srcpkgs/reform-tools/template
new file mode 100644
index 00000000000000..828eeeb546ba9e
--- /dev/null
+++ b/srcpkgs/reform-tools/template
@@ -0,0 +1,19 @@
+# Template file for 'reform-tools'
+pkgname=reform-tools
+version=1.69
+revision=1
+build_style=gnu-makefile
+archs="aarch64*"
+depends="python3-libusb1 python3-psutil"
+hostmakedepends="python3-libusb1 python3-psutil help2man make"
+short_desc="Tools for using MNT Reform hardware"
+maintainer="Joe Albanese <joe@joe-albanese.com>"
+license="AGPL-3.0-or-later"
+homepage="https://source.mnt.re/reform/reform-tools"
+distfiles="https://source.mnt.re/reform/reform-tools/-/archive/main/reform-tools-main.tar.gz"
+checksum=bce0ccf6298545b69bd84e5090b1e0fb68427793fc845215120db2752aed3158
+
+post_install() {
+ vlicense LICENSE.txt
+ vsv reform-hw-setup
+}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (8 preceding siblings ...)
2025-03-08 6:17 ` joe-albanese
@ 2025-03-11 5:16 ` joe-albanese
2025-03-11 5:18 ` [PR REVIEW] " joe-albanese
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-11 5:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
There is an updated pull request by joe-albanese against master on the void-packages repository
https://github.com/joe-albanese/void-packages reform-tools
https://github.com/void-linux/void-packages/pull/54543
New package: reform-tools-1.69
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/54543.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-reform-tools-54543.patch --]
[-- Type: text/x-diff, Size: 21252 bytes --]
From e4ffa6ff802bb4f3578bb35c1aa1f9a46ee0f95c Mon Sep 17 00:00:00 2001
From: Joe Albanese <joe-albanese@protonmail.com>
Date: Sat, 1 Mar 2025 19:40:44 -0500
Subject: [PATCH] New package: reform-tools-1.69
---
.../reform-tools/files/reform-hw-setup/run | 5 +
.../patches/reform-check_void.patch | 396 ++++++++++++++++++
srcpkgs/reform-tools/template | 19 +
3 files changed, 420 insertions(+)
create mode 100644 srcpkgs/reform-tools/files/reform-hw-setup/run
create mode 100644 srcpkgs/reform-tools/patches/reform-check_void.patch
create mode 100644 srcpkgs/reform-tools/template
diff --git a/srcpkgs/reform-tools/files/reform-hw-setup/run b/srcpkgs/reform-tools/files/reform-hw-setup/run
new file mode 100644
index 00000000000000..8a21289e80b0b0
--- /dev/null
+++ b/srcpkgs/reform-tools/files/reform-hw-setup/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec 2>&1
+reform-hw-setup
+exec chpst -b reform-hw-setup pause
diff --git a/srcpkgs/reform-tools/patches/reform-check_void.patch b/srcpkgs/reform-tools/patches/reform-check_void.patch
new file mode 100644
index 00000000000000..3215998d253d5c
--- /dev/null
+++ b/srcpkgs/reform-tools/patches/reform-check_void.patch
@@ -0,0 +1,396 @@
+diff --git a/bin/reform-check b/bin/reform-check
+index f898d08..5b91b47 100755
+--- a/bin/reform-check
++++ b/bin/reform-check
+@@ -102,6 +102,14 @@ if [ "$#" -gt 0 ]; then
+ exit 1
+ fi
+
++if [ -f "/etc/os-release" ]; then
++ if [ $(head -1 /etc/os-release | cut -d'=' -f 2) = '"Void"' ]; then
++ DISTRO=void-linux
++ fi
++else
++ DISTRO=debian-linux
++fi
++
+ if [ "$MIRROR" != "mntre.com" ] && [ "$MIRROR" != "reform.debian.net" ]; then
+ echo "E: invalid value for --mirror: $MIRROR -- only mntre.com and reform.debian.net are supported" >&2
+ exit 1
+@@ -134,7 +142,7 @@ if [ -z "$MIRROR" ]; then
+ MIRROR="mntre.com"
+ fi
+
+-if [ -z "$(apt-get indextargets)" ] && [ "$OFFLINE" != "yes" ]; then
++if [ $DISTRO = "debian-linux" ] && [ -z "$(apt-get indextargets)" ] && [ "$OFFLINE" != "yes" ]; then
+ echo "E: reform-check needs a populated apt cache for some of its operation." >&2
+ echo "E: re-run with --offline (disabling some checks) or choose to run apt-update now." >&2
+ printf "Should reform-check run 'apt update' for you? [y/N]" >&2
+@@ -158,8 +166,14 @@ fi
+
+ echo "I: Contents of /proc/device-tree/model: $(cat /proc/device-tree/model)" >&2
+ echo "I: \`uname -a\` output: $(uname -a)" >&2
+-echo "I: Version of linux-image-mnt-reform-arm64: $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64)" >&2
+-echo "I: Version of reform-tools: $(dpkg-query --show --showformat '${Version}' reform-tools)" >&2
++if [ $DISTRO = "debian-linux" ]; then
++ echo "I: Version of linux-image-mnt-reform-arm64: $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64)" >&2
++ echo "I: Version of reform-tools: $(dpkg-query --show --showformat '${Version}' reform-tools)" >&2
++elif [ $DISTRO = "void-linux" ]; then
++ echo "I: Version of pocket-reform-kernel: $(xbps-query --property=pkgver pocket-reform-kernel)" >&2
++ echo "I: Version of reform-tools: $(xbps-query --property=pkgver reform-tools)" >&2
++fi
++
+ HUMAN_ROOT=
+ case $(findmnt --noheadings --evaluate --mountpoint / --output SOURCE) in
+ "/dev/reformvg/root")
+@@ -227,27 +241,30 @@ case "$MIRROR" in
+ mntre.com) aptprefcontent="Package: *\nPin: release n=reform, l=reform\nPin-Priority: 990\n" ;;
+ reform.debian.net) aptprefcontent="Package: *\nPin: origin \"reform.debian.net\"\nPin-Priority: 999\n" ;;
+ esac
+-if [ ! -e /etc/apt/preferences.d/reform.pref ]; then
+- echo "E: /etc/apt/preferences.d/reform.pref doesn't exist" >&2
+- echo "E: you should not install packages on this system unless you know what you are doing" >&2
+- echo "E: /etc/apt/preferences.d/reform.pref should contain the following lines:" >&2
+- printf "$aptprefcontent" >&2
+-else
+- if ! printf "$aptprefcontent" | cmp --quiet - /etc/apt/preferences.d/reform.pref; then
+- echo "W: unexpected content in /etc/apt/preferences.d/reform.pref:" >&2
+- printf "$aptprefcontent" | diff -u - /etc/apt/preferences.d/reform.pref || true
+- echo "W: you should not install packages on this system unless you know what you are doing" >&2
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /etc/apt/preferences.d/reform.pref ]; then
++ echo "E: /etc/apt/preferences.d/reform.pref doesn't exist" >&2
++ echo "E: you should not install packages on this system unless you know what you are doing" >&2
++ echo "E: /etc/apt/preferences.d/reform.pref should contain the following lines:" >&2
++ printf "$aptprefcontent" >&2
++ else
++ if ! printf "$aptprefcontent" | cmp --quiet - /etc/apt/preferences.d/reform.pref; then
++ echo "W: unexpected content in /etc/apt/preferences.d/reform.pref:" >&2
++ printf "$aptprefcontent" | diff -u - /etc/apt/preferences.d/reform.pref || true
++ echo "W: you should not install packages on this system unless you know what you are doing" >&2
++ fi
+ fi
+-fi
+
+-notinstalled=
+-for package in $PKGSGUI $PKGSTOOLS $PKGSNET $PKGSADMIN $PKGSUTILS $PKGSMISC; do
+- if ! dpkg-query --showformat '${db:Status-Status}\n' --show "$package" 2>/dev/null | grep -q '^installed$'; then
+- notinstalled="$notinstalled $package"
++ notinstalled=
++ for package in $PKGSGUI $PKGSTOOLS $PKGSNET $PKGSADMIN $PKGSUTILS $PKGSMISC; do
++ if ! dpkg-query --showformat '${db:Status-Status}\n' --show "$package" 2>/dev/null | grep -q '^installed$'; then
++ notinstalled="$notinstalled $package"
++ fi
++ done
++
++ if [ -n "$notinstalled" ]; then
++ echo "I: not installed: $(echo "$notinstalled" | tr " " "\n" | sort | tr "\n" " ")" >&2
+ fi
+-done
+-if [ -n "$notinstalled" ]; then
+- echo "I: not installed: $(echo "$notinstalled" | tr " " "\n" | sort | tr "\n" " ")" >&2
+ fi
+
+ if [ -z "$(findmnt --fstab --noheadings --evaluate --mountpoint / --output SOURCE)" ]; then
+@@ -300,15 +317,18 @@ else
+ esac
+ fi
+
++
+ flashkerneldefaultcontent="LINUX_KERNEL_CMDLINE=\"\"\nLINUX_KERNEL_CMDLINE_DEFAULTS=\"\"\n"
+-if [ ! -e /etc/default/flash-kernel ]; then
+- echo "E: /etc/default/flash-kernel doesn't exist" >&2
+- echo "E: /etc/default/flash-kernel should contain the following lines:" >&2
+- printf "$flashkerneldefaultcontent" >&2
+-else
+- if ! printf "$flashkerneldefaultcontent" | cmp --quiet - /etc/default/flash-kernel; then
+- echo "W: unexpected content in /etc/default/flash-kernel:" >&2
+- printf "$flashkerneldefaultcontent" | diff -u - /etc/default/flash-kernel || true
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /etc/default/flash-kernel ]; then
++ echo "E: /etc/default/flash-kernel doesn't exist" >&2
++ echo "E: /etc/default/flash-kernel should contain the following lines:" >&2
++ printf "$flashkerneldefaultcontent" >&2
++ else
++ if ! printf "$flashkerneldefaultcontent" | cmp --quiet - /etc/default/flash-kernel; then
++ echo "W: unexpected content in /etc/default/flash-kernel:" >&2
++ printf "$flashkerneldefaultcontent" | diff -u - /etc/default/flash-kernel || true
++ fi
+ fi
+ fi
+
+@@ -349,91 +369,99 @@ if grep --quiet '^root::' /etc/shadow; then
+ echo "E: root account has no password (maybe run passwd -l root)" >&2
+ fi
+
+-if [ ! -e /etc/skel/.profile ]; then
+- echo "E: /etc/skel/.profile doesn't exist" >&2
+- echo "E: install the package bash to create it" >&2
+-else
+- # shellcheck disable=SC2016
+- skelprofilecontent='if [ "$(whoami)" = "root" ]; then reform-help --root; elif [ -z "$WAYLAND_DISPLAY" ]; then reform-help; fi'
+- if [ "$(tail -1 /etc/skel/.profile)" != "$skelprofilecontent" ]; then
+- echo "E: unexpected last line in /etc/skel/.profile, should be:" >&2
+- echo "$skelprofilecontent" >&2
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /etc/skel/.profile ]; then
++ echo "E: /etc/skel/.profile doesn't exist" >&2
++ echo "E: install the package bash to create it" >&2
++ else
++ # shellcheck disable=SC2016
++ skelprofilecontent='if [ "$(whoami)" = "root" ]; then reform-help --root; elif [ -z "$WAYLAND_DISPLAY" ]; then reform-help; fi'
++ if [ "$(tail -1 /etc/skel/.profile)" != "$skelprofilecontent" ]; then
++ echo "E: unexpected last line in /etc/skel/.profile, should be:" >&2
++ echo "$skelprofilecontent" >&2
++ fi
+ fi
+-fi
+
+-if [ -n "$(dpkg --verify reform-tools)" ]; then
+- echo "I: the following files differ from how they are shipped by reform-tools (ignore /var/lib/alsa/asound.state):" >&2
+- dpkg --verify reform-tools
+-fi
++ if [ -n "$(dpkg --verify reform-tools)" ]; then
++ echo "I: the following files differ from how they are shipped by reform-tools (ignore /var/lib/alsa/asound.state):" >&2
++ dpkg --verify reform-tools
++ fi
+
+-if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-arm64" 2>/dev/null | grep -q '^installed$'; then
+- case "$MIRROR" in mntre.com)
+- if ! apt-cache policy linux-image-arm64 | grep --quiet mntre.com; then
+- echo "E: the linux-image-arm64 package cannot come from the MNT repos" >&2
++ if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-arm64" 2>/dev/null | grep -q '^installed$'; then
++ case "$MIRROR" in mntre.com)
++ if ! apt-cache policy linux-image-arm64 | grep --quiet mntre.com; then
++ echo "E: the linux-image-arm64 package cannot come from the MNT repos" >&2
++ fi
++ ;;
++ reform.debian.net)
++ if ! apt-cache policy linux-image-arm64 | grep --quiet /reform.debian.net/; then
++ echo "E: the linux-image-arm64 package cannot come from the reform.debian.net repos" >&2
++ fi
++ ;;
++ *)
++ echo "invalid mirror: $MIRROR" >&2
++ exit 1
++ ;;
++ esac
++ echo "W: The deprecated meta-package linux-image-arm64 is installed." >&2
++ if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
++ echo "W: Since the new meta-package linux-image-mnt-reform-arm64 is installed," >&2
++ echo "W: the old meta-package linux-image-arm64 should be removed." >&2
++ else
++ echo "W: Please install the new meta-package linux-image-mnt-reform-arm64" >&2
++ echo "W: and remove the old meta-package linux-image-arm64." >&2
+ fi
+- ;;
+- reform.debian.net)
+- if ! apt-cache policy linux-image-arm64 | grep --quiet /reform.debian.net/; then
+- echo "E: the linux-image-arm64 package cannot come from the reform.debian.net repos" >&2
++ if ! dpkg-query --showformat '${Version}' --show linux-image-arm64 | grep --quiet reform; then
++ echo "E: the currently installed package linux-image-arm64 does not come with Reform patches" >&2
+ fi
+- ;;
+- *)
+- echo "invalid mirror: $MIRROR" >&2
+- exit 1
+- ;;
+- esac
+- echo "W: The deprecated meta-package linux-image-arm64 is installed." >&2
+- if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
+- echo "W: Since the new meta-package linux-image-mnt-reform-arm64 is installed," >&2
+- echo "W: the old meta-package linux-image-arm64 should be removed." >&2
+- else
+- echo "W: Please install the new meta-package linux-image-mnt-reform-arm64" >&2
+- echo "W: and remove the old meta-package linux-image-arm64." >&2
+ fi
+- if ! dpkg-query --showformat '${Version}' --show linux-image-arm64 | grep --quiet reform; then
+- echo "E: the currently installed package linux-image-arm64 does not come with Reform patches" >&2
++
++ if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
++ case "$MIRROR" in mntre.com)
++ if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet mntre.com; then
++ echo "E: the linux-image-mnt-reform-arm64 package cannot come from the MNT repos" >&2
++ fi
++ ;;
++ reform.debian.net)
++ if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet /reform.debian.net/; then
++ echo "E: the linux-image-mnt-reform-arm64 package cannot come from the reform.debian.net repos" >&2
++ fi
++ ;;
++ *)
++ echo "invalid mirror: $MIRROR" >&2
++ exit 1
++ ;;
++ esac
+ fi
+-fi
+
+-if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
+- case "$MIRROR" in mntre.com)
+- if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet mntre.com; then
+- echo "E: the linux-image-mnt-reform-arm64 package cannot come from the MNT repos" >&2
++
++ for file in /boot/initrd.img-*-reform2-arm64 /boot/vmlinuz-*-reform2-arm64; do
++ if [ ! -e "$file" ]; then
++ continue
+ fi
+- ;;
+- reform.debian.net)
+- if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet /reform.debian.net/; then
+- echo "E: the linux-image-mnt-reform-arm64 package cannot come from the reform.debian.net repos" >&2
++ echo "I: file from deprecated kernel flavour found: $file" >&2
++ done
++
++ for file in /boot/initrd.img-*-mnt-reform-arm64 /boot/vmlinuz-*-mnt-reform-arm64; do
++ suffix="${file##/boot/}"
++ suffix="${suffix##initrd.img-}"
++ suffix="${suffix##vmlinuz-}"
++ if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$suffix" 2>/dev/null | grep -q '^installed$'; then
++ echo "I: $file does not belong to any installed kernel package" >&2
+ fi
+- ;;
+- *)
+- echo "invalid mirror: $MIRROR" >&2
+- exit 1
+- ;;
+- esac
++ done
+ fi
+-
+-for file in /boot/initrd.img-*-reform2-arm64 /boot/vmlinuz-*-reform2-arm64; do
+- if [ ! -e "$file" ]; then
+- continue
++if [ $DISTRO = "debain-linux" ]; then
++ if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
++ echo "E: the currently running kernel is not installed as a package" >&2
+ fi
+- echo "I: file from deprecated kernel flavour found: $file" >&2
+-done
+-
+-for file in /boot/initrd.img-*-mnt-reform-arm64 /boot/vmlinuz-*-mnt-reform-arm64; do
+- suffix="${file##/boot/}"
+- suffix="${suffix##initrd.img-}"
+- suffix="${suffix##vmlinuz-}"
+- if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$suffix" 2>/dev/null | grep -q '^installed$'; then
+- echo "I: $file does not belong to any installed kernel package" >&2
++ if ! uname --kernel-version | grep --quiet --fixed-strings " $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64) "; then
++ echo "E: the currently running kernel is not the one provided by linux-image-mnt-reform-arm64" >&2
++ fi
++elif [ $DISTRO = "void-linux" ]; then
++ if [ $(xbps-query --property=pkgver pocket-reform-kernel) != "pocket-reform-kernel-$(uname -r)" ]; then
++ echo "E: the currently running kernel is not the one provided by pocket-reform-kernel" >&2
+ fi
+-done
+-
+-if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
+- echo "E: the currently running kernel is not installed as a package" >&2
+-fi
+-if ! uname --kernel-version | grep --quiet --fixed-strings " $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64) "; then
+- echo "E: the currently running kernel is not the one provided by linux-image-mnt-reform-arm64" >&2
+ fi
+
+ if [ "$MIRROR" = "reform.debian.net" ]; then
+@@ -443,25 +471,41 @@ if [ "$MIRROR" = "reform.debian.net" ]; then
+ fi
+ fi
+
+-if [ ! -e /boot/boot.scr ]; then
+- echo "E: /boot/boot.scr doesn't exist" >&2
+- echo "E: run 'sudo flash-kernel' to create it" >&2
+-elif ! grep --quiet "setenv fk_kvers '$(uname -r)'" /boot/boot.scr; then
+- echo "E: /boot/boot.scr doesn't reference the currently running kernel" >&2
+-fi
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /boot/boot.scr ]; then
++ echo "E: /boot/boot.scr doesn't exist" >&2
++ echo "E: run 'sudo flash-kernel' to create it" >&2
++ elif ! grep --quiet "setenv fk_kvers '$(uname -r)'" /boot/boot.scr; then
++ echo "E: /boot/boot.scr doesn't reference the currently running kernel" >&2
++ fi
+
+-if [ ! -e "/boot/vmlinuz-$(uname -r)" ]; then
+- echo "E: no vmlinuz in /boot for the currently running kernel" >&2
+-fi
++ if [ ! -e "/boot/vmlinuz-$(uname -r)" ]; then
++ echo "E: no vmlinuz in /boot for the currently running kernel" >&2
++ fi
++
++ if [ ! -e "/boot/initrd.img-$(uname -r)" ]; then
++ echo "E: no initrd.img in /boot for the currently running kernel" >&2
++ fi
++elif [ $DISTRO = "void-linux" ]; then
++ if [ ! -e /boot/extlinux/extlinux.conf ]; then
++ echo "E: /boot/extlinux/extlinux.conf doesn't exist" >&2
++ elif ! grep --quiet "linux /vmlinux-$(uname -r)" /boot/extlinux/extlinux.conf; then
++ echo "E: /boot/extlinux/extlinux.conf doesn't reference the currently running kernel" >&2
++ fi
+
+-if [ ! -e "/boot/initrd.img-$(uname -r)" ]; then
+- echo "E: no initrd.img in /boot for the currently running kernel" >&2
++ if [ ! -e "/boot/vmlinux-$(uname -r)" ]; then
++ echo "E: no vmlinux in /boot for the currently running kernel" >&2
++ fi
++
++ if [ ! -e "/boot/initramfs-$(uname -r).img" ]; then
++ echo "E: no initramfs.img in /boot for the currently running kernel" >&2
++ fi
+ fi
+
+ if [ ! -e "/boot/dtb-$(uname -r)" ]; then
+ echo "E: no dtb-* symlink for the currently running kernel" >&2
+ echo "E: run 'sudo flash-kernel' to create it" >&2
+-elif [ ! -e "/boot/dtbs/$(uname -r)/$DTBPATH" ]; then
++elif [ $DISTRO = "debian-linux" ] && [ ! -e "/boot/dtbs/$(uname -r)/$DTBPATH" ]; then
+ echo "E: device tree file $DTBPATH is missing from /boot/dtbs" >&2
+ elif [ "$(readlink "/boot/dtb-$(uname -r)")" != "dtbs/$(uname -r)/$DTBPATH" ]; then
+ echo "E: /boot/dtb-$(uname -r) symlink does not reference dtbs/$(uname -r)/$DTBPATH but: $(readlink "/boot/dtb-$(uname -r)")" >&2
+@@ -510,21 +554,27 @@ if [ "$(tr ' ' '\n' </proc/cmdline | grep console= | tail -1)" != "console=tty1"
+ echo "W: This could lead to the luks password prompt being printed to serial instead of your screen." >&2
+ fi
+
+-if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-headers-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
++
++if [ $DISTRO = "debian-linux" ] && ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-headers-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
+ echo "E: the linux header package linux-headers-$(uname -r) for the currently running kernel is not installed" >&2
++elif [ $DISTRO = "void-linux" ] && [ $(xbps-query --property=pkgver pocket-reform-kernel-headers) != "pocket-reform-kernel-headers-$(uname -r)" ]; then
++ echo "E: the linux header package pocket-reform-kernel-headers-$(uname -r) for the currently running kernel is not installed" >&2
++fi
++
++if [ $DISTRO = "debian-linux" ]; then
++ for f in mntre reform_bookworm reform_bookworm-backports; do
++ file="/etc/apt/sources.list.d/${f}.sources"
++ if [ ! -e "$file" ]; then
++ continue
++ fi
++ if [ "$(stat -c %a "$file")" != 666 ]; then
++ # nothing to do
++ continue
++ fi
++ echo "E: $file has insecure permissions 0666, consider a chmod 644" >&2
++ done
+ fi
+
+-for f in mntre reform_bookworm reform_bookworm-backports; do
+- file="/etc/apt/sources.list.d/${f}.sources"
+- if [ ! -e "$file" ]; then
+- continue
+- fi
+- if [ "$(stat -c %a "$file")" != 666 ]; then
+- # nothing to do
+- continue
+- fi
+- echo "E: $file has insecure permissions 0666, consider a chmod 644" >&2
+-done
+ for f in . firefox firefox/syspref.js motd-full motd-rescue profile.d profile.d/reform.sh profile.d/reform-setup.sh; do
+ file="/etc/$f"
+ if [ ! -e "$file" ]; then
+@@ -574,7 +624,7 @@ esac
+
+ if [ "$OFFLINE" = "yes" ]; then
+ echo "I: skipping the remaining checks because --offline was used" >&2
+-else
++elif [ $DISTRO = "debian-linux" ]; then
+ # shellcheck disable=SC2016
+ case "$MIRROR" in mntre.com)
+ if [ "$(apt-get indextargets 'Created-By: Packages' 'Repo-URI: https://mntre.com/reform-debian-repo/' --format '$(RELEASE)')" != reform ]; then
diff --git a/srcpkgs/reform-tools/template b/srcpkgs/reform-tools/template
new file mode 100644
index 00000000000000..6cee7e6fc38d9f
--- /dev/null
+++ b/srcpkgs/reform-tools/template
@@ -0,0 +1,19 @@
+# Template file for 'reform-tools'
+pkgname=reform-tools
+version=1.69
+revision=1
+build_style=gnu-makefile
+archs="aarch64*"
+depends="python3-libusb1 python3-psutil"
+hostmakedepends="python3-libusb1 python3-psutil help2man make"
+short_desc="Tools for using MNT Reform hardware"
+maintainer="Joe Albanese <joe@joe-albanese.com>"
+license="AGPL-3.0-or-later"
+homepage="https://source.mnt.re/reform/reform-tools"
+distfiles="https://source.mnt.re/reform/reform-tools/-/archive/1.69/reform-tools-1.69.tar.gz"
+checksum=80630150e7a20191d4d1457b93a057b3b454d04dfb37b25af674c56143302e3d
+
+post_install() {
+ vlicense LICENSE.txt
+ vsv reform-hw-setup
+}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR REVIEW] New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (9 preceding siblings ...)
2025-03-11 5:16 ` joe-albanese
@ 2025-03-11 5:18 ` joe-albanese
2025-03-11 5:20 ` [PR PATCH] [Updated] " joe-albanese
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-11 5:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
New review comment by joe-albanese on void-packages repository
https://github.com/void-linux/void-packages/pull/54543#discussion_r1988412515
Comment:
haha yeah, somehow I completely missed that. I realized I had installed all of those files by hand and forgot to delete them before I tested my package. This should be good now :)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (10 preceding siblings ...)
2025-03-11 5:18 ` [PR REVIEW] " joe-albanese
@ 2025-03-11 5:20 ` joe-albanese
2025-03-11 5:51 ` joe-albanese
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-11 5:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
There is an updated pull request by joe-albanese against master on the void-packages repository
https://github.com/joe-albanese/void-packages reform-tools
https://github.com/void-linux/void-packages/pull/54543
New package: reform-tools-1.69
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/54543.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-reform-tools-54543.patch --]
[-- Type: text/x-diff, Size: 21252 bytes --]
From 3f70e00ec7b5430c9c5cfe2e7f957de3c290ca0c Mon Sep 17 00:00:00 2001
From: Joe Albanese <joe-albanese@protonmail.com>
Date: Sat, 1 Mar 2025 19:40:44 -0500
Subject: [PATCH] New package: reform-tools-1.69
---
.../reform-tools/files/reform-hw-setup/run | 5 +
.../patches/reform-check_void.patch | 396 ++++++++++++++++++
srcpkgs/reform-tools/template | 19 +
3 files changed, 420 insertions(+)
create mode 100644 srcpkgs/reform-tools/files/reform-hw-setup/run
create mode 100644 srcpkgs/reform-tools/patches/reform-check_void.patch
create mode 100644 srcpkgs/reform-tools/template
diff --git a/srcpkgs/reform-tools/files/reform-hw-setup/run b/srcpkgs/reform-tools/files/reform-hw-setup/run
new file mode 100644
index 00000000000000..8a21289e80b0b0
--- /dev/null
+++ b/srcpkgs/reform-tools/files/reform-hw-setup/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec 2>&1
+reform-hw-setup
+exec chpst -b reform-hw-setup pause
diff --git a/srcpkgs/reform-tools/patches/reform-check_void.patch b/srcpkgs/reform-tools/patches/reform-check_void.patch
new file mode 100644
index 00000000000000..3215998d253d5c
--- /dev/null
+++ b/srcpkgs/reform-tools/patches/reform-check_void.patch
@@ -0,0 +1,396 @@
+diff --git a/bin/reform-check b/bin/reform-check
+index f898d08..5b91b47 100755
+--- a/bin/reform-check
++++ b/bin/reform-check
+@@ -102,6 +102,14 @@ if [ "$#" -gt 0 ]; then
+ exit 1
+ fi
+
++if [ -f "/etc/os-release" ]; then
++ if [ $(head -1 /etc/os-release | cut -d'=' -f 2) = '"Void"' ]; then
++ DISTRO=void-linux
++ fi
++else
++ DISTRO=debian-linux
++fi
++
+ if [ "$MIRROR" != "mntre.com" ] && [ "$MIRROR" != "reform.debian.net" ]; then
+ echo "E: invalid value for --mirror: $MIRROR -- only mntre.com and reform.debian.net are supported" >&2
+ exit 1
+@@ -134,7 +142,7 @@ if [ -z "$MIRROR" ]; then
+ MIRROR="mntre.com"
+ fi
+
+-if [ -z "$(apt-get indextargets)" ] && [ "$OFFLINE" != "yes" ]; then
++if [ $DISTRO = "debian-linux" ] && [ -z "$(apt-get indextargets)" ] && [ "$OFFLINE" != "yes" ]; then
+ echo "E: reform-check needs a populated apt cache for some of its operation." >&2
+ echo "E: re-run with --offline (disabling some checks) or choose to run apt-update now." >&2
+ printf "Should reform-check run 'apt update' for you? [y/N]" >&2
+@@ -158,8 +166,14 @@ fi
+
+ echo "I: Contents of /proc/device-tree/model: $(cat /proc/device-tree/model)" >&2
+ echo "I: \`uname -a\` output: $(uname -a)" >&2
+-echo "I: Version of linux-image-mnt-reform-arm64: $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64)" >&2
+-echo "I: Version of reform-tools: $(dpkg-query --show --showformat '${Version}' reform-tools)" >&2
++if [ $DISTRO = "debian-linux" ]; then
++ echo "I: Version of linux-image-mnt-reform-arm64: $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64)" >&2
++ echo "I: Version of reform-tools: $(dpkg-query --show --showformat '${Version}' reform-tools)" >&2
++elif [ $DISTRO = "void-linux" ]; then
++ echo "I: Version of pocket-reform-kernel: $(xbps-query --property=pkgver pocket-reform-kernel)" >&2
++ echo "I: Version of reform-tools: $(xbps-query --property=pkgver reform-tools)" >&2
++fi
++
+ HUMAN_ROOT=
+ case $(findmnt --noheadings --evaluate --mountpoint / --output SOURCE) in
+ "/dev/reformvg/root")
+@@ -227,27 +241,30 @@ case "$MIRROR" in
+ mntre.com) aptprefcontent="Package: *\nPin: release n=reform, l=reform\nPin-Priority: 990\n" ;;
+ reform.debian.net) aptprefcontent="Package: *\nPin: origin \"reform.debian.net\"\nPin-Priority: 999\n" ;;
+ esac
+-if [ ! -e /etc/apt/preferences.d/reform.pref ]; then
+- echo "E: /etc/apt/preferences.d/reform.pref doesn't exist" >&2
+- echo "E: you should not install packages on this system unless you know what you are doing" >&2
+- echo "E: /etc/apt/preferences.d/reform.pref should contain the following lines:" >&2
+- printf "$aptprefcontent" >&2
+-else
+- if ! printf "$aptprefcontent" | cmp --quiet - /etc/apt/preferences.d/reform.pref; then
+- echo "W: unexpected content in /etc/apt/preferences.d/reform.pref:" >&2
+- printf "$aptprefcontent" | diff -u - /etc/apt/preferences.d/reform.pref || true
+- echo "W: you should not install packages on this system unless you know what you are doing" >&2
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /etc/apt/preferences.d/reform.pref ]; then
++ echo "E: /etc/apt/preferences.d/reform.pref doesn't exist" >&2
++ echo "E: you should not install packages on this system unless you know what you are doing" >&2
++ echo "E: /etc/apt/preferences.d/reform.pref should contain the following lines:" >&2
++ printf "$aptprefcontent" >&2
++ else
++ if ! printf "$aptprefcontent" | cmp --quiet - /etc/apt/preferences.d/reform.pref; then
++ echo "W: unexpected content in /etc/apt/preferences.d/reform.pref:" >&2
++ printf "$aptprefcontent" | diff -u - /etc/apt/preferences.d/reform.pref || true
++ echo "W: you should not install packages on this system unless you know what you are doing" >&2
++ fi
+ fi
+-fi
+
+-notinstalled=
+-for package in $PKGSGUI $PKGSTOOLS $PKGSNET $PKGSADMIN $PKGSUTILS $PKGSMISC; do
+- if ! dpkg-query --showformat '${db:Status-Status}\n' --show "$package" 2>/dev/null | grep -q '^installed$'; then
+- notinstalled="$notinstalled $package"
++ notinstalled=
++ for package in $PKGSGUI $PKGSTOOLS $PKGSNET $PKGSADMIN $PKGSUTILS $PKGSMISC; do
++ if ! dpkg-query --showformat '${db:Status-Status}\n' --show "$package" 2>/dev/null | grep -q '^installed$'; then
++ notinstalled="$notinstalled $package"
++ fi
++ done
++
++ if [ -n "$notinstalled" ]; then
++ echo "I: not installed: $(echo "$notinstalled" | tr " " "\n" | sort | tr "\n" " ")" >&2
+ fi
+-done
+-if [ -n "$notinstalled" ]; then
+- echo "I: not installed: $(echo "$notinstalled" | tr " " "\n" | sort | tr "\n" " ")" >&2
+ fi
+
+ if [ -z "$(findmnt --fstab --noheadings --evaluate --mountpoint / --output SOURCE)" ]; then
+@@ -300,15 +317,18 @@ else
+ esac
+ fi
+
++
+ flashkerneldefaultcontent="LINUX_KERNEL_CMDLINE=\"\"\nLINUX_KERNEL_CMDLINE_DEFAULTS=\"\"\n"
+-if [ ! -e /etc/default/flash-kernel ]; then
+- echo "E: /etc/default/flash-kernel doesn't exist" >&2
+- echo "E: /etc/default/flash-kernel should contain the following lines:" >&2
+- printf "$flashkerneldefaultcontent" >&2
+-else
+- if ! printf "$flashkerneldefaultcontent" | cmp --quiet - /etc/default/flash-kernel; then
+- echo "W: unexpected content in /etc/default/flash-kernel:" >&2
+- printf "$flashkerneldefaultcontent" | diff -u - /etc/default/flash-kernel || true
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /etc/default/flash-kernel ]; then
++ echo "E: /etc/default/flash-kernel doesn't exist" >&2
++ echo "E: /etc/default/flash-kernel should contain the following lines:" >&2
++ printf "$flashkerneldefaultcontent" >&2
++ else
++ if ! printf "$flashkerneldefaultcontent" | cmp --quiet - /etc/default/flash-kernel; then
++ echo "W: unexpected content in /etc/default/flash-kernel:" >&2
++ printf "$flashkerneldefaultcontent" | diff -u - /etc/default/flash-kernel || true
++ fi
+ fi
+ fi
+
+@@ -349,91 +369,99 @@ if grep --quiet '^root::' /etc/shadow; then
+ echo "E: root account has no password (maybe run passwd -l root)" >&2
+ fi
+
+-if [ ! -e /etc/skel/.profile ]; then
+- echo "E: /etc/skel/.profile doesn't exist" >&2
+- echo "E: install the package bash to create it" >&2
+-else
+- # shellcheck disable=SC2016
+- skelprofilecontent='if [ "$(whoami)" = "root" ]; then reform-help --root; elif [ -z "$WAYLAND_DISPLAY" ]; then reform-help; fi'
+- if [ "$(tail -1 /etc/skel/.profile)" != "$skelprofilecontent" ]; then
+- echo "E: unexpected last line in /etc/skel/.profile, should be:" >&2
+- echo "$skelprofilecontent" >&2
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /etc/skel/.profile ]; then
++ echo "E: /etc/skel/.profile doesn't exist" >&2
++ echo "E: install the package bash to create it" >&2
++ else
++ # shellcheck disable=SC2016
++ skelprofilecontent='if [ "$(whoami)" = "root" ]; then reform-help --root; elif [ -z "$WAYLAND_DISPLAY" ]; then reform-help; fi'
++ if [ "$(tail -1 /etc/skel/.profile)" != "$skelprofilecontent" ]; then
++ echo "E: unexpected last line in /etc/skel/.profile, should be:" >&2
++ echo "$skelprofilecontent" >&2
++ fi
+ fi
+-fi
+
+-if [ -n "$(dpkg --verify reform-tools)" ]; then
+- echo "I: the following files differ from how they are shipped by reform-tools (ignore /var/lib/alsa/asound.state):" >&2
+- dpkg --verify reform-tools
+-fi
++ if [ -n "$(dpkg --verify reform-tools)" ]; then
++ echo "I: the following files differ from how they are shipped by reform-tools (ignore /var/lib/alsa/asound.state):" >&2
++ dpkg --verify reform-tools
++ fi
+
+-if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-arm64" 2>/dev/null | grep -q '^installed$'; then
+- case "$MIRROR" in mntre.com)
+- if ! apt-cache policy linux-image-arm64 | grep --quiet mntre.com; then
+- echo "E: the linux-image-arm64 package cannot come from the MNT repos" >&2
++ if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-arm64" 2>/dev/null | grep -q '^installed$'; then
++ case "$MIRROR" in mntre.com)
++ if ! apt-cache policy linux-image-arm64 | grep --quiet mntre.com; then
++ echo "E: the linux-image-arm64 package cannot come from the MNT repos" >&2
++ fi
++ ;;
++ reform.debian.net)
++ if ! apt-cache policy linux-image-arm64 | grep --quiet /reform.debian.net/; then
++ echo "E: the linux-image-arm64 package cannot come from the reform.debian.net repos" >&2
++ fi
++ ;;
++ *)
++ echo "invalid mirror: $MIRROR" >&2
++ exit 1
++ ;;
++ esac
++ echo "W: The deprecated meta-package linux-image-arm64 is installed." >&2
++ if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
++ echo "W: Since the new meta-package linux-image-mnt-reform-arm64 is installed," >&2
++ echo "W: the old meta-package linux-image-arm64 should be removed." >&2
++ else
++ echo "W: Please install the new meta-package linux-image-mnt-reform-arm64" >&2
++ echo "W: and remove the old meta-package linux-image-arm64." >&2
+ fi
+- ;;
+- reform.debian.net)
+- if ! apt-cache policy linux-image-arm64 | grep --quiet /reform.debian.net/; then
+- echo "E: the linux-image-arm64 package cannot come from the reform.debian.net repos" >&2
++ if ! dpkg-query --showformat '${Version}' --show linux-image-arm64 | grep --quiet reform; then
++ echo "E: the currently installed package linux-image-arm64 does not come with Reform patches" >&2
+ fi
+- ;;
+- *)
+- echo "invalid mirror: $MIRROR" >&2
+- exit 1
+- ;;
+- esac
+- echo "W: The deprecated meta-package linux-image-arm64 is installed." >&2
+- if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
+- echo "W: Since the new meta-package linux-image-mnt-reform-arm64 is installed," >&2
+- echo "W: the old meta-package linux-image-arm64 should be removed." >&2
+- else
+- echo "W: Please install the new meta-package linux-image-mnt-reform-arm64" >&2
+- echo "W: and remove the old meta-package linux-image-arm64." >&2
+ fi
+- if ! dpkg-query --showformat '${Version}' --show linux-image-arm64 | grep --quiet reform; then
+- echo "E: the currently installed package linux-image-arm64 does not come with Reform patches" >&2
++
++ if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
++ case "$MIRROR" in mntre.com)
++ if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet mntre.com; then
++ echo "E: the linux-image-mnt-reform-arm64 package cannot come from the MNT repos" >&2
++ fi
++ ;;
++ reform.debian.net)
++ if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet /reform.debian.net/; then
++ echo "E: the linux-image-mnt-reform-arm64 package cannot come from the reform.debian.net repos" >&2
++ fi
++ ;;
++ *)
++ echo "invalid mirror: $MIRROR" >&2
++ exit 1
++ ;;
++ esac
+ fi
+-fi
+
+-if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
+- case "$MIRROR" in mntre.com)
+- if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet mntre.com; then
+- echo "E: the linux-image-mnt-reform-arm64 package cannot come from the MNT repos" >&2
++
++ for file in /boot/initrd.img-*-reform2-arm64 /boot/vmlinuz-*-reform2-arm64; do
++ if [ ! -e "$file" ]; then
++ continue
+ fi
+- ;;
+- reform.debian.net)
+- if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet /reform.debian.net/; then
+- echo "E: the linux-image-mnt-reform-arm64 package cannot come from the reform.debian.net repos" >&2
++ echo "I: file from deprecated kernel flavour found: $file" >&2
++ done
++
++ for file in /boot/initrd.img-*-mnt-reform-arm64 /boot/vmlinuz-*-mnt-reform-arm64; do
++ suffix="${file##/boot/}"
++ suffix="${suffix##initrd.img-}"
++ suffix="${suffix##vmlinuz-}"
++ if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$suffix" 2>/dev/null | grep -q '^installed$'; then
++ echo "I: $file does not belong to any installed kernel package" >&2
+ fi
+- ;;
+- *)
+- echo "invalid mirror: $MIRROR" >&2
+- exit 1
+- ;;
+- esac
++ done
+ fi
+-
+-for file in /boot/initrd.img-*-reform2-arm64 /boot/vmlinuz-*-reform2-arm64; do
+- if [ ! -e "$file" ]; then
+- continue
++if [ $DISTRO = "debain-linux" ]; then
++ if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
++ echo "E: the currently running kernel is not installed as a package" >&2
+ fi
+- echo "I: file from deprecated kernel flavour found: $file" >&2
+-done
+-
+-for file in /boot/initrd.img-*-mnt-reform-arm64 /boot/vmlinuz-*-mnt-reform-arm64; do
+- suffix="${file##/boot/}"
+- suffix="${suffix##initrd.img-}"
+- suffix="${suffix##vmlinuz-}"
+- if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$suffix" 2>/dev/null | grep -q '^installed$'; then
+- echo "I: $file does not belong to any installed kernel package" >&2
++ if ! uname --kernel-version | grep --quiet --fixed-strings " $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64) "; then
++ echo "E: the currently running kernel is not the one provided by linux-image-mnt-reform-arm64" >&2
++ fi
++elif [ $DISTRO = "void-linux" ]; then
++ if [ $(xbps-query --property=pkgver pocket-reform-kernel) != "pocket-reform-kernel-$(uname -r)" ]; then
++ echo "E: the currently running kernel is not the one provided by pocket-reform-kernel" >&2
+ fi
+-done
+-
+-if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
+- echo "E: the currently running kernel is not installed as a package" >&2
+-fi
+-if ! uname --kernel-version | grep --quiet --fixed-strings " $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64) "; then
+- echo "E: the currently running kernel is not the one provided by linux-image-mnt-reform-arm64" >&2
+ fi
+
+ if [ "$MIRROR" = "reform.debian.net" ]; then
+@@ -443,25 +471,41 @@ if [ "$MIRROR" = "reform.debian.net" ]; then
+ fi
+ fi
+
+-if [ ! -e /boot/boot.scr ]; then
+- echo "E: /boot/boot.scr doesn't exist" >&2
+- echo "E: run 'sudo flash-kernel' to create it" >&2
+-elif ! grep --quiet "setenv fk_kvers '$(uname -r)'" /boot/boot.scr; then
+- echo "E: /boot/boot.scr doesn't reference the currently running kernel" >&2
+-fi
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /boot/boot.scr ]; then
++ echo "E: /boot/boot.scr doesn't exist" >&2
++ echo "E: run 'sudo flash-kernel' to create it" >&2
++ elif ! grep --quiet "setenv fk_kvers '$(uname -r)'" /boot/boot.scr; then
++ echo "E: /boot/boot.scr doesn't reference the currently running kernel" >&2
++ fi
+
+-if [ ! -e "/boot/vmlinuz-$(uname -r)" ]; then
+- echo "E: no vmlinuz in /boot for the currently running kernel" >&2
+-fi
++ if [ ! -e "/boot/vmlinuz-$(uname -r)" ]; then
++ echo "E: no vmlinuz in /boot for the currently running kernel" >&2
++ fi
++
++ if [ ! -e "/boot/initrd.img-$(uname -r)" ]; then
++ echo "E: no initrd.img in /boot for the currently running kernel" >&2
++ fi
++elif [ $DISTRO = "void-linux" ]; then
++ if [ ! -e /boot/extlinux/extlinux.conf ]; then
++ echo "E: /boot/extlinux/extlinux.conf doesn't exist" >&2
++ elif ! grep --quiet "linux /vmlinux-$(uname -r)" /boot/extlinux/extlinux.conf; then
++ echo "E: /boot/extlinux/extlinux.conf doesn't reference the currently running kernel" >&2
++ fi
+
+-if [ ! -e "/boot/initrd.img-$(uname -r)" ]; then
+- echo "E: no initrd.img in /boot for the currently running kernel" >&2
++ if [ ! -e "/boot/vmlinux-$(uname -r)" ]; then
++ echo "E: no vmlinux in /boot for the currently running kernel" >&2
++ fi
++
++ if [ ! -e "/boot/initramfs-$(uname -r).img" ]; then
++ echo "E: no initramfs.img in /boot for the currently running kernel" >&2
++ fi
+ fi
+
+ if [ ! -e "/boot/dtb-$(uname -r)" ]; then
+ echo "E: no dtb-* symlink for the currently running kernel" >&2
+ echo "E: run 'sudo flash-kernel' to create it" >&2
+-elif [ ! -e "/boot/dtbs/$(uname -r)/$DTBPATH" ]; then
++elif [ $DISTRO = "debian-linux" ] && [ ! -e "/boot/dtbs/$(uname -r)/$DTBPATH" ]; then
+ echo "E: device tree file $DTBPATH is missing from /boot/dtbs" >&2
+ elif [ "$(readlink "/boot/dtb-$(uname -r)")" != "dtbs/$(uname -r)/$DTBPATH" ]; then
+ echo "E: /boot/dtb-$(uname -r) symlink does not reference dtbs/$(uname -r)/$DTBPATH but: $(readlink "/boot/dtb-$(uname -r)")" >&2
+@@ -510,21 +554,27 @@ if [ "$(tr ' ' '\n' </proc/cmdline | grep console= | tail -1)" != "console=tty1"
+ echo "W: This could lead to the luks password prompt being printed to serial instead of your screen." >&2
+ fi
+
+-if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-headers-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
++
++if [ $DISTRO = "debian-linux" ] && ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-headers-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
+ echo "E: the linux header package linux-headers-$(uname -r) for the currently running kernel is not installed" >&2
++elif [ $DISTRO = "void-linux" ] && [ $(xbps-query --property=pkgver pocket-reform-kernel-headers) != "pocket-reform-kernel-headers-$(uname -r)" ]; then
++ echo "E: the linux header package pocket-reform-kernel-headers-$(uname -r) for the currently running kernel is not installed" >&2
++fi
++
++if [ $DISTRO = "debian-linux" ]; then
++ for f in mntre reform_bookworm reform_bookworm-backports; do
++ file="/etc/apt/sources.list.d/${f}.sources"
++ if [ ! -e "$file" ]; then
++ continue
++ fi
++ if [ "$(stat -c %a "$file")" != 666 ]; then
++ # nothing to do
++ continue
++ fi
++ echo "E: $file has insecure permissions 0666, consider a chmod 644" >&2
++ done
+ fi
+
+-for f in mntre reform_bookworm reform_bookworm-backports; do
+- file="/etc/apt/sources.list.d/${f}.sources"
+- if [ ! -e "$file" ]; then
+- continue
+- fi
+- if [ "$(stat -c %a "$file")" != 666 ]; then
+- # nothing to do
+- continue
+- fi
+- echo "E: $file has insecure permissions 0666, consider a chmod 644" >&2
+-done
+ for f in . firefox firefox/syspref.js motd-full motd-rescue profile.d profile.d/reform.sh profile.d/reform-setup.sh; do
+ file="/etc/$f"
+ if [ ! -e "$file" ]; then
+@@ -574,7 +624,7 @@ esac
+
+ if [ "$OFFLINE" = "yes" ]; then
+ echo "I: skipping the remaining checks because --offline was used" >&2
+-else
++elif [ $DISTRO = "debian-linux" ]; then
+ # shellcheck disable=SC2016
+ case "$MIRROR" in mntre.com)
+ if [ "$(apt-get indextargets 'Created-By: Packages' 'Repo-URI: https://mntre.com/reform-debian-repo/' --format '$(RELEASE)')" != reform ]; then
diff --git a/srcpkgs/reform-tools/template b/srcpkgs/reform-tools/template
new file mode 100644
index 00000000000000..6cee7e6fc38d9f
--- /dev/null
+++ b/srcpkgs/reform-tools/template
@@ -0,0 +1,19 @@
+# Template file for 'reform-tools'
+pkgname=reform-tools
+version=1.69
+revision=1
+build_style=gnu-makefile
+archs="aarch64*"
+depends="python3-libusb1 python3-psutil"
+hostmakedepends="python3-libusb1 python3-psutil help2man make"
+short_desc="Tools for using MNT Reform hardware"
+maintainer="Joe Albanese <joe@joe-albanese.com>"
+license="AGPL-3.0-or-later"
+homepage="https://source.mnt.re/reform/reform-tools"
+distfiles="https://source.mnt.re/reform/reform-tools/-/archive/1.69/reform-tools-1.69.tar.gz"
+checksum=80630150e7a20191d4d1457b93a057b3b454d04dfb37b25af674c56143302e3d
+
+post_install() {
+ vlicense LICENSE.txt
+ vsv reform-hw-setup
+}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (11 preceding siblings ...)
2025-03-11 5:20 ` [PR PATCH] [Updated] " joe-albanese
@ 2025-03-11 5:51 ` joe-albanese
2025-03-11 6:12 ` joe-albanese
2025-06-10 2:13 ` github-actions
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-11 5:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
There is an updated pull request by joe-albanese against master on the void-packages repository
https://github.com/joe-albanese/void-packages reform-tools
https://github.com/void-linux/void-packages/pull/54543
New package: reform-tools-1.69
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (aarch64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/54543.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-reform-tools-54543.patch --]
[-- Type: text/x-diff, Size: 21264 bytes --]
From de9aae60c5fadcf09a736d67b9ee15c0deb47f5e Mon Sep 17 00:00:00 2001
From: Joe Albanese <joe-albanese@protonmail.com>
Date: Sat, 1 Mar 2025 19:40:44 -0500
Subject: [PATCH] New package: reform-tools-1.69
---
.../reform-tools/files/reform-hw-setup/run | 5 +
.../patches/reform-check_void.patch | 396 ++++++++++++++++++
srcpkgs/reform-tools/template | 19 +
3 files changed, 420 insertions(+)
create mode 100644 srcpkgs/reform-tools/files/reform-hw-setup/run
create mode 100644 srcpkgs/reform-tools/patches/reform-check_void.patch
create mode 100644 srcpkgs/reform-tools/template
diff --git a/srcpkgs/reform-tools/files/reform-hw-setup/run b/srcpkgs/reform-tools/files/reform-hw-setup/run
new file mode 100644
index 00000000000000..8a21289e80b0b0
--- /dev/null
+++ b/srcpkgs/reform-tools/files/reform-hw-setup/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec 2>&1
+reform-hw-setup
+exec chpst -b reform-hw-setup pause
diff --git a/srcpkgs/reform-tools/patches/reform-check_void.patch b/srcpkgs/reform-tools/patches/reform-check_void.patch
new file mode 100644
index 00000000000000..3215998d253d5c
--- /dev/null
+++ b/srcpkgs/reform-tools/patches/reform-check_void.patch
@@ -0,0 +1,396 @@
+diff --git a/bin/reform-check b/bin/reform-check
+index f898d08..5b91b47 100755
+--- a/bin/reform-check
++++ b/bin/reform-check
+@@ -102,6 +102,14 @@ if [ "$#" -gt 0 ]; then
+ exit 1
+ fi
+
++if [ -f "/etc/os-release" ]; then
++ if [ $(head -1 /etc/os-release | cut -d'=' -f 2) = '"Void"' ]; then
++ DISTRO=void-linux
++ fi
++else
++ DISTRO=debian-linux
++fi
++
+ if [ "$MIRROR" != "mntre.com" ] && [ "$MIRROR" != "reform.debian.net" ]; then
+ echo "E: invalid value for --mirror: $MIRROR -- only mntre.com and reform.debian.net are supported" >&2
+ exit 1
+@@ -134,7 +142,7 @@ if [ -z "$MIRROR" ]; then
+ MIRROR="mntre.com"
+ fi
+
+-if [ -z "$(apt-get indextargets)" ] && [ "$OFFLINE" != "yes" ]; then
++if [ $DISTRO = "debian-linux" ] && [ -z "$(apt-get indextargets)" ] && [ "$OFFLINE" != "yes" ]; then
+ echo "E: reform-check needs a populated apt cache for some of its operation." >&2
+ echo "E: re-run with --offline (disabling some checks) or choose to run apt-update now." >&2
+ printf "Should reform-check run 'apt update' for you? [y/N]" >&2
+@@ -158,8 +166,14 @@ fi
+
+ echo "I: Contents of /proc/device-tree/model: $(cat /proc/device-tree/model)" >&2
+ echo "I: \`uname -a\` output: $(uname -a)" >&2
+-echo "I: Version of linux-image-mnt-reform-arm64: $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64)" >&2
+-echo "I: Version of reform-tools: $(dpkg-query --show --showformat '${Version}' reform-tools)" >&2
++if [ $DISTRO = "debian-linux" ]; then
++ echo "I: Version of linux-image-mnt-reform-arm64: $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64)" >&2
++ echo "I: Version of reform-tools: $(dpkg-query --show --showformat '${Version}' reform-tools)" >&2
++elif [ $DISTRO = "void-linux" ]; then
++ echo "I: Version of pocket-reform-kernel: $(xbps-query --property=pkgver pocket-reform-kernel)" >&2
++ echo "I: Version of reform-tools: $(xbps-query --property=pkgver reform-tools)" >&2
++fi
++
+ HUMAN_ROOT=
+ case $(findmnt --noheadings --evaluate --mountpoint / --output SOURCE) in
+ "/dev/reformvg/root")
+@@ -227,27 +241,30 @@ case "$MIRROR" in
+ mntre.com) aptprefcontent="Package: *\nPin: release n=reform, l=reform\nPin-Priority: 990\n" ;;
+ reform.debian.net) aptprefcontent="Package: *\nPin: origin \"reform.debian.net\"\nPin-Priority: 999\n" ;;
+ esac
+-if [ ! -e /etc/apt/preferences.d/reform.pref ]; then
+- echo "E: /etc/apt/preferences.d/reform.pref doesn't exist" >&2
+- echo "E: you should not install packages on this system unless you know what you are doing" >&2
+- echo "E: /etc/apt/preferences.d/reform.pref should contain the following lines:" >&2
+- printf "$aptprefcontent" >&2
+-else
+- if ! printf "$aptprefcontent" | cmp --quiet - /etc/apt/preferences.d/reform.pref; then
+- echo "W: unexpected content in /etc/apt/preferences.d/reform.pref:" >&2
+- printf "$aptprefcontent" | diff -u - /etc/apt/preferences.d/reform.pref || true
+- echo "W: you should not install packages on this system unless you know what you are doing" >&2
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /etc/apt/preferences.d/reform.pref ]; then
++ echo "E: /etc/apt/preferences.d/reform.pref doesn't exist" >&2
++ echo "E: you should not install packages on this system unless you know what you are doing" >&2
++ echo "E: /etc/apt/preferences.d/reform.pref should contain the following lines:" >&2
++ printf "$aptprefcontent" >&2
++ else
++ if ! printf "$aptprefcontent" | cmp --quiet - /etc/apt/preferences.d/reform.pref; then
++ echo "W: unexpected content in /etc/apt/preferences.d/reform.pref:" >&2
++ printf "$aptprefcontent" | diff -u - /etc/apt/preferences.d/reform.pref || true
++ echo "W: you should not install packages on this system unless you know what you are doing" >&2
++ fi
+ fi
+-fi
+
+-notinstalled=
+-for package in $PKGSGUI $PKGSTOOLS $PKGSNET $PKGSADMIN $PKGSUTILS $PKGSMISC; do
+- if ! dpkg-query --showformat '${db:Status-Status}\n' --show "$package" 2>/dev/null | grep -q '^installed$'; then
+- notinstalled="$notinstalled $package"
++ notinstalled=
++ for package in $PKGSGUI $PKGSTOOLS $PKGSNET $PKGSADMIN $PKGSUTILS $PKGSMISC; do
++ if ! dpkg-query --showformat '${db:Status-Status}\n' --show "$package" 2>/dev/null | grep -q '^installed$'; then
++ notinstalled="$notinstalled $package"
++ fi
++ done
++
++ if [ -n "$notinstalled" ]; then
++ echo "I: not installed: $(echo "$notinstalled" | tr " " "\n" | sort | tr "\n" " ")" >&2
+ fi
+-done
+-if [ -n "$notinstalled" ]; then
+- echo "I: not installed: $(echo "$notinstalled" | tr " " "\n" | sort | tr "\n" " ")" >&2
+ fi
+
+ if [ -z "$(findmnt --fstab --noheadings --evaluate --mountpoint / --output SOURCE)" ]; then
+@@ -300,15 +317,18 @@ else
+ esac
+ fi
+
++
+ flashkerneldefaultcontent="LINUX_KERNEL_CMDLINE=\"\"\nLINUX_KERNEL_CMDLINE_DEFAULTS=\"\"\n"
+-if [ ! -e /etc/default/flash-kernel ]; then
+- echo "E: /etc/default/flash-kernel doesn't exist" >&2
+- echo "E: /etc/default/flash-kernel should contain the following lines:" >&2
+- printf "$flashkerneldefaultcontent" >&2
+-else
+- if ! printf "$flashkerneldefaultcontent" | cmp --quiet - /etc/default/flash-kernel; then
+- echo "W: unexpected content in /etc/default/flash-kernel:" >&2
+- printf "$flashkerneldefaultcontent" | diff -u - /etc/default/flash-kernel || true
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /etc/default/flash-kernel ]; then
++ echo "E: /etc/default/flash-kernel doesn't exist" >&2
++ echo "E: /etc/default/flash-kernel should contain the following lines:" >&2
++ printf "$flashkerneldefaultcontent" >&2
++ else
++ if ! printf "$flashkerneldefaultcontent" | cmp --quiet - /etc/default/flash-kernel; then
++ echo "W: unexpected content in /etc/default/flash-kernel:" >&2
++ printf "$flashkerneldefaultcontent" | diff -u - /etc/default/flash-kernel || true
++ fi
+ fi
+ fi
+
+@@ -349,91 +369,99 @@ if grep --quiet '^root::' /etc/shadow; then
+ echo "E: root account has no password (maybe run passwd -l root)" >&2
+ fi
+
+-if [ ! -e /etc/skel/.profile ]; then
+- echo "E: /etc/skel/.profile doesn't exist" >&2
+- echo "E: install the package bash to create it" >&2
+-else
+- # shellcheck disable=SC2016
+- skelprofilecontent='if [ "$(whoami)" = "root" ]; then reform-help --root; elif [ -z "$WAYLAND_DISPLAY" ]; then reform-help; fi'
+- if [ "$(tail -1 /etc/skel/.profile)" != "$skelprofilecontent" ]; then
+- echo "E: unexpected last line in /etc/skel/.profile, should be:" >&2
+- echo "$skelprofilecontent" >&2
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /etc/skel/.profile ]; then
++ echo "E: /etc/skel/.profile doesn't exist" >&2
++ echo "E: install the package bash to create it" >&2
++ else
++ # shellcheck disable=SC2016
++ skelprofilecontent='if [ "$(whoami)" = "root" ]; then reform-help --root; elif [ -z "$WAYLAND_DISPLAY" ]; then reform-help; fi'
++ if [ "$(tail -1 /etc/skel/.profile)" != "$skelprofilecontent" ]; then
++ echo "E: unexpected last line in /etc/skel/.profile, should be:" >&2
++ echo "$skelprofilecontent" >&2
++ fi
+ fi
+-fi
+
+-if [ -n "$(dpkg --verify reform-tools)" ]; then
+- echo "I: the following files differ from how they are shipped by reform-tools (ignore /var/lib/alsa/asound.state):" >&2
+- dpkg --verify reform-tools
+-fi
++ if [ -n "$(dpkg --verify reform-tools)" ]; then
++ echo "I: the following files differ from how they are shipped by reform-tools (ignore /var/lib/alsa/asound.state):" >&2
++ dpkg --verify reform-tools
++ fi
+
+-if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-arm64" 2>/dev/null | grep -q '^installed$'; then
+- case "$MIRROR" in mntre.com)
+- if ! apt-cache policy linux-image-arm64 | grep --quiet mntre.com; then
+- echo "E: the linux-image-arm64 package cannot come from the MNT repos" >&2
++ if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-arm64" 2>/dev/null | grep -q '^installed$'; then
++ case "$MIRROR" in mntre.com)
++ if ! apt-cache policy linux-image-arm64 | grep --quiet mntre.com; then
++ echo "E: the linux-image-arm64 package cannot come from the MNT repos" >&2
++ fi
++ ;;
++ reform.debian.net)
++ if ! apt-cache policy linux-image-arm64 | grep --quiet /reform.debian.net/; then
++ echo "E: the linux-image-arm64 package cannot come from the reform.debian.net repos" >&2
++ fi
++ ;;
++ *)
++ echo "invalid mirror: $MIRROR" >&2
++ exit 1
++ ;;
++ esac
++ echo "W: The deprecated meta-package linux-image-arm64 is installed." >&2
++ if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
++ echo "W: Since the new meta-package linux-image-mnt-reform-arm64 is installed," >&2
++ echo "W: the old meta-package linux-image-arm64 should be removed." >&2
++ else
++ echo "W: Please install the new meta-package linux-image-mnt-reform-arm64" >&2
++ echo "W: and remove the old meta-package linux-image-arm64." >&2
+ fi
+- ;;
+- reform.debian.net)
+- if ! apt-cache policy linux-image-arm64 | grep --quiet /reform.debian.net/; then
+- echo "E: the linux-image-arm64 package cannot come from the reform.debian.net repos" >&2
++ if ! dpkg-query --showformat '${Version}' --show linux-image-arm64 | grep --quiet reform; then
++ echo "E: the currently installed package linux-image-arm64 does not come with Reform patches" >&2
+ fi
+- ;;
+- *)
+- echo "invalid mirror: $MIRROR" >&2
+- exit 1
+- ;;
+- esac
+- echo "W: The deprecated meta-package linux-image-arm64 is installed." >&2
+- if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
+- echo "W: Since the new meta-package linux-image-mnt-reform-arm64 is installed," >&2
+- echo "W: the old meta-package linux-image-arm64 should be removed." >&2
+- else
+- echo "W: Please install the new meta-package linux-image-mnt-reform-arm64" >&2
+- echo "W: and remove the old meta-package linux-image-arm64." >&2
+ fi
+- if ! dpkg-query --showformat '${Version}' --show linux-image-arm64 | grep --quiet reform; then
+- echo "E: the currently installed package linux-image-arm64 does not come with Reform patches" >&2
++
++ if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
++ case "$MIRROR" in mntre.com)
++ if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet mntre.com; then
++ echo "E: the linux-image-mnt-reform-arm64 package cannot come from the MNT repos" >&2
++ fi
++ ;;
++ reform.debian.net)
++ if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet /reform.debian.net/; then
++ echo "E: the linux-image-mnt-reform-arm64 package cannot come from the reform.debian.net repos" >&2
++ fi
++ ;;
++ *)
++ echo "invalid mirror: $MIRROR" >&2
++ exit 1
++ ;;
++ esac
+ fi
+-fi
+
+-if dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-mnt-reform-arm64" 2>/dev/null | grep -q '^installed$'; then
+- case "$MIRROR" in mntre.com)
+- if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet mntre.com; then
+- echo "E: the linux-image-mnt-reform-arm64 package cannot come from the MNT repos" >&2
++
++ for file in /boot/initrd.img-*-reform2-arm64 /boot/vmlinuz-*-reform2-arm64; do
++ if [ ! -e "$file" ]; then
++ continue
+ fi
+- ;;
+- reform.debian.net)
+- if ! apt-cache policy linux-image-mnt-reform-arm64 | grep --quiet /reform.debian.net/; then
+- echo "E: the linux-image-mnt-reform-arm64 package cannot come from the reform.debian.net repos" >&2
++ echo "I: file from deprecated kernel flavour found: $file" >&2
++ done
++
++ for file in /boot/initrd.img-*-mnt-reform-arm64 /boot/vmlinuz-*-mnt-reform-arm64; do
++ suffix="${file##/boot/}"
++ suffix="${suffix##initrd.img-}"
++ suffix="${suffix##vmlinuz-}"
++ if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$suffix" 2>/dev/null | grep -q '^installed$'; then
++ echo "I: $file does not belong to any installed kernel package" >&2
+ fi
+- ;;
+- *)
+- echo "invalid mirror: $MIRROR" >&2
+- exit 1
+- ;;
+- esac
++ done
+ fi
+-
+-for file in /boot/initrd.img-*-reform2-arm64 /boot/vmlinuz-*-reform2-arm64; do
+- if [ ! -e "$file" ]; then
+- continue
++if [ $DISTRO = "debain-linux" ]; then
++ if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
++ echo "E: the currently running kernel is not installed as a package" >&2
+ fi
+- echo "I: file from deprecated kernel flavour found: $file" >&2
+-done
+-
+-for file in /boot/initrd.img-*-mnt-reform-arm64 /boot/vmlinuz-*-mnt-reform-arm64; do
+- suffix="${file##/boot/}"
+- suffix="${suffix##initrd.img-}"
+- suffix="${suffix##vmlinuz-}"
+- if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$suffix" 2>/dev/null | grep -q '^installed$'; then
+- echo "I: $file does not belong to any installed kernel package" >&2
++ if ! uname --kernel-version | grep --quiet --fixed-strings " $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64) "; then
++ echo "E: the currently running kernel is not the one provided by linux-image-mnt-reform-arm64" >&2
++ fi
++elif [ $DISTRO = "void-linux" ]; then
++ if [ $(xbps-query --property=pkgver pocket-reform-kernel) != "pocket-reform-kernel-$(uname -r)" ]; then
++ echo "E: the currently running kernel is not the one provided by pocket-reform-kernel" >&2
+ fi
+-done
+-
+-if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-image-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
+- echo "E: the currently running kernel is not installed as a package" >&2
+-fi
+-if ! uname --kernel-version | grep --quiet --fixed-strings " $(dpkg-query --show --showformat '${Version}' linux-image-mnt-reform-arm64) "; then
+- echo "E: the currently running kernel is not the one provided by linux-image-mnt-reform-arm64" >&2
+ fi
+
+ if [ "$MIRROR" = "reform.debian.net" ]; then
+@@ -443,25 +471,41 @@ if [ "$MIRROR" = "reform.debian.net" ]; then
+ fi
+ fi
+
+-if [ ! -e /boot/boot.scr ]; then
+- echo "E: /boot/boot.scr doesn't exist" >&2
+- echo "E: run 'sudo flash-kernel' to create it" >&2
+-elif ! grep --quiet "setenv fk_kvers '$(uname -r)'" /boot/boot.scr; then
+- echo "E: /boot/boot.scr doesn't reference the currently running kernel" >&2
+-fi
++if [ $DISTRO = "debian-linux" ]; then
++ if [ ! -e /boot/boot.scr ]; then
++ echo "E: /boot/boot.scr doesn't exist" >&2
++ echo "E: run 'sudo flash-kernel' to create it" >&2
++ elif ! grep --quiet "setenv fk_kvers '$(uname -r)'" /boot/boot.scr; then
++ echo "E: /boot/boot.scr doesn't reference the currently running kernel" >&2
++ fi
+
+-if [ ! -e "/boot/vmlinuz-$(uname -r)" ]; then
+- echo "E: no vmlinuz in /boot for the currently running kernel" >&2
+-fi
++ if [ ! -e "/boot/vmlinuz-$(uname -r)" ]; then
++ echo "E: no vmlinuz in /boot for the currently running kernel" >&2
++ fi
++
++ if [ ! -e "/boot/initrd.img-$(uname -r)" ]; then
++ echo "E: no initrd.img in /boot for the currently running kernel" >&2
++ fi
++elif [ $DISTRO = "void-linux" ]; then
++ if [ ! -e /boot/extlinux/extlinux.conf ]; then
++ echo "E: /boot/extlinux/extlinux.conf doesn't exist" >&2
++ elif ! grep --quiet "linux /vmlinux-$(uname -r)" /boot/extlinux/extlinux.conf; then
++ echo "E: /boot/extlinux/extlinux.conf doesn't reference the currently running kernel" >&2
++ fi
+
+-if [ ! -e "/boot/initrd.img-$(uname -r)" ]; then
+- echo "E: no initrd.img in /boot for the currently running kernel" >&2
++ if [ ! -e "/boot/vmlinux-$(uname -r)" ]; then
++ echo "E: no vmlinux in /boot for the currently running kernel" >&2
++ fi
++
++ if [ ! -e "/boot/initramfs-$(uname -r).img" ]; then
++ echo "E: no initramfs.img in /boot for the currently running kernel" >&2
++ fi
+ fi
+
+ if [ ! -e "/boot/dtb-$(uname -r)" ]; then
+ echo "E: no dtb-* symlink for the currently running kernel" >&2
+ echo "E: run 'sudo flash-kernel' to create it" >&2
+-elif [ ! -e "/boot/dtbs/$(uname -r)/$DTBPATH" ]; then
++elif [ $DISTRO = "debian-linux" ] && [ ! -e "/boot/dtbs/$(uname -r)/$DTBPATH" ]; then
+ echo "E: device tree file $DTBPATH is missing from /boot/dtbs" >&2
+ elif [ "$(readlink "/boot/dtb-$(uname -r)")" != "dtbs/$(uname -r)/$DTBPATH" ]; then
+ echo "E: /boot/dtb-$(uname -r) symlink does not reference dtbs/$(uname -r)/$DTBPATH but: $(readlink "/boot/dtb-$(uname -r)")" >&2
+@@ -510,21 +554,27 @@ if [ "$(tr ' ' '\n' </proc/cmdline | grep console= | tail -1)" != "console=tty1"
+ echo "W: This could lead to the luks password prompt being printed to serial instead of your screen." >&2
+ fi
+
+-if ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-headers-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
++
++if [ $DISTRO = "debian-linux" ] && ! dpkg-query --showformat '${db:Status-Status}\n' --show "linux-headers-$(uname -r)" 2>/dev/null | grep -q '^installed$'; then
+ echo "E: the linux header package linux-headers-$(uname -r) for the currently running kernel is not installed" >&2
++elif [ $DISTRO = "void-linux" ] && [ $(xbps-query --property=pkgver pocket-reform-kernel-headers) != "pocket-reform-kernel-headers-$(uname -r)" ]; then
++ echo "E: the linux header package pocket-reform-kernel-headers-$(uname -r) for the currently running kernel is not installed" >&2
++fi
++
++if [ $DISTRO = "debian-linux" ]; then
++ for f in mntre reform_bookworm reform_bookworm-backports; do
++ file="/etc/apt/sources.list.d/${f}.sources"
++ if [ ! -e "$file" ]; then
++ continue
++ fi
++ if [ "$(stat -c %a "$file")" != 666 ]; then
++ # nothing to do
++ continue
++ fi
++ echo "E: $file has insecure permissions 0666, consider a chmod 644" >&2
++ done
+ fi
+
+-for f in mntre reform_bookworm reform_bookworm-backports; do
+- file="/etc/apt/sources.list.d/${f}.sources"
+- if [ ! -e "$file" ]; then
+- continue
+- fi
+- if [ "$(stat -c %a "$file")" != 666 ]; then
+- # nothing to do
+- continue
+- fi
+- echo "E: $file has insecure permissions 0666, consider a chmod 644" >&2
+-done
+ for f in . firefox firefox/syspref.js motd-full motd-rescue profile.d profile.d/reform.sh profile.d/reform-setup.sh; do
+ file="/etc/$f"
+ if [ ! -e "$file" ]; then
+@@ -574,7 +624,7 @@ esac
+
+ if [ "$OFFLINE" = "yes" ]; then
+ echo "I: skipping the remaining checks because --offline was used" >&2
+-else
++elif [ $DISTRO = "debian-linux" ]; then
+ # shellcheck disable=SC2016
+ case "$MIRROR" in mntre.com)
+ if [ "$(apt-get indextargets 'Created-By: Packages' 'Repo-URI: https://mntre.com/reform-debian-repo/' --format '$(RELEASE)')" != reform ]; then
diff --git a/srcpkgs/reform-tools/template b/srcpkgs/reform-tools/template
new file mode 100644
index 00000000000000..c783172eca3857
--- /dev/null
+++ b/srcpkgs/reform-tools/template
@@ -0,0 +1,19 @@
+# Template file for 'reform-tools'
+pkgname=reform-tools
+version=1.69
+revision=1
+archs="aarch64*"
+build_style=gnu-makefile
+hostmakedepends="python3-libusb1 python3-psutil help2man make"
+depends="python3-libusb1 python3-psutil"
+short_desc="Tools for using MNT Reform hardware"
+maintainer="Joe Albanese <joe@joe-albanese.com>"
+license="AGPL-3.0-or-later"
+homepage="https://source.mnt.re/reform/reform-tools"
+distfiles="https://source.mnt.re/reform/reform-tools/-/archive/${version}/reform-tools-${version}.tar.gz"
+checksum=80630150e7a20191d4d1457b93a057b3b454d04dfb37b25af674c56143302e3d
+
+post_install() {
+ vlicense LICENSE.txt
+ vsv reform-hw-setup
+}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (12 preceding siblings ...)
2025-03-11 5:51 ` joe-albanese
@ 2025-03-11 6:12 ` joe-albanese
2025-06-10 2:13 ` github-actions
14 siblings, 0 replies; 16+ messages in thread
From: joe-albanese @ 2025-03-11 6:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by joe-albanese on void-packages repository
https://github.com/void-linux/void-packages/pull/54543#issuecomment-2712787123
Comment:
Gah sorry for requesting a review prematurely. I found a bug like 15 mins after I thought I had it sorted
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: New package: reform-tools-1.69
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
` (13 preceding siblings ...)
2025-03-11 6:12 ` joe-albanese
@ 2025-06-10 2:13 ` github-actions
14 siblings, 0 replies; 16+ messages in thread
From: github-actions @ 2025-06-10 2:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/54543#issuecomment-2957487812
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2025-06-10 2:13 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-02 0:44 [PR PATCH] New package: reform-tools-1.68+e378e651 joe-albanese
2025-03-02 1:39 ` [PR REVIEW] " classabbyamp
2025-03-02 1:39 ` classabbyamp
2025-03-02 1:39 ` classabbyamp
2025-03-02 2:48 ` joe-albanese
2025-03-02 3:50 ` [PR PATCH] [Updated] " joe-albanese
2025-03-05 5:11 ` [PR PATCH] [Updated] New package: reform-tools-1.69 joe-albanese
2025-03-06 4:21 ` [PR REVIEW] " classabbyamp
2025-03-08 2:31 ` [PR PATCH] [Updated] " joe-albanese
2025-03-08 6:17 ` joe-albanese
2025-03-11 5:16 ` joe-albanese
2025-03-11 5:18 ` [PR REVIEW] " joe-albanese
2025-03-11 5:20 ` [PR PATCH] [Updated] " joe-albanese
2025-03-11 5:51 ` joe-albanese
2025-03-11 6:12 ` joe-albanese
2025-06-10 2:13 ` github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).