Skip to content
This repository was archived by the owner on May 27, 2025. It is now read-only.

Commit c1e5329

Browse files
j-ogasj-ogas
committed
add 0.32-2 fedora updates
1 parent bd752ed commit c1e5329

File tree

6 files changed

+80
-36
lines changed

6 files changed

+80
-36
lines changed

‎packaging/fedora/build‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ rpmbuild root: %(rpmbuild)s
176176
'charliecloud-test': [rpms_arch, '%s.%s.rpm' % (rpms_dist, ARCH)]}
177177
rpm_specs = "/usr/local/src/SPECS"
178178
rpm_sources = "/usr/local/src/SOURCES"
179+
# Map el# to rhel# to avoid unresolved macro errors.
180+
rpmbuild_args += ["--define", "rhel " % rpm_dist[-1]]
179181
rpmbuild_args += ["--define", "_topdir /usr/local/src"]
180182
rpmlint_args += ["--file", "%s/charliecloud.rpmlintrc" % rpm_specs]
181183
container += [CH_BASE + "/bin/ch-run", "-w",

‎packaging/fedora/charliecloud.spec‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@ License: ASL 2.0
1717
URL: https://hpc.github.io/%{name}/
1818
Source0: https://github.com/hpc/%{name}/releases/downloads/v%{version}/%{name}-%{version}.tar.gz
1919
BuildRequires: gcc rsync bash
20-
Requires: squashfuse squashfs-tools
21-
Patch1: el7-pkgdir.patch
20+
Requires: squashfuse squashfs-tools findutils
21+
Patch0: el7-pkgdir.patch
22+
%if 0%{?fedora} > 36 || 0%{?rhel} > 8
23+
BuildRequires: fuse3 fuse3-libs fuse3-devel squashfuse-devel
24+
Requires: fuse3-libs squashfuse
25+
Patch1: no-rpath.patch
26+
%endif
2227

2328
%description
2429
Charliecloud uses Linux user namespaces to run containers with no privileged
@@ -34,15 +39,18 @@ For more information: https://hpc.github.io/charliecloud
3439
%package builder
3540
Summary: Charliecloud container image building tools
3641
License: ASL 2.0 and MIT
37-
BuildArch: noarch
3842
BuildRequires: python3-devel
39-
BuildRequires: python%{python3_pkgversion}-lark-parser
4043
BuildRequires: python%{python3_pkgversion}-requests
4144
Requires: %{name}
4245
Requires: python3
43-
Requires: python%{python3_pkgversion}-lark-parser
4446
Requires: python%{python3_pkgversion}-requests
4547
Provides: bundled(python%{python3_pkgversion}-lark-parser) = 0.11.3
48+
%if 0%{?fedora} > 34 || 0%{?rhel} > 8
49+
Requires: git >= 2.28.1
50+
%endif
51+
%{?el7:BuildArch: noarch}
52+
%{?el8:Requires: git >= 2.28.1}
53+
%{?el9:Requires: git >= 2.28.1}
4654

4755
%description builder
4856
This package provides ch-image, Charliecloud's completely unprivileged container
@@ -73,7 +81,13 @@ Test fixtures for %{name}.
7381
%setup -q
7482

7583
%if 0%{?el7}
76-
%patch1 -p1
84+
# el7 mock builds use "%patchN".
85+
%patch0 -p1
86+
%endif
87+
88+
%if 0%{?fedora} > 36
89+
# fedora/rhel use "%patch N".
90+
%patch 1 -p1
7791
%endif
7892

7993
%build
@@ -168,7 +182,6 @@ ln -s "${sphinxdir}/js" %{buildroot}%{_pkgdocdir}/html/_static/js
168182
%{_pkgdocdir}/html
169183
%{?el7:%exclude %{_pkgdocdir}/examples/*/__pycache__}
170184

171-
172185
%files test
173186
%{_bindir}/ch-test
174187
%{_libexecdir}/%{name}/test

‎packaging/fedora/el7-pkgdir.patch‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
diff -ru charliecloud/bin/ch-test charliecloud-lib/bin/ch-test
2-
--- charliecloud/bin/ch-test 2020-04-07 12:19:37.054609706 -0600
3-
+++ charliecloud-lib/bin/ch-test 2020-04-15 16:36:55.128831767 -0600
4-
@@ -662,7 +662,7 @@
1+
--- charliecloud-0.32/bin/ch-test 2023-03-22 17:36:46.000000000 -0400
2+
+++ charliecloud-0.32.patch/bin/ch-test 2023-04-03 10:51:53.677205658 -0400
3+
@@ -767,7 +767,7 @@
54
CHTEST_INSTALLED=yes
65
CHTEST_GITWD=
76
CHTEST_DIR=${ch_base}/libexec/charliecloud/test

‎packaging/fedora/no-rpath.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- charliecloud-0.32/configure 2023-03-24 18:49:49.000000000 -0400
2+
+++ charliecloud-0.32.patch/configure 2023-04-03 09:55:31.756259159 -0400
3+
@@ -5880,7 +5880,7 @@
4+
else
5+
rpath_libsquashfuse=
6+
fi
7+
- CH_RUN_LIBS="-lsquashfuse_ll -lfuse3 $rpath_libsquashfuse $CH_RUN_LIBS"
8+
+ CH_RUN_LIBS="-lsquashfuse_ll -lfuse3 $CH_RUN_LIBS"
9+
else
10+
have_libsquashfuse=no
11+
fi

‎packaging/fedora/printf.patch‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎packaging/fedora/upstream.spec‎

Lines changed: 44 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@
1010
%{?el7:%global __python %__python3}
1111

1212
Name: charliecloud
13-
Version: 0.26
14-
Release: 1%{?dist}
13+
Version: 0.32
14+
Release: 2%{?dist}
1515
Summary: Lightweight user-defined software stacks for high-performance computing
1616
License: ASL 2.0
1717
URL: https://hpc.github.io/%{name}/
1818
Source0: https://github.com/hpc/%{name}/releases/downloads/v%{version}/%{name}-%{version}.tar.gz
1919
BuildRequires: gcc rsync bash
20-
Requires: squashfuse squashfs-tools
21-
Patch1: el7-pkgdir.patch
22-
Patch2: printf.patch
20+
Requires: squashfuse squashfs-tools findutils
21+
Patch0: el7-pkgdir.patch
22+
%if 0%{?fedora} > 36 || 0%{?rhel} > 8
23+
BuildRequires: fuse3 fuse3-libs fuse3-devel squashfuse-devel
24+
Requires: fuse3-libs squashfuse
25+
Patch1: no-rpath.patch
26+
%endif
2327

2428
%description
2529
Charliecloud uses Linux user namespaces to run containers with no privileged
@@ -35,15 +39,18 @@ For more information: https://hpc.github.io/charliecloud
3539
%package builder
3640
Summary: Charliecloud container image building tools
3741
License: ASL 2.0 and MIT
38-
BuildArch: noarch
3942
BuildRequires: python3-devel
40-
BuildRequires: python%{python3_pkgversion}-lark-parser
4143
BuildRequires: python%{python3_pkgversion}-requests
4244
Requires: %{name}
4345
Requires: python3
44-
Requires: python%{python3_pkgversion}-lark-parser
4546
Requires: python%{python3_pkgversion}-requests
4647
Provides: bundled(python%{python3_pkgversion}-lark-parser) = 0.11.3
48+
%if 0%{?fedora} > 34 || 0%{?rhel} > 8
49+
Requires: git >= 2.28.1
50+
%endif
51+
%{?el7:BuildArch: noarch}
52+
%{?el8:Requires: git >= 2.28.1}
53+
%{?el9:Requires: git >= 2.28.1}
4754

4855
%description builder
4956
This package provides ch-image, Charliecloud's completely unprivileged container
@@ -74,10 +81,12 @@ Test fixtures for %{name}.
7481
%setup -q
7582

7683
%if 0%{?el7}
77-
%patch1 -p1
84+
%patch0 -p1
7885
%endif
7986

80-
%patch2 -p1
87+
%if 0%{?fedora} > 36
88+
%patch 1 -p1
89+
%endif
8190

8291
%build
8392
# Use old inlining behavior, see:
@@ -150,14 +159,18 @@ ln -s "${sphinxdir}/js" %{buildroot}%{_pkgdocdir}/html/_static/js
150159
%{_bindir}/ch-image
151160
%{_mandir}/man1/ch-image.1*
152161
%{_prefix}/lib/%{name}/build.py
162+
%{_prefix}/lib/%{name}/build_cache.py
153163
%{_prefix}/lib/%{name}/charliecloud.py
154-
%{_prefix}/lib/%{name}/fakeroot.py
164+
%{_prefix}/lib/%{name}/filesystem.py
165+
%{_prefix}/lib/%{name}/force.py
166+
%{_prefix}/lib/%{name}/image.py
155167
%{_prefix}/lib/%{name}/lark
156168
%{_prefix}/lib/%{name}/lark-0.11.3.dist-info
157169
%{_prefix}/lib/%{name}/lark-stubs
158170
%{_prefix}/lib/%{name}/misc.py
159171
%{_prefix}/lib/%{name}/pull.py
160172
%{_prefix}/lib/%{name}/push.py
173+
%{_prefix}/lib/%{name}/registry.py
161174
%{_prefix}/lib/%{name}/version.py
162175
%{?el7:%{_prefix}/lib/%{name}/__pycache__}
163176

@@ -173,15 +186,32 @@ ln -s "${sphinxdir}/js" %{buildroot}%{_pkgdocdir}/html/_static/js
173186
%{_mandir}/man1/ch-test.1*
174187

175188
%changelog
176-
* Mon Jan 24 2022 Jordan Ogas <[email protected] 0.26-1
189+
* Mon Apr 03 2023 Jordan Ogas <[email protected]> 0.32-2
190+
- fix macro conditionals
191+
192+
* Fri Mar 31 2023 Jordan Ogas <[email protected]> 0.32-1
193+
- edit el7 patch: update ch-test path
194+
- add patch: prevent rpath of standard path
195+
- update builder package files
196+
- add dependency: findutils
197+
- add conditional dependencies: fuse3, squashfuse-devel, & git
198+
- new version 0.32
199+
200+
* Wed Jan 18 2023 Fedora Release Engineering <[email protected]> - 0.26-3
201+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
202+
203+
* Wed Jul 20 2022 Fedora Release Engineering <[email protected]> - 0.26-2
204+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
205+
206+
* Mon Jan 24 2022 Jordan Ogas <[email protected]> 0.26-1
177207
- add printf patch for 32-bit
178208
- add ch-convert script
179209
- new version 0.26
180210

181211
* Wed Jan 19 2022 Fedora Release Engineering <[email protected]> - 0.25-2
182212
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
183213

184-
* Mon Sep 20 2021 Jordan Ogas <[email protected] 0.25-1
214+
* Mon Sep 20 2021 Jordan Ogas <[email protected]> 0.25-1
185215
- bundle python lark parser
186216
- new version
187217

@@ -357,3 +387,4 @@ ln -s "${sphinxdir}/js" %{buildroot}%{_pkgdocdir}/html/_static/js
357387

358388
* Thu Mar 14 2019 <[email protected]> 0.9.8-1
359389
- Add initial Fedora/EPEL package
390+

0 commit comments

Comments
 (0)