Skip to content

Commit 4465bdd

Browse files
MingcongBaiCAB233
authored andcommitted
smartmontools: fix autogen.sh with automake >= 1.18
- Improve PKGDES. - Track patches at AOSC-Tracking/smartmontools @ aosc/RELEASE_7_5 (HEAD: 08b44eb291a93fe3f734c25be83b2062324180b0) - note that the `/smartmontools' prefix must be removed as the Git tree at that point put the source code in an extra level.
1 parent a5be9df commit 4465bdd

File tree

5 files changed

+72
-4
lines changed

5 files changed

+72
-4
lines changed

app-admin/smartmontools/autobuild/defines

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PKGNAME=smartmontools
22
PKGSEC=utils
33
PKGDEP="gcc-runtime bash libcap-ng"
4-
PKGDES="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
4+
PKGDES="Utility to control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
55

66
# --enable-sample Enables appending .sample to the installed smartd rc
77
# script and configuration file
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
PKGNAME=smartmontools
22
PKGSEC=utils
3-
PKGDES="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
43
PKGDEP="gcc-runtime bash libcap-ng"
4+
PKGDES="Utility to control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
55

6-
AUTOTOOLS_AFTER="--sysconfdir=/etc \
7-
--with-libcap-ng=yes"
6+
AUTOTOOLS_AFTER=(
7+
'--sysconfdir=/etc'
8+
'--with-libcap-ng=yes'
9+
)
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From 4857db542e91cdc8c5d8c8a39aae43db4f97fdff Mon Sep 17 00:00:00 2001
2+
From: Christian Franke <[email protected]>
3+
Date: Fri, 6 Jun 2025 15:23:13 +0200
4+
Subject: [PATCH 1/2] UPSTREAM: Add automake 1.18 to the list of tested
5+
versions
6+
7+
Signed-off-by: Christian Franke <[email protected]>
8+
Signed-off-by: Mingcong Bai <[email protected]>
9+
---
10+
smartmontools/autogen.sh | 4 ++--
11+
1 file changed, 2 insertions(+), 2 deletions(-)
12+
13+
diff --git a/autogen.sh b/autogen.sh
14+
index ad80e708..405276e9 100755
15+
--- a/autogen.sh
16+
+++ b/autogen.sh
17+
@@ -23,7 +23,7 @@ if [ -n "$AUTOMAKE" ]; then
18+
ver=$("$AUTOMAKE" --version) || exit 1
19+
else
20+
maxver=
21+
- for v in 1.17 1.16 1.15 1.14 1.13; do
22+
+ for v in 1.18 1.17 1.16 1.15 1.14 1.13; do
23+
minver=$v; test -n "$maxver" || maxver=$v
24+
ver=$(automake-$v --version 2>/dev/null) || continue
25+
AUTOMAKE="automake-$v"
26+
@@ -59,7 +59,7 @@ case "$ver" in
27+
# OK
28+
;;
29+
30+
- 1.14|1.14.1|1.15|1.15.1|1.16|1.16.[1-5]|1.17)
31+
+ 1.14|1.14.1|1.15|1.15.1|1.16|1.16.[1-5]|1.17|1.18)
32+
# TODO: Enable 'subdir-objects' in configure.ac
33+
# For now, suppress 'subdir-objects' forward-incompatibility warning
34+
test -n "$warnings" || amwarnings="--warnings=no-unsupported"
35+
--
36+
2.51.0
37+
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 08b44eb291a93fe3f734c25be83b2062324180b0 Mon Sep 17 00:00:00 2001
2+
From: Christian Franke <[email protected]>
3+
Date: Sat, 12 Jul 2025 11:57:10 +0200
4+
Subject: [PATCH 2/2] BACKPORT: UPSTREAM: Add automake 1.18.1 to the list of
5+
tested versions
6+
7+
Signed-off-by: Christian Franke <[email protected]>
8+
Signed-off-by: Mingcong Bai <[email protected]>
9+
---
10+
smartmontools/autogen.sh | 2 +-
11+
1 file changed, 1 insertion(+), 1 deletion(-)
12+
13+
diff --git a/autogen.sh b/autogen.sh
14+
index 405276e9..761b1a2a 100755
15+
--- a/autogen.sh
16+
+++ b/autogen.sh
17+
@@ -55,7 +55,7 @@ case "$ver" in
18+
echo "GNU Automake $ver is not supported."; exit 1
19+
;;
20+
21+
- 1.13.[34])
22+
+ 1.13.[34]|1.14|1.14.1|1.15|1.15.1|1.16|1.16.[1-5]|1.17|1.18|1.18.1)
23+
# OK
24+
;;
25+
26+
--
27+
2.51.0
28+

app-admin/smartmontools/spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
VER=7.5
2+
REL=1
23
SRCS="tbl::https://sourceforge.net/projects/smartmontools/files/smartmontools/$VER/smartmontools-$VER.tar.gz"
34
CHKSUMS="sha256::690b83ca331378da9ea0d9d61008c4b22dde391387b9bbad7f29387f2595f76e"
45
CHKUPDATE="anitya::id=4835"

0 commit comments

Comments
 (0)