Commit Graph

286 Commits

Author SHA1 Message Date
Jonathan Lebon
da1db8dd54 Release 2020.3 2020-06-19 13:57:36 -04:00
Jonathan Lebon
d4297e61fa Sync upstream spec 2020-05-26 11:02:24 -04:00
Jonathan Lebon
b2bfd5024c Backport patch to tweak downgrade protection for FCOS
See https://github.com/coreos/rpm-ostree/pull/2096 and
https://github.com/coreos/fedora-coreos-tracker/issues/481.
2020-05-15 13:56:47 -04:00
Colin Walters
112d97aeb7 https://github.com/coreos/rpm-ostree/releases/tag/v2020.2 2020-05-15 14:06:54 +00:00
Björn Esser
3879458ae2 Rebuild (json-c) 2020-04-22 00:12:37 +02:00
Jonathan Lebon
23964e8699 git master snapshot for using strict mode and lockfile-repos in FCOS
https://github.com/coreos/rpm-ostree/pull/1858
https://github.com/coreos/rpm-ostree/pull/2058
https://github.com/coreos/fedora-coreos-tracker/issues/454
2020-04-20 09:20:54 -04:00
Colin Walters
d44379a80f Backport https://github.com/coreos/rpm-ostree/pull/2015
See https://github.com/coreos/fedora-coreos-tracker/issues/343
2020-03-13 23:22:33 +00:00
Jonathan Lebon
de087e65a9 Sync upstream spec 2020-02-27 15:23:18 -05:00
Jonathan Lebon
8e50a35c33 git master snapshot for using base initramfs kargs in RHCOS
https://github.com/coreos/rpm-ostree/pull/1998
https://github.com/coreos/rpm-ostree/pull/1997
https://bugzilla.redhat.com/show_bug.cgi?id=1806588
2020-02-27 15:16:22 -05:00
Jonathan Lebon
d2fd6aa19e Release 2020.1 2020-02-05 17:30:45 -05:00
Jonathan Lebon
597f7f5134 git master snapshot for Silverblue rawhide compose fixes
https://pagure.io/releng/failed-composes/issue/717
https://pagure.io/releng/failed-composes/issue/929
https://github.com/rpm-software-management/libdnf/pull/885
2020-02-04 16:58:18 -05:00
Fedora Release Engineering
f4faa5ba73 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 17:51:54 +00:00
Jonathan Lebon
b72be82555 Backport patch for Silverblue composes:
https://pagure.io/releng/failed-composes/issue/717
https://github.com/coreos/rpm-ostree/pull/1961
2020-01-09 09:37:33 -05:00
Jonathan Lebon
cead07812e Release 2019.7
And drop the gcc10 compat patch; it's in the latest bundled libdnf.
2019-12-19 12:26:56 -05:00
Jeff Law
593ee1b507 Fix missing #include for gcc-10 2019-12-14 14:11:07 -07:00
Jonathan Lebon
216166727f git master snapshot for dracut cpio cap_mknod fix
https://github.com/coreos/rpm-ostree/pull/1946
2019-12-05 14:37:52 -05:00
Jonathan Lebon
5e038b5865 git master snapshot for HMAC path fix for FIPS
https://github.com/coreos/rpm-ostree/pull/1934

