From df5c6794a41aeae109d6017bbae6de6201a26e7a492f43fd2b4b4770a544c065 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 9 Aug 2018 06:47:09 +0000 Subject: [PATCH 1/2] Accepting request 628331 from home:fbui:systemd:Factory - Import commit bb5a925bcefd4743873cae3f748ae1a426e92d44 8983bd246 core: don't include libmount.h in a header file (#8580) 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes 42edc93ac core/service: rework the hold-off time over message - Enable regexp matching support Currently only used by "journalctl --grep=xxx". OBS-URL: https://build.opensuse.org/request/show/628331 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1035 --- systemd-mini.changes | 16 ++++++++++++++++ systemd-mini.spec | 3 ++- systemd-v237+suse.71.g0350f62a8.tar.xz | 3 --- systemd-v237+suse.76.gbb5a925bc.tar.xz | 3 +++ systemd.changes | 16 ++++++++++++++++ systemd.spec | 3 ++- 6 files changed, 39 insertions(+), 5 deletions(-) delete mode 100644 systemd-v237+suse.71.g0350f62a8.tar.xz create mode 100644 systemd-v237+suse.76.gbb5a925bc.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 1b0d8985..f99ac367 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Aug 8 13:26:03 UTC 2018 - fbui@suse.com + +- Import commit bb5a925bcefd4743873cae3f748ae1a426e92d44 + + 8983bd246 core: don't include libmount.h in a header file (#8580) + 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes + 42edc93ac core/service: rework the hold-off time over message + +------------------------------------------------------------------- +Wed Aug 1 12:19:40 UTC 2018 - fbui@suse.com + +- Enable regexp matching support + + Currently only used by "journalctl --grep=xxx". + ------------------------------------------------------------------- Fri Jul 27 10:23:29 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 9f9aa45e..5701729a 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.71.g0350f62a8 +%define suse_version +suse.76.gbb5a925bc %bcond_with gnuefi %if 0%{?bootstrap} @@ -70,6 +70,7 @@ BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x diff --git a/systemd-v237+suse.71.g0350f62a8.tar.xz b/systemd-v237+suse.71.g0350f62a8.tar.xz deleted file mode 100644 index f8e4dc5a..00000000 --- a/systemd-v237+suse.71.g0350f62a8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ecff52170239199d824770b49be4923bceba2544371b266f9f2d695702a44f0 -size 4627884 diff --git a/systemd-v237+suse.76.gbb5a925bc.tar.xz b/systemd-v237+suse.76.gbb5a925bc.tar.xz new file mode 100644 index 00000000..227460b4 --- /dev/null +++ b/systemd-v237+suse.76.gbb5a925bc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e53944f87bf7603766cdd7230a2898c2948ede4c1f5a7e0e1fac3810f93fd57 +size 4627756 diff --git a/systemd.changes b/systemd.changes index 1b0d8985..f99ac367 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Aug 8 13:26:03 UTC 2018 - fbui@suse.com + +- Import commit bb5a925bcefd4743873cae3f748ae1a426e92d44 + + 8983bd246 core: don't include libmount.h in a header file (#8580) + 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes + 42edc93ac core/service: rework the hold-off time over message + +------------------------------------------------------------------- +Wed Aug 1 12:19:40 UTC 2018 - fbui@suse.com + +- Enable regexp matching support + + Currently only used by "journalctl --grep=xxx". + ------------------------------------------------------------------- Fri Jul 27 10:23:29 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 3c26cd4a..80630a40 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.71.g0350f62a8 +%define suse_version +suse.76.gbb5a925bc %bcond_with gnuefi %if 0%{?bootstrap} @@ -68,6 +68,7 @@ BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x From 2a583969a5fbaccdaa785f9b13d28e413ee89e081942e65e8272164fc31929a3 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 9 Aug 2018 06:51:29 +0000 Subject: [PATCH 2/2] Accepting request 628334 from home:fbui:systemd:Factory 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753) OBS-URL: https://build.opensuse.org/request/show/628334 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1036 --- systemd-mini.changes | 2 +- systemd.changes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index f99ac367..9154009b 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -4,7 +4,7 @@ Wed Aug 8 13:26:03 UTC 2018 - fbui@suse.com - Import commit bb5a925bcefd4743873cae3f748ae1a426e92d44 8983bd246 core: don't include libmount.h in a header file (#8580) - 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes + 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753) 42edc93ac core/service: rework the hold-off time over message ------------------------------------------------------------------- diff --git a/systemd.changes b/systemd.changes index f99ac367..9154009b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -4,7 +4,7 @@ Wed Aug 8 13:26:03 UTC 2018 - fbui@suse.com - Import commit bb5a925bcefd4743873cae3f748ae1a426e92d44 8983bd246 core: don't include libmount.h in a header file (#8580) - 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes + 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753) 42edc93ac core/service: rework the hold-off time over message -------------------------------------------------------------------