Skip to content

Commit 1afa40b

Browse files
Correct build errors and add MIT license
1 parent 7d753ee commit 1afa40b

File tree

3 files changed

+34
-6
lines changed

3 files changed

+34
-6
lines changed

LICENSE

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
MIT License
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22

33
all: openchami.rpm
44

5-
openchami.rpm: openchami.spec
6-
rpmbuild -bb openchami.spec
5+
tarball:
6+
mkdir -p ~/rpmbuild/SOURCES
7+
rm -Rf ~/rpmbuild/SOURCES/openchami-0.9.0.tar.gz
8+
tar czvf ~/rpmbuild/SOURCES/openchami-0.9.0.tar.gz --transform 's,^,openchami-0.9.0/,' *
9+
10+
11+
openchami.rpm: openchami.spec tarball
12+
rpmbuild -bb openchami.spec
713

814
clean:
9-
rm -rf ~/rpmbuild
15+
rm -rf ~/rpmbuild

openchami.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ This package installs all the necessary files for OpenChami.
2020
%install
2121
mkdir -p %{buildroot}/etc/openchami/configs
2222
mkdir -p %{buildroot}/etc/containers/systemd
23-
mkdir -p %{buildroot}/etc/containers/systemd
23+
mkdir -p %{buildroot}/etc/systemd/system
2424
mkdir -p %{buildroot}/usr/local/bin
25+
mkdir -p %{buildroot}/etc/profile.d
26+
2527

2628
cp -r systemd/configs/* %{buildroot}/etc/openchami/configs/
2729
cp -r systemd/containers/* %{buildroot}/etc/containers/systemd/
@@ -30,15 +32,16 @@ cp -r systemd/networks/* %{buildroot}/etc/containers/systemd/
3032
cp -r systemd/targets/* %{buildroot}/etc/systemd/system/
3133
cp scripts/bootstrap_openchami_secrets.sh %{buildroot}/usr/local/bin/
3234
cp scripts/openchami_profile.sh %{buildroot}/etc/profile.d/openchami.sh
33-
chmo +x %{buildroot}/usr/local/bin/bootstrap_openchami_secrets.sh
35+
chmod +x %{buildroot}/usr/local/bin/bootstrap_openchami_secrets.sh
3436

3537
%files
3638
%license LICENSE
3739
/etc/openchami/configs/*
3840
/etc/containers/systemd/*
41+
/etc/systemd/system/openchami.target
3942
/usr/local/bin/bootstrap_openchami_secrets.sh
4043
/etc/profile.d/openchami.sh
4144

4245
%changelog
4346
* Thu Jan 25 2024 Alex Lovell-Troy <alovelltroy@lanl.gov> - 0.9.0-1
44-
- Initial package
47+
- Initial package

0 commit comments

Comments
 (0)