We need this in COSA since the path scrubbing magic happens at compose
time.
2019-10-31 10:44:48 -04:00
Jonathan Lebon
f20dae4e0a Add patch to fix 32-bit compilation 2019-09-25 12:51:20 -04:00
Jonathan Lebon
5e9b924d28 Add changelog entry 2019-09-25 12:13:53 -04:00
Jonathan Lebon
3542bc391c Release 2019.6 2019-09-25 11:12:51 -04:00
Jonathan Lebon
ccd423d93d spec: import latest 2019-09-10 13:02:30 -04:00
Colin Walters
75d7be8d8e New upstream git snapshot, mainly for backporting the arch-includes conditionals
to aid Fedora CoreOS on s390x.
2019-08-22 16:35:50 +00:00
Stephen Gallagher
820639a058
Fix libmodulemd dependencies
The runtime requirement would have been pulling in the libmodulemd
2.x API rather than adequately specifying the minimum 1.x version.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2019-07-31 15:55:29 -04:00
Jonathan Lebon
dd2c490700 Release 2019.5 2019-07-25 12:25:52 -04:00
Jonathan Lebon
2822669cda git master snapshot for --parent and lockfile overrides
https://github.com/projectatomic/rpm-ostree/pull/1871
https://github.com/projectatomic/rpm-ostree/pull/1867
2019-07-19 11:12:03 -04:00
Colin Walters
1af7867575 Update rpmostree-rust.h in sources 2019-07-12 22:10:21 +00:00
Colin Walters
1b0431ef4b Update with git snapshot for zstd support 2019-07-12 21:53:29 +00:00
Jonathan Lebon
424f572bb8 git master snapshot for add-commit-metadata
https://github.com/projectatomic/rpm-ostree/pull/1865/
2019-07-10 10:15:14 -04:00
Jonathan Lebon
3f6a528f89 git master snapshot for OSTree layers
https://github.com/projectatomic/rpm-ostree/pull/1830/
2019-06-14 10:40:07 -04:00
Igor Gnatenko
8c13f39760
Rebuild for RPM 4.15
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-11 00:13:22 +02:00
Igor Gnatenko
2e6de8b220
Rebuild for RPM 4.15
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-06-10 17:42:05 +02:00
Jonathan Lebon
8fbc903ab3 Drop no longer necessary patch 2019-06-06 15:14:20 -04:00
Jonathan Lebon
86e9f190a8 git master snapshot for lockfile
https://github.com/projectatomic/rpm-ostree/pull/1745/
2019-06-06 15:04:14 -04:00
Dusty Mabe
3f09449983
Add back in ppc64le and ppc64 builds
Seems to be building again fine now.
2019-05-28 16:44:07 -04:00
Dusty Mabe
f0cc1beff4
Backport patch for db diff --format=json
Upstream commit 12fbe89abab673e5ed0b23ee2bb01973c6d6b262
2019-05-23 17:02:03 -04:00
Jonathan Lebon
0af01d96de Temporarily disable ppc64le builds for now
We're hitting an issue trying to build on ppc64le:
https://bugzilla.redhat.com/show_bug.cgi?id=1713090

Temporarily disable it for now. It's important to get this fixed, but I
don't want to block FCOS work since ppc64le isn't a hard requirement.
2019-05-22 17:03:07 -04:00
Jonathan Lebon
c70261e6b7 Drop rust_arches conditional
We no longer care about el7 buildroots. Drop the `rust_arches`
conditional define since both Fedora and el8 have it defined.
2019-05-22 16:51:03 -04:00
Jonathan Lebon
91fffa27fe Release 2019.4 2019-05-21 17:34:15 -04:00
Jonathan Lebon
cf661a4081 Add temporary hack to avoid UTF-8 for Bodhi 2019-05-06 16:56:53 -04:00
Jonathan Lebon
dfd2085303 Update to git master snapshot to test continuous tag 2019-04-09 09:47:08 -04:00
Jonathan Lebon
37913fcf40 Directly add BR to cargo and rust, not rust-packaging
The latter is only meant for publishing crates. Since we're just
bundling some Rust code, we should just directly pull in `cargo` and
`rust`.
2019-03-27 17:34:55 -04:00
Jonathan Lebon
d4c62747b8 Simplify spec now that we no longer support el7
Less conditionals = more win
2019-03-27 17:34:21 -04:00
Jonathan Lebon
1bbf6bb833 Add new libdnf build deps 2019-03-27 13:43:42 -04:00
Jonathan Lebon
97dfb21638 Release 2019.3 2019-03-27 13:04:59 -04:00
Jonathan Lebon
a118ae0cdf spec: Add bash completions to file list
We now have bash completions! \o/
2019-03-06 14:29:28 -05:00
Jonathan Lebon
f3884c794e Release 2019.2 2019-02-14 16:19:33 -05:00
Jonathan Lebon
2d9b7d5e90 Backport patch for local repo remote rebases
Backport https://github.com/projectatomic/rpm-ostree/pull/1732/.
Not planning to do a Fedora respin for this, just want it to get picked
up by CAHC.
2019-02-06 15:13:03 -05:00
Jonathan Lebon
fa4bb14da2 spec: Use --disable-dfd-over-dbus on CAHC
Since we consume CAHC RPMs in the RHCOS dev pipeline.
2019-02-05 14:23:03 -05:00
Fedora Release Engineering
7b6c00fbd2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 11:35:02 +00:00
Igor Gnatenko
091833c72c Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:45 +01:00
Jonathan Lebon
ae9474c945 Release 2019.1 2019-01-22 09:38:18 -05:00
Jonathan Lebon
97346cf780 Release 2018.10 2018-12-14 16:34:49 -05:00
Jonathan Lebon
634dc19315 Simplify Rust conditionals
We can greatly simplify the Rust goop now since:

1. upstream now hard requires Rust, so there's no need to make a
   conditional for `--enable-rust`.
2. we're not rebasing rpm-ostree in f27, so we can simplify the `>= 28`
   conditionals
3. el7 is strictly backports only, so we can simplify the `0%{?rhel}`
   conditionals (though we still want to support CentOS 7)
