Compare commits

...

61 Commits

Author SHA1 Message Date
Zbigniew Jędrzejewski-Szmek b94403eac9 Add missing newline in config file
[skip changelog]
2023-03-15 11:20:54 +01:00
Fabio Valentini a57e5c9257
Rebuild for fixed frame pointer compiler flags in Rust RPM macros 2023-02-05 15:51:35 +01:00
Fedora Release Engineering 7eb66ce533 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 02:29:44 +00:00
Fedora Release Engineering 8e417ccfe4 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 07:51:34 +00:00
Zbigniew Jędrzejewski-Szmek 53f62d7551 Version 1.1.2 2022-03-28 10:49:56 +02:00
Zbigniew Jędrzejewski-Szmek 98a76801ca Use correct path in Recommends (rhbz#2068983) 2022-03-28 10:49:56 +02:00
Zbigniew Jędrzejewski-Szmek d2718611c2 Rebuild with package notes 2022-02-15 16:31:50 +01:00
Fedora Release Engineering 39e1092c01 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 00:12:21 +00:00
Robin Ebert 2ef8f2f5a2 Update zram-generator.conf
Replace obsolete options with new equivalent option
2022-01-17 13:46:58 +00:00
Zbigniew Jędrzejewski-Szmek 0f73587c24 Skip test that fails with EPERM 2021-12-01 16:51:03 +01:00
Zbigniew Jędrzejewski-Szmek 3f8f3d8deb Version 1.1.1 2021-11-29 14:48:04 +01:00
Zbigniew Jędrzejewski-Szmek 85d12c64a0 Version 1.1.0 2021-11-20 15:27:55 +01:00
Zbigniew Jędrzejewski-Szmek 2227078dc4 Fix broken systemd-makefs path 2021-10-26 18:23:29 +02:00
Zbigniew Jędrzejewski-Szmek fdfc3c3a3b Print executec commands during build 2021-10-26 16:38:13 +02:00
Zbigniew Jędrzejewski-Szmek a2ba1ac5aa Version 1.0.1 (fixes #2017015) 2021-10-25 19:38:39 +02:00
Zbigniew Jędrzejewski-Szmek a5a880cfec Convert to rpmautospec 2021-10-25 10:54:07 +02:00
Fedora Release Engineering f69ae9a3fc - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 16:54:39 +00:00
Zbigniew Jędrzejewski-Szmek 577568c4fc Add bug nr to %changelog 2021-06-15 08:47:48 +02:00
Fabio Valentini b79d3cfda4
allow building against rust-ini 0.17 2021-05-27 21:36:01 +02:00
Zbigniew Jędrzejewski-Szmek 54d85c6833 Fix missing path to generator dir 2021-03-23 22:03:17 +01:00
Zbigniew Jędrzejewski-Szmek 4fbeb5cf62 Do not pull in systemd during build
%_systemd_util_dir was added to macros for exactly this purpose.
2021-03-21 11:19:16 +01:00
Vasiliy Glazov d2520be3c5 Bump release 2021-03-19 19:54:12 +00:00
Vasiliy Glazov 08b319f2d7 Change max-zram-size to really 8GB 2021-03-19 19:35:43 +00:00
Zbigniew Jędrzejewski-Szmek 3095258edf Version 0.3.2 2021-02-24 09:45:45 +01:00
Zbigniew Jędrzejewski-Szmek c008a0a33a Increase scaling factor to 1.0 2021-01-27 17:08:05 +01:00
Igor Raits 41a4240f30
Update to 0.3.1
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2021-01-23 13:23:55 +01:00
Igor Raits 493392bf7e
Revert "Add BuildRequires: make"
We don't use make directly.

This reverts commit 098ee97719.

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2021-01-22 21:31:19 +01:00
Tom Stellard 098ee97719 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-15 00:44:32 +00:00
Igor Raits 46a36694ce
Update to 0.3.0-rc.1
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2021-01-13 18:09:28 +01:00
Igor Raits 0768aefaaa
Rebuild
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-12-28 13:34:14 +01:00
Fabio Valentini b25a65a208
allow building against rust-ini 0.16 2020-11-23 14:40:46 +01:00
Zbigniew Jędrzejewski-Szmek 7ffbec58ca Use normal static BR for ronn
I don't see any advantage in making this "dynamic".
2020-11-03 08:05:21 +01:00
Igor Raits 57276c2edf
Rebuild
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-08-16 17:02:03 +02:00
Zbigniew Jędrzejewski-Szmek e29686cc0f Obsolete zram package from zram-generator-defaults
It doesn't make much sense to have both zram-generator-defaults and zram
installed at the same time. It's likely to only lead to user confusion.

Also approved in https://fedoraproject.org/wiki/Changes/SwapOnZRAM#Scope.
2020-08-01 15:13:27 +02:00
Fedora Release Engineering 244db940de - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 10:07:19 +00:00
Igor Raits 54677ac75e
Do not ship TODO, it is no more
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-04 17:46:42 +02:00
Igor Raits bad1eab473
Do not ship TODO, it is no more
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-04 17:39:14 +02:00
Igor Raits 97184da85f
Update to 0.2.0
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-04 17:33:26 +02:00
Igor Raits 6030cbe043
Update to 0.2.0-rc.1
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-06-23 19:59:07 +02:00
Zbigniew Jędrzejewski-Szmek e44606d796 Make sure -defaults pulls in the main package
This makes it possible to tell people to just install the -defaults
subpackage.
2020-06-18 12:21:09 +02:00
Zbigniew Jędrzejewski-Szmek 5e437cfbfc Update documentation 2020-06-18 11:55:31 +02:00
Zbigniew Jędrzejewski-Szmek def91f4369 Recommend utit-linux but not systemd-detect-virt
systemd-detect-virt is only useful if the generator is run, and that only
happens when systemd is running, i.e. installed. So the Recommends
is not terribly useful.

But let's util-linux instead, so users get zramctl which can be used
to conveniently check the status.
2020-06-18 11:34:48 +02:00
Zbigniew Jędrzejewski-Szmek b7329e9a00 BR systemd-rpm-macros is the usual fashion
No need to make this dynamic.
2020-06-18 11:34:48 +02:00
Igor Raits 31bed76071
Create a subpackage with default configuration
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-06-18 11:32:09 +02:00
Igor Raits 45e43a23b2
Add swap-create@ to the %files
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-06-18 10:17:03 +02:00
Igor Raits 8f1281f6d0
Install swap-create unit file
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-06-18 10:14:56 +02:00
Igor Raits 3f7f539f8b
Fixup typo in the %doc, d'oh
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-06-18 09:38:47 +02:00
Igor Raits 107d3d9395
Disable tests for now
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-06-18 09:33:53 +02:00
Igor Raits 0bd13b4079
Update to 0.2.0-beta.1
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-06-18 09:29:30 +02:00
Igor Raits ca4100f971
Remove unused patch
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-06-17 20:00:57 +02:00
Jan Pokorný c640676c65 Make howto in description reflect crate -> pkg -> doc dir inheritance 2020-05-29 17:36:24 +02:00
Fedora Release Engineering 1d8bf34a15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 22:40:25 +00:00
Zbigniew Jędrzejewski-Szmek 58ba02525b Update to 0.1.2 2019-10-07 19:02:15 +02:00
Fedora Release Engineering ea168784c6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 22:33:21 +00:00
Igor Gnatenko e251a0e239
Regenerate
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-07-22 21:31:22 +02:00
Igor Gnatenko 6c72635271
BR: systemd-rpm-macros
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-03-09 15:14:27 +01:00
Igor Gnatenko daf5eef5cf
Update rust-ini to 0.13
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-03-09 15:08:00 +01:00
Igor Gnatenko 611c1e5938
Adapt to new packaging
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-03-09 15:01:10 +01:00
Zbigniew Jędrzejewski-Szmek 46bdab198d Relax version requirement to fix build 2019-03-01 16:51:58 +01:00
Fedora Release Engineering e378da2df4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 14:39:36 +00:00
Zbigniew Jędrzejewski-Szmek 08de400d38 Import package after review 2018-08-28 20:41:40 +02:00
6 changed files with 230 additions and 0 deletions

12
.gitignore vendored Normal file
View File

@ -0,0 +1,12 @@
/zram-generator-0.1.1.crate
/zram-generator-0.1.2.crate
/zram-generator-0.2.0-beta.1.crate
/zram-generator-0.2.0-rc.1.crate
/zram-generator-0.2.0.crate
/zram-generator-0.3.0-rc.1.crate
/zram-generator-0.3.1.crate
/zram-generator-0.3.2.crate
/zram-generator-1.0.1.crate
/zram-generator-1.1.0.crate
/zram-generator-1.1.1.crate
/zram-generator-1.1.2.crate

6
.rust2rpm.conf Normal file
View File

@ -0,0 +1,6 @@
[DEFAULT]
buildrequires =
systemd-rpm-macros
/usr/bin/ronn
/usr/bin/make
pkgconfig(systemd)

77
changelog Normal file
View File

@ -0,0 +1,77 @@
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu May 27 2021 Fabio Valentini <decathorpe@gmail.com> - 0.3.2-4
- Allow building against rust-ini 0.17 (#1968720)
* Tue Mar 23 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.2-3
- Fix missing path to generator dir
* Fri Mar 19 2021 Vasiliy Glazov <vascom2@gmail.com> - 0.3.2-2
- Fix max-zram-size value to 8GB
* Wed Feb 24 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.2-1
- Downgrade logging levels (#1930869)
* Wed Jan 27 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.1-2
- Implement https://fedoraproject.org/wiki/Changes/Scale_ZRAM_to_full_memory_size (#1921084)
* Sat Jan 23 13:23:10 CET 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.3.1-1
- Update to 0.3.1
* Wed Jan 13 16:57:21 CET 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.3.0~rc.1-1
- Update to 0.3.0-rc.1
* Mon Dec 28 13:34:14 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0-6
- Rebuild
* Mon Nov 23 2020 Fabio Valentini <decathorpe@gmail.com> - 0.2.0-5
- Allow building against rust-ini 0.16.
* Sun Aug 16 15:02:03 GMT 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0-4
- Rebuild
* Sat Aug 1 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.2.0-3
- Obsolete zram package from zram-generator-defaults
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 04 17:30:46 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0-1
- Update to 0.2.0
* Tue Jun 23 19:56:14 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~rc.1-1
- Update to 0.2.0-rc.1
* Thu Jun 18 11:30:43 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~beta.1-3
- Create a subpackage with default configuration
* Thu Jun 18 10:14:43 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~beta.1-2
- Install swap-create unit file
* Thu Jun 18 09:27:37 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~beta.1-1
- Update to 0.2.0-beta.1
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Oct 7 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.2-1
- Update to latest version
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jul 22 21:30:22 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.1-4
- Regenerate
* Sat Mar 09 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.1-3
- Adapt to new packaging
* Fri Mar 1 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.1-2
- Add crude patch to fix build (#1676154)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Aug 16 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.1-1
- Initial package

126
rust-zram-generator.spec Normal file
View File

@ -0,0 +1,126 @@
# Generated by rust2rpm 19
%bcond_without check
%global crate zram-generator
Name: rust-%{crate}
Version: 1.1.2
Release: %autorelease
Summary: Systemd unit generator for zram swap devices
# Upstream license specification: MIT
License: MIT
URL: https://crates.io/crates/zram-generator
Source: %{crates_source}
Source1: zram-generator.conf
ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging
%global _description %{expand:
This is a systemd unit generator that enables swap on zram.
(With zram, there is no physical swap device. Part of the available RAM
is used to store compressed pages, essentially trading CPU cycles for memory.)
To activate, install %{crate}-defaults subpackage.}
%description %{_description}
%package -n %{crate}
Summary: %{summary}
# MIT
# MIT or ASL 2.0
License: MIT
Recommends: %{_sbindir}/zramctl
%description -n %{crate} %{_description}
%files -n %{crate}
%license LICENSE
%doc zram-generator.conf.example
%doc README.md
%{_systemdgeneratordir}/zram-generator
%{_unitdir}/systemd-zram-setup@.service
%{_mandir}/man8/zram-generator.8*
%{_mandir}/man5/zram-generator.conf.5*
%package -n %{crate}-defaults
Summary: Default configuration for %{crate}
Requires: %{crate} = %{version}-%{release}
Obsoletes: zram < 0.4-2
BuildArch: noarch
%description -n %{crate}-defaults
%{summary}.
%files -n %{crate}-defaults
%{_prefix}/lib/systemd/zram-generator.conf
%package devel
Summary: %{summary}
BuildArch: noarch
%description devel %{_description}
This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
%license LICENSE
%doc README.md
%{cargo_registry}/%{crate}-%{version_no_tilde}/
%package -n %{name}+default-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+default-devel %{_description}
This package contains library source intended for building other packages
which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
cp -a %{S:1} .
%cargo_prep
%generate_buildrequires
%cargo_generate_buildrequires
echo '/usr/bin/make'
echo '/usr/bin/ronn'
echo 'systemd-rpm-macros'
%build
export SYSTEMD_UTIL_DIR=%{_systemd_util_dir}
export LC_ALL=C.UTF-8
%cargo_build
%make_build SYSTEMD_SYSTEM_UNIT_DIR=%{_unitdir} SYSTEMD_SYSTEM_GENERATOR_DIR=%{_systemdgeneratordir} \
systemd-service man
%install
export SYSTEMD_UTIL_DIR=%{_systemd_util_dir}
%cargo_install
rm %{buildroot}%{_bindir}/zram-generator
%make_install SYSTEMD_SYSTEM_UNIT_DIR=%{_unitdir} SYSTEMD_SYSTEM_GENERATOR_DIR=%{_systemdgeneratordir} \
NOBUILD=1
install -Dpm0644 -t %{buildroot}%{_prefix}/lib/systemd %{SOURCE1}
%if %{with check}
%check
export SYSTEMD_UTIL_DIR=%{_systemd_util_dir}
%cargo_test
: ==============================================================================
%{buildroot}%{_systemdgeneratordir}/zram-generator --help
: ==============================================================================
%{buildroot}%{_systemdgeneratordir}/zram-generator --help | grep -q %{_systemd_util_dir}/systemd-makefs
%endif
%changelog
%autochangelog

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (zram-generator-1.1.2.crate) = dfad7d4384eb4635c33475e4571d33a3135c92cf42138dd1cb50f19aef4b3f2465130783e385a3f544e43a1653273cee9b2d8f45177a8b053acf37805dc939c8

8
zram-generator.conf Normal file
View File

@ -0,0 +1,8 @@
# This config file enables a /dev/zram0 device with the default settings:
# — size — same as available RAM or 8GB, whichever is less
# — compression — most likely lzo-rle
#
# To disable, uninstall zram-generator-defaults or create empty
# /etc/systemd/zram-generator.conf file.
[zram0]
zram-size = min(ram, 8192)