this repo has no description
Merge pull request #489 from andyneff/fedora_29
Fedora 29 cleanup
authored by
Sergey Bugaev
and committed by
GitHub
a06b207b
cc92bf22
+20
-21
+3
-2
rpm/Dockerfile
+3
-2
rpm/Dockerfile
···
1
-
ARG OS=fedora:28
1
+
ARG OS=fedora:29
2
2
FROM ${OS}
3
3
4
4
SHELL ["bash", "-euxvc"]
···
12
12
fuse-devel glibc-devel glibc-devel.i686 kernel-devel \
13
13
libglvnd-devel libjpeg-turbo-devel libjpeg-turbo-devel.i686 \
14
14
libtiff-devel libtiff-devel.i686 mesa-libGL-devel mesa-libEGL-devel \
15
-
python2 systemd-devel make libxml2-devel elfutils-libelf-devel; \
15
+
python2 systemd-devel make libxml2-devel elfutils-libelf-devel \
16
+
libbsd-devel; \
16
17
dnf clean all
17
18
18
19
RUN mkdir -p /root/rpmbuild/SOURCES
+5
-4
rpm/README.md
+5
-4
rpm/README.md
···
2
2
3
3
1. Install `docker` and `docker-compose`
4
4
2. `cd rpm`
5
-
3. `docker-compose run rpm`
5
+
3. Build the docker image: `docker-compose build rpm`
6
+
3. Build the rpms: `docker-compose run rpm` (Can take over half an hour)
6
7
4. Now you can run `dnf install RPMS/x84_64/darling*.rpm`
7
8
5. `setsebool -P mmap_low_allowed 1` to allow darling low level access and run
8
9
9
10
## Building on other operating systems
10
11
11
-
By default, it will build for Fedora 28. To use a different OS, simply
12
+
By default, it will build for Fedora 29. To use a different OS, simply
12
13
13
-
RPM_OS=fedora:27
14
+
RPM_OS=fedora:27 docker-compose build rpm
14
15
15
16
## Future improvements
16
17
17
18
- Everything is based off of dnf. Supporting zypper and yum will reach others
18
-
- Because of the way the submodules are handled, this isn't quite ready for releasing but this can be solved using [%autosetup in the %prep to checkout the submodules.](https://fedoraproject.org/wiki/Packaging:SourceURL#Git_Submodules)
19
+
- Because of the way the submodules are handled, this isn't quite ready for official releasing but this can be solved using [%autosetup in the %prep to checkout the submodules.](https://fedoraproject.org/wiki/Packaging:SourceURL#Git_Submodules)
+11
-14
rpm/SPECS/darling.spec
+11
-14
rpm/SPECS/darling.spec
···
5
5
6
6
Name: darling
7
7
Version: 0.1
8
-
Release: 2%{?dist}
8
+
Release: 3%{?dist}
9
9
Summary: Darling
10
10
11
11
Group: Utility
12
12
License: GPLv3
13
13
URL: https://www.darlinghq.org/
14
+
# Use this line for Source0 if there are ever official versions.
14
15
# Source0: https://github.com/darlinghq/darling/archive/%%{version}/%%{name}-%%{version}.tar.gz
15
16
Source0: %{name}.tar.gz
16
17
Source1: dkms.conf
···
25
26
BuildRequires: libglvnd-devel mesa-libGL-devel mesa-libEGL-devel
26
27
BuildRequires: libxml2-devel elfutils-libelf-devel
27
28
BuildRequires: libbsd-devel
28
-
#It will pick up all the mac pieces as dependencies. No thank you!
29
+
# Normally rpm will pick up all the mac pieces as dependencies. Disable that.
29
30
AutoReqProv: no
30
31
31
32
%description
···
51
52
%{__cmake} -DCMAKE_INSTALL_PREFIX=/usr \
52
53
-DOpenGL_GL_PREFERENCE=GLVND \
53
54
..
54
-
%{make_build}
55
+
%{make_build} -j `nproc`
55
56
popd
56
57
57
58
%install
···
67
68
cp -dr --no-preserve=ownership build/src/startup/rtsig.h %{?buildroot}/usr/src/%{name}-mach-%{version}/lkm/darling/
68
69
69
70
%{__install} -m 644 %{SOURCE1} %{?buildroot}/usr/src/%{name}-mach-%{version}
70
-
71
-
#%post
72
-
#setcap cap_sys_rawio=ep %{_libexecdir}/darling/bin/mldr
73
-
#setcap cap_sys_rawio=ep %{_libexecdir}/darling/bin/mldr32
74
-
75
-
#setsebool -P mmap_low_allowed 1
76
71
77
72
%preun mach
78
-
/usr/sbin/dkms remove -m %{name}-mach -v %{version} --all
73
+
/usr/sbin/dkms remove -m %{name}-mach -v %{version} --all || :
79
74
80
75
%post mach
81
76
occurrences=$(/usr/sbin/dkms status | grep "%{name}" | grep "%{version}" | wc -l)
82
77
if [ ! ${occurrences} -gt 0 ];
83
78
then
84
-
/usr/sbin/dkms add -m %{name}-mach -v %{version}
79
+
/usr/sbin/dkms add -m %{name}-mach -v %{version} || :
85
80
fi
86
-
/usr/sbin/dkms build -m %{name}-mach -v %{version}
87
-
/usr/sbin/dkms install -m %{name}-mach -v %{version}
81
+
/usr/sbin/dkms build -m %{name}-mach -v %{version} || :
82
+
/usr/sbin/dkms install -m %{name}-mach -v %{version} || :
88
83
89
84
%files
90
85
%doc LICENSE
···
92
87
%{_libexecdir}/darling
93
88
94
89
%files mach
95
-
#%{_sysconfdir}/udev/rules.d/00-darling-mach.rules
96
90
%{_prefix}/src/%{name}-mach-%{version}
97
91
98
92
%changelog
93
+
* Tue Mar 12 2019 Andy Neff <andy@visionsystemsinc.com> - 0.1-3
94
+
- Remove bad commented macro, cleanup, and verify master works on Fedora 29
95
+
99
96
* Wed Jul 18 2018 Andy Neff <andy@visionsystemsinc.com> - 0.1-2
100
97
- Update for Fedora 28 and new master
101
98