4. the new recommended way of using Rust in el8 is to just
   `BuildRequires: rust-toolset`, so we can drop all the SCL crud.
2018-12-04 15:29:09 -05:00
Jonathan Lebon
d8a5bf5d7a 2018.9-3: Backport patch for https://pagure.io/dusty/failed-composes/issue/956 2018-11-02 11:56:46 -04:00
Igor Gnatenko
3ce3a4b5d5 Rebuild for libsolv 0.7
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-10-30 15:24:17 +01:00
Jonathan Lebon
fca874846e Backport patch to use systemd-0.4.0 crate
Otherwise the `patch.crates-io` directive throws off `cargo vendor` and
`cargo build` then tries to fetch from `github.com/jlebon/rust-systemd`.
2018-10-28 22:49:32 -04:00
Jonathan Lebon
2f9cc3806a Release 2018.9 2018-10-28 21:42:07 -04:00
Jonathan Lebon
c98d67835e spec: Add BR on toolset rust and runtime
The `cargo` BR was already pulling in the `rust` one, though to be clear
and look closer to what the guidelines suggest, let's make that
explicit.

Also guidelines suggest we should add a BR on the `-runtime` package as
well. It includes RPM macros to help with toolset stuff (although we're
not making use of them right now).
2018-10-15 15:07:07 -04:00
Jonathan Lebon
5d07c9f565 spec: Add indentation of conditionals
So, this is a hack to somewhat help legibility. RPM allows leading
spaces of `%directives` but not of e.g. `BuildRequires` and
`ExclusiveArch`, so this looks a bit more awkward than it should. But
overall I think it still helps with making sense of all the nested
conditionals.
2018-10-15 15:06:33 -04:00
Jonathan Lebon
6592dc0a63 Merge #24 Quote reference to configure macro 2018-10-12 00:14:30 +00:00
Jonathan Lebon
1f3d574d49 Add libcurl BR and upload tarball without bundled copy
See https://github.com/projectatomic/rpm-ostree/pull/1554

(Also fix the bogus date in the `%changelog`).
2018-09-11 10:55:09 -04:00
Jonathan Lebon
6562cb47f3 Release 2018.8 2018-09-10 17:21:09 -04:00
Colin Walters
de81c34c0f Quote reference to configure macro
RPM expands macros in spec file comments.  Yes, it's an insane format.
It took me a while to understand why we were running `configure` twice.
2018-08-27 12:01:18 -04:00
Colin Walters
1f289f2410 spec: Require just toolset on el>7
This was the cause of the stray `%else\n%endif` - there's only
`BuildRequires: rust-toolset-1.26` there right now.
2018-08-27 10:21:07 -04:00
Colin Walters
9c43f986d3 Support Rust on CentOS 7
The pain multiplies...there's no `rust-packaging` there, and
no SRPM macros so we need a copy of the arch list.
2018-08-20 16:07:57 -04:00
Colin Walters
5075393fb3 Add a /usr/bin/python3 BR
Since we do use it for autofiles.  Let's use the file path
to avoid hardcoding knowledge of which package contains it.
2018-08-14 10:05:14 -04:00
Jonathan Lebon
47d9af57c6 Merge #20 Do the SCL dance necessary to use Rust in RHEL > 7 2018-08-09 18:16:40 +00:00
Jonathan Lebon
c7aa8af948 Release 2018.7 2018-08-09 14:02:10 -04:00
Colin Walters
99142b85fc Do the SCL dance necessary to use Rust in RHEL > 7
The `%_configure` thing was especially painful to figure out.
But anyways tested and works.

I'd like to make Rust mandatory soon, along with the general
trend of paring down our experimental/optional feature matrix.
2018-08-09 13:59:37 -04:00
Jonathan Lebon
32bd097220 git master snapshot for RHBZ#1565647 2018-08-01 10:41:35 -04:00
Colin Walters
1196f1c2b3 https://github.com/projectatomic/rpm-ostree/pull/1461 2018-07-30 12:50:28 -04:00
Colin Walters
e255679cea https://github.com/projectatomic/rpm-ostree/pull/1469 2018-07-30 16:40:59 +00:00
Colin Walters
c92a606d60 Make build python3-only compatible for distributions that want that 2018-07-16 21:31:16 +00:00
Fedora Release Engineering
2a0fd3d7c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 03:43:39 +00:00
Jonathan Lebon
f2b60ed353 Bump release for Rust rebuild 2018-06-29 15:37:43 -04:00
Colin Walters
a707bea879 Enable Rust
rpm-ostree now includes some Rust code.
See https://github.com/projectatomic/rpm-ostree/pull/1377
and https://github.com/projectatomic/rpm-ostree/pull/1391
2018-06-29 15:27:39 -04:00
Jonathan Lebon
39b44ddef2 Release 2018.6 2018-06-29 14:51:29 -04:00
Jonathan Lebon
48080d8ef7 Release 2018.5 2018-05-15 10:51:08 -04:00
Jonathan Lebon
8e5fd5e7d6 spec: use python-sphinx on RHEL/CentOS platforms
We use this spec file to build on CentOS as well. There,
`python2-sphinx` does not exist, only `python-sphinx`. Let's accommodate
this while still respecting guidelines on Fedora.

