pool/earlyoom
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 761208 from home:embar-:branches:Base:System

Browse Source 
- Clean-up.

OBS-URL: https://build.opensuse.org/request/show/761208
OBS-URL: https://build.opensuse.org/package/show/Base:System/earlyoom?expand=0&rev=2
This commit is contained in:
OBS User embar-
2020-01-06 16:15:51 +00:00
committed by Git OBS Bridge
parent 3ca9f9aec6
commit 03fe6a0587
8 changed files with 61 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
_service
View File

@@ -1,18 +0,0 @@
<services>
<service name="tar_scm">
<param name="scm">git</param>
<param name="url">https://github.com/rfjakob/earlyoom</param>
<param name="revision">refs/tags/v1.3</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">^\D*([\d.]+)$</param>
</service>
<service name="recompress">
<param name="compression">bz2</param>
<param name="file">*.tar</param>
</service>
<service name="set_version"/>
</services>

150
_service:set_version:earlyoom.spec
View File

@@ -1,150 +0,0 @@
%define realname earlyoom
%define srcext tar.bz2
%if 0%{?suse_version} >= 1230 || 0%{?rhel} >= 7
%bcond_without systemd
%else
%bcond_with systemd
%endif
%if 0%{?rhel} && 0%{?rhel} == 6
%bcond_without upstart
%else
%bcond_with upstart
%endif
%if ! 0%{?_fillupdir:1}
%global _fillupdir /var/adm/fillup-templates
%endif
%global rpm_version %(rpm -q --qf %%{version} rpm)
# Common info
Name: %{realname}
Version: 1.3
Release: 0%{?extraver:0.}1%{?dist}
License: MIT
Group: System/Daemons
URL: https://github.com/rfjakob/earlyoom
Summary: Early OOM Daemon for Linux
# Install-time parameters
Conflicts: oomd
%if %{lua:print(rpm.vercmp(rpm.expand('%rpm_version'), '4.13'))} >= 0
Recommends: libnotify%{?suse_version:-tools}
%endif
Requires(post): insserv-compat
# Build-time parameters
BuildRequires: pandoc
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
%endif
BuildRoot: %{_tmppath}/%{name}-root
ExclusiveOS: Linux
Source0: %{realname}-%{version}.%{srcext}
Source11: earlyoom.sysconfig
Source12: earlyoom.init
Source13: earlyoom.upstart
%description
earlyoom checks the amount of available memory and free swap, and if both are
below critical level, it will kill the largest process (highest oom_score).
# Preparation step (unpackung and patching if necessary)
%prep
%setup -q -n %{realname}-%{version}%{?extraver}
# Fix defaults file location
%{__sed} -i 's|/default/|/sysconfig/|' earlyoom.service.in
# CentOS' gzip does not have option `-k`
%{__sed} -i 's|gzip -f -k.*$|gzip -c $< > $@|' Makefile
# Fix LDFLAGS handling
%{__sed} -ri '/LDFLAGS/ s|$| -lrt|' Makefile
# Build step (compile/build binaries, documentation, etc)
%build
_CFLAGS='%{optflags} %{?gcc_lto} -Wall -Wextra -DVERSION=\"%{version}\" -fstack-protector-all -std=gnu99'
_LDFLAGS='-Wl,--as-needed -Wl,--strip-all %{?gcc_lto}'
%{__make} %{?_smp_mflags} \
CFLAGS="$_CFLAGS" \
LDFLAGS="$_LDFLAGS"
# Install built stuff
%install
%{__make} install DESTDIR=%{buildroot} \
%if %{with systemd}
SYSTEMDUNITDIR=%{_unitdir} \
%endif
PREFIX=%{_prefix}
%if 0%{?suse_version}
%{__install} -D -m644 %{S:11} %{buildroot}%{_fillupdir}/sysconfig.%{name}
%else
%{__install} -D -m644 %{S:11} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%endif
%if ! %{with systemd}
%if %{with upstart}
%{__install} -D -m644 %{S:13} %{buildroot}%{_sysconfdir}/init/%{name}
%else
%{__install} -D -m755 %{S:12} %{buildroot}%{_initrddir}/%{name}
%endif
%endif
# Cleanup
%clean
[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
# Files list
%files
%defattr(-,root,root)
%doc LICENSE MANPAGE.md README.md
%{_bindir}/earlyoom
%if %{with systemd}
%{_unitdir}/%{name}.service
%else
%if %{with upstart}
%{_sysconfdir}/init/%{name}
%else
%{_initrddir}/%{name}
%endif
%exclude %{_sysconfdir}/systemd/system/earlyoom.service
%endif
%exclude %{_sysconfdir}/default/earlyoom
%if 0%{?suse_version}
%{_fillupdir}/sysconfig.%{name}
%else
%{_sysconfdir}/sysconfig/%{name}
%endif
%doc %{_mandir}/man1/earlyoom.1*
%if 0%{?suse_version}
%if 0%{?_unitdir:1}
%pre
%{service_add_pre %{name}.service}
%endif
%post
%if 0%{?_unitdir:1}
%{fillup_only %{name}}
%{service_add_post %{name}.service}
%else
%{fillup_and_insserv %{name}}
%endif
%preun
%if 0%{?_unitdir:1}
%{service_del_preun %{name}.service}
%else
%{stop_on_removal %{name}}
%endif
%postun
%if 0%{?_unitdir:1}
%{service_del_postun %{name}.service}
%else
%{restart_on_update %{name}}
%endif
%{insserv_cleanup}
%endif
%changelog

0
_service:recompress:tar_scm:earlyoom-1.3.tar.bz2 → earlyoom-1.3.tar.bz2
View File

5
earlyoom.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 6 16:00:16 UTC 2020 - opensuse.lietuviu.kalba@gmail.com
- Clean-up.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 6 07:18:05 UTC 2019 - Alexander Evseev <aevseev@gmail.com> Thu Jun 6 07:18:05 UTC 2019 - Alexander Evseev <aevseev@gmail.com>

2
earlyoom.init
View File

@@ -28,7 +28,7 @@ else
FAILURE="failure; echo" FAILURE="failure; echo"
fi fi
[ -r /etc/sysconfig/earlyoom ] && source /etc/sysconfig/earlyoom || EARLYOOM_ARGS="-r 3 -m 10 -s 20 -n --avoid '(^|/)(systemd|Xorg|X|ssh|yast|yast2|zypper|rpm)$' --prefer '(^|/)(java|chromium|firefox|opera|akregator|thumbnail.so)$'" [ -r /etc/sysconfig/earlyoom ] && source /etc/sysconfig/earlyoom || EARLYOOM_ARGS="-r 3 -m 10 -s 20 -n --avoid '(^|/)(systemd|Xorg|X|Xwayland|xdm|ssdm|kdm|gdm|lightdm|ssh|yast|yast2|y2controlcenter|zypper|rpm)$' --prefer '(^|/)(java|firefox|chromium|chrome|opera|ffmpeg|vlc|akregator|thumbnail.so)$'"
EARLYOOM_BIN=/usr/bin/earlyoom EARLYOOM_BIN=/usr/bin/earlyoom
EARLYOOM_PID=/var/run/earlyoom.pid EARLYOOM_PID=/var/run/earlyoom.pid

127
earlyoom.spec
View File

@@ -1,51 +1,52 @@
%define realname earlyoom #
%define srcext tar.bz2 # spec file for package earlyoom
#
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
%if 0%{?suse_version} >= 1230 || 0%{?rhel} >= 7 # Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%if 0%{?suse_version} >= 1230
%bcond_without systemd %bcond_without systemd
%else %else
%bcond_with systemd %bcond_with systemd
%endif %endif
%if 0%{?rhel} && 0%{?rhel} == 6
%bcond_without upstart
%else
%bcond_with upstart
%endif
%if ! 0%{?_fillupdir:1}
%global _fillupdir /var/adm/fillup-templates
%endif
%global rpm_version %(rpm -q --qf %%{version} rpm) %global rpm_version %(rpm -q --qf %%{version} rpm)
%if ! 0%{?_fillupdir:1}
%global _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
# Common info # Common info
Name: %{realname} Name: earlyoom
Version: 0 Version: 1.3
Release: wiz%{?extraver:0.}1%{?dist} Release: 0%{?extraver:0.}1%{?dist}
License: MIT Summary: Early OOM Daemon for Linux
Group: System/Daemons License: MIT
URL: https://github.com/rfjakob/earlyoom Group: System/Daemons
Summary: Early OOM Daemon for Linux URL: https://github.com/rfjakob/earlyoom
Source0: %{name}-%{version}.tar.bz2
# Install-time parameters Source11: earlyoom.sysconfig
Conflicts: oomd Source12: earlyoom.init
%if %{lua:print(rpm.vercmp(rpm.expand('%rpm_version'), '4.13'))} >= 0
Recommends: libnotify%{?suse_version:-tools}
%endif
Requires(post): insserv-compat
# Build-time parameters # Build-time parameters
BuildRequires: pandoc BuildRequires: pandoc
%if %{with systemd} Requires(post): insserv-compat
BuildRequires: pkgconfig(systemd) # Install-time parameters
Conflicts: oomd
%if %{lua:print(rpm.vercmp(rpm.expand('%{rpm_version}'), '4.13'))} >= 0
Recommends: libnotify%{?suse_version:-tools}
%endif
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
%endif %endif
BuildRoot: %{_tmppath}/%{name}-root
ExclusiveOS: Linux
Source0: %{realname}-%{version}.%{srcext}
Source11: earlyoom.sysconfig
Source12: earlyoom.init
Source13: earlyoom.upstart
%description %description
earlyoom checks the amount of available memory and free swap, and if both are earlyoom checks the amount of available memory and free swap, and if both are
@@ -53,70 +54,49 @@ below critical level, it will kill the largest process (highest oom_score).
# Preparation step (unpackung and patching if necessary) # Preparation step (unpackung and patching if necessary)
%prep %prep
%setup -q -n %{realname}-%{version}%{?extraver} %setup -q -n %{name}-%{version}%{?extraver}
# Fix defaults file location # Fix defaults file location
%{__sed} -i 's|/default/|/sysconfig/|' earlyoom.service.in sed -i 's|/default/|/sysconfig/|' earlyoom.service.in
# CentOS' gzip does not have option `-k` # CentOS' gzip does not have option `-k`
%{__sed} -i 's|gzip -f -k.*$|gzip -c $< > $@|' Makefile sed -i 's|gzip -f -k.*$|gzip -c $< > $@|' Makefile
# Fix LDFLAGS handling # Fix LDFLAGS handling
%{__sed} -ri '/LDFLAGS/ s|$| -lrt|' Makefile sed -ri '/LDFLAGS/ s|$| -lrt|' Makefile
# Build step (compile/build binaries, documentation, etc) # Build step (compile/build binaries, documentation, etc)
%build %build
_CFLAGS='%{optflags} %{?gcc_lto} -Wall -Wextra -DVERSION=\"%{version}\" -fstack-protector-all -std=gnu99' _CFLAGS='%{optflags} %{?gcc_lto} -Wall -Wextra -DVERSION=\"%{version}\" -fstack-protector-all -std=gnu99'
_LDFLAGS='-Wl,--as-needed -Wl,--strip-all %{?gcc_lto}' _LDFLAGS='-Wl,--as-needed -Wl,--strip-all %{?gcc_lto}'
%{__make} %{?_smp_mflags} \ make %{?_smp_mflags} \
CFLAGS="$_CFLAGS" \ CFLAGS="$_CFLAGS" \
LDFLAGS="$_LDFLAGS" LDFLAGS="$_LDFLAGS"
# Install built stuff # Install built stuff
%install %install
%{__make} install DESTDIR=%{buildroot} \ make install DESTDIR=%{buildroot} \
%if %{with systemd} %if %{with systemd}
SYSTEMDUNITDIR=%{_unitdir} \ SYSTEMDUNITDIR=%{_unitdir} \
%endif %endif
PREFIX=%{_prefix} PREFIX=%{_prefix}
%if 0%{?suse_version} install -D -m644 %{SOURCE11} %{buildroot}%{_fillupdir}/sysconfig.%{name}
%{__install} -D -m644 %{S:11} %{buildroot}%{_fillupdir}/sysconfig.%{name}
%else
%{__install} -D -m644 %{S:11} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%endif
%if ! %{with systemd} %if ! %{with systemd}
%if %{with upstart} install -D -m755 %{SOURCE12} %{buildroot}%{_initddir}/%{name}
%{__install} -D -m644 %{S:13} %{buildroot}%{_sysconfdir}/init/%{name}
%else
%{__install} -D -m755 %{S:12} %{buildroot}%{_initrddir}/%{name}
%endif %endif
%endif
# Cleanup
%clean
[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
# Files list # Files list
%files %files
%defattr(-,root,root) %license LICENSE
%doc LICENSE MANPAGE.md README.md %doc MANPAGE.md README.md
%{_bindir}/earlyoom %{_bindir}/earlyoom
%if %{with systemd} %if %{with systemd}
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%else %else
%if %{with upstart} %{_initddir}/%{name}
%{_sysconfdir}/init/%{name}
%else
%{_initrddir}/%{name}
%endif
%exclude %{_sysconfdir}/systemd/system/earlyoom.service %exclude %{_sysconfdir}/systemd/system/earlyoom.service
%endif %endif
%exclude %{_sysconfdir}/default/earlyoom %exclude %{_sysconfdir}/default/earlyoom
%if 0%{?suse_version}
%{_fillupdir}/sysconfig.%{name} %{_fillupdir}/sysconfig.%{name}
%else %{_mandir}/man1/earlyoom.1%{?ext_man}
%{_sysconfdir}/sysconfig/%{name}
%endif
%doc %{_mandir}/man1/earlyoom.1*
%if 0%{?suse_version}
%if 0%{?_unitdir:1} %if 0%{?_unitdir:1}
%pre %pre
@@ -144,7 +124,6 @@ _LDFLAGS='-Wl,--as-needed -Wl,--strip-all %{?gcc_lto}'
%else %else
%{restart_on_update %{name}} %{restart_on_update %{name}}
%endif %endif
%{insserv_cleanup} %insserv_cleanup
%endif
%changelog %changelog

4
earlyoom.sysconfig
View File

@@ -2,11 +2,11 @@
## Description: configuration for Early OOM Daemon ## Description: configuration for Early OOM Daemon
## Type: string ## Type: string
## Default: "-r 3 -m 10 -s 20 -n --avoid '(^|/)(systemd|Xorg|X|ssh|yast|yast2|zypper|rpm)$' --prefer '(^|/)(java|chromium|firefox|opera|akregator|thumbnail.so)$'" ## Default: "-r 3 -m 10 -s 20 -n --avoid '(^|/)(systemd|Xorg|X|Xwayland|xdm|ssdm|kdm|gdm|lightdm|ssh|yast|yast2|y2controlcenter|zypper|rpm)$' --prefer '(^|/)(java|firefox|chromium|chrome|opera|ffmpeg|vlc|akregator|thumbnail.so)$'"
## Config: earlyoom ## Config: earlyoom
# #
# Command-line options to pass to earlyoom # Command-line options to pass to earlyoom
# #
# see man(1) earlyoom # see man(1) earlyoom
# #
EARLYOOM_ARGS="-r 3 -m 10 -s 20 -n --avoid '(^|/)(systemd|Xorg|X|ssh|yast|yast2|zypper|rpm)$' --prefer '(^|/)(java|chromium|firefox|opera|akregator|thumbnail.so)$'" EARLYOOM_ARGS="-r 3 -m 10 -s 20 -n --avoid '(^|/)(systemd|Xorg|X|Xwayland|xdm|ssdm|kdm|gdm|lightdm|ssh|yast|yast2|y2controlcenter|zypper|rpm)$' --prefer '(^|/)(java|firefox|chromium|chrome|opera|ffmpeg|vlc|akregator|thumbnail.so)$'"

15
earlyoom.upstart
View File

@@ -1,15 +0,0 @@
description "Early OOM killer daemon"
start on runlevel [2345]
stop on runlevel [016]
respawn
script
mkfifo /tmp/earlyoom-log-fifo
( logger -t earlyoom < /tmp/earlyoom-log-fifo & )
exec >> /tmp/earlyoom-log-fifo 2>&1
rm -f /tmp/earlyoom-log-fifo
. /etc/sysconfig/earlyoom
exec /usr/bin/earlyoom ${EARLYOOM_ARGS:--r 60}
end script