See also:
https://github.com/CentOS/sig-atomic-buildscripts/issues/324
2018-04-18 15:30:24 -04:00
Jonathan Lebon
24bf347350 Release 2018.4 2018-03-26 11:20:32 -04:00
Iryna Shcherbina
a2b7919bdb Update Python 2 dependency declarations to new packaging standards 2018-03-18 16:21:52 +01:00
Jonathan Lebon
5ffa5a9542 Add BR on gcc-c++
https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B
https://lists.fedoraproject.org/archives/list/devel-announce@lists.fedoraproject.org/thread/5TYOPW4LSPQ3RWP34VIS25MQE4EVJOGF/
2018-03-07 14:14:25 +00:00
Dusty Mabe
2acd02cd70
backport treating FUSE as netfs for s390x 2018-03-01 17:10:32 -05:00
Dusty Mabe
62c6ccb47b
fix date in changelog
sorry, the warning messages about invalid dates bother me
2018-03-01 16:46:11 -05:00
Jonathan Lebon
d146cef5e4 Release 2018.3 2018-02-18 21:46:42 +00:00
Jonathan Lebon
28c16f3b69 spec: Bump ostree BR to v2018.2
We use the new checkout filtering features from it.
2018-02-16 21:32:37 +00:00
Jonathan Lebon
580f4db85f Drop all patches and fix bogus dates 2018-02-16 21:13:37 +00:00
Jonathan Lebon
70a8898860 Release 2018.2 2018-02-16 21:04:01 +00:00
Fedora Release Engineering
ca07ae18bf - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 13:18:29 +00:00
Dusty Mabe
866d7e07f7
Revert the ostree:// formatting in the output.
See https://github.com/projectatomic/rpm-ostree/pull/1136#issuecomment-358122137

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2018-01-19 21:26:37 -05:00
Jonathan Lebon
bf924bb6f5 spec: add rpm-ostreed.conf file entry
Just remembered this had to go in as well with the upstream work. Sure
enough, rdgo is currently failing on this. Let's get it chugging along
again!
2018-01-16 21:45:43 +00:00
Jonathan Lebon
502d70123f spec: bump ostree requirement to 2017.15
We make use of the new `ostree_break_hardlink` API. Otherwise, no build
requirements on v2018.1 itself.
2018-01-15 20:44:54 +00:00
Colin Walters
14902173d2 Release 2018.1 2018-01-15 14:56:57 -05:00
Jonathan Lebon
0e3b7e4ada 2017.11-1: New upstream release 2017-12-04 22:21:21 +00:00
Colin Walters
b1f1a8a384 Backport patch for NFS issues 2017-11-22 11:43:17 -05:00
Jonathan Lebon
774cabbaaa 2017.10-2: Backport fix for --repo handling
https://github.com/projectatomic/rpm-ostree/pull/1101
2017-11-14 14:53:48 +00:00
Colin Walters
a43cbae1de New upstream release 2017-11-02 17:51:59 -04:00
Jonathan Lebon
b6f475dcdd spec: add explicit requires for -libs subpackage
RPMDiff was complaining about this:

```
Subpackage rpm-ostree on x86_64 consumes library
librpmostree-1.so.1()(64bit) from subpackage rpm-ostree-libs but does
not have explicit package version requirement.
Please add Requires: rpm-ostree-libs = %{version}-%{release} to
rpm-ostree in the specfile to avoid the need to test interoperability
between the various combinations of old and new subpackages.
```

Since we don't use any symbol versioning in rpm-ostree, this seems like
a fair point. In practice, the matching -libs package should be
available at the same time when composing/installing, though this
protects us from manual `rpm` invocations as well.
2017-09-26 14:29:18 +00:00
Jonathan Lebon
4bd8b46192 2017.9-1: new upstream version
Also bump requirement on libostree for multiple things, including
`OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL`.
2017-09-25 17:23:01 +00:00
Jonathan Lebon
77767f7d82 2017.8-2: patch to allow metadata_expire=0 2017-08-21 17:17:12 -04:00