Attachment 894359 Details for Bug 1095986 – Update to the latest git commit 2e9f08e

[patch] Update to the latest git commit 2e9f08e

0001-Update-to-the-latest-git-commit-2e9f08e.patch (text/plain), 6.66 KB, created by poma on 2014-05-11 02:39:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: poma

Created: 2014-05-11 02:39:46 UTC

Size: 6.66 KB

patch

obsolete

>From 647f25e5e61d1b055641dc48924bf6191bc2bbb3 Mon Sep 17 00:00:00 2001
>From: poma <pomidorabelisima@gmail.com>
>Date: Sun, 11 May 2014 03:56:50 +0200
>Subject: [PATCH] Update to the latest git commit 2e9f08e
>
>Signed-off-by: poma <pomidorabelisima@gmail.com>
>---
> sources      |  3 +-
> systemd.spec | 90 ++++++++++++------------------------------------------------
> 2 files changed, 18 insertions(+), 75 deletions(-)
>
>diff --git a/sources b/sources
>index e2e30ee..1c6fb36 100644
>--- a/sources
>+++ b/sources
>@@ -1,2 +1 @@
>-257a75fff826ff91cb1ce567091cf270  systemd-212.tar.xz
>-7cc21230d87d3077d244237aa8b302a1  0001-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
>+caf7a74ee5a45253cb8098eff7cebadb  systemd-2e9f08e.tar.gz
>diff --git a/systemd.spec b/systemd.spec
>index 4f7e53d..855c84c 100644
>--- a/systemd.spec
>+++ b/systemd.spec
>@@ -1,4 +1,7 @@
>-#global gitcommit f01de96
>+%define gitcommit_short 2e9f08e
>+%define gitcommit_date 20140510
>+%define real_version 212
>+%define release_version 8
> 
> # PIE is broken on s390 (#868839, #872148)
> %ifnarch s390 s390x
>@@ -15,18 +18,14 @@
> 
> Name:           systemd
> Url:            http://www.freedesktop.org/wiki/Software/systemd
>-Version:        212
>-Release:        4%{?gitcommit:.git%{gitcommit}}%{?dist}
>+Version:        %{real_version}
>+Release:        %{release_version}.git%{gitcommit_short}.%{gitcommit_date}%{?dist}
> # For a breakdown of the licensing, see README
> License:        LGPLv2+ and MIT and GPLv2+
> Summary:        A System and Service Manager
> 
>-%if %{defined gitcommit}
>-# Snapshot tarball can be created using: ./make-git-shapshot.sh [gitcommit]
>-Source0:        %{name}-git%{gitcommit}.tar.xz
>-%else
>-Source0:        http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
>-%endif
>+# Snapshot tarball can be downloaded: http://cgit.freedesktop.org/systemd/systemd/snapshot/%{name}-%{gitcommit_short}.tar.gz
>+Source0:        %{name}-%{gitcommit_short}.tar.gz
> # Fedora's default preset policy
> Source1:        90-default.preset
> Source7:        99-default-disable.preset
>@@ -36,15 +35,8 @@ Source4:        listen.conf
> # Prevent accidental removal of the systemd package
> Source6:        yum-protect-systemd.conf
> 
>-# Patch series is available from http://cgit.freedesktop.org/systemd/systemd-stable/log/?h=v211-stable
>-# GIT_DIR=~/src/systemd/.git git format-patch-ab -M -N --no-signature v211..v211-stable
>-# i=1; for p in 0*patch;do printf "Patch%03d:       %s\n" $i $p; ((i++));done
>-
> # kernel-install patch for grubby, drop if grubby is obsolete
> Patch1000:      kernel-install-grubby.patch
>-Patch1001:      0001-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
>-
>-%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
> 
> BuildRequires:  libcap-devel
> BuildRequires:  tcp_wrappers-devel
>@@ -80,14 +72,9 @@ BuildRequires:  python3-lxml
> # https://bugzilla.redhat.com/show_bug.cgi?id=1071284
> BuildRequires:  libseccomp-devel
> %endif
>-%if %{defined gitcommit}%{num_patches}
> BuildRequires:  automake
> BuildRequires:  autoconf
> BuildRequires:  libtool
>-%endif
>-%if %{num_patches}
>-BuildRequires:  git
>-%endif
> Requires(post): coreutils
> Requires(post): sed
> Requires(post): acl
>@@ -199,64 +186,16 @@ Obsoletes:      systemd < 204-10
> systemd-journal-gatewayd serves journal events over the network using HTTP.
> 
> %prep
>-%setup -q %{?gitcommit:-n %{name}-git%{gitcommit}}
>-
>-%if %{num_patches}
>-    git init
>-    git config user.email "systemd-maint@redhat.com"
>-    git config user.name "Fedora systemd team"
>-    git add .
>-    git commit -a -q -m "%{version} baseline."
>-
>-    # Apply all the patches.
>-    git am \
>-        --exclude .gitignore \
>-        --exclude docs/.gitignore \
>-        --exclude docs/gudev/.gitignore \
>-        --exclude docs/libudev/.gitignore \
>-        --exclude docs/sysvinit/.gitignore \
>-        --exclude docs/var-log/.gitignore \
>-        --exclude hwdb/.gitignore \
>-        --exclude m4/.gitignore \
>-        --exclude man/.gitignore \
>-        --exclude po/.gitignore \
>-        --exclude rules/.gitignore \
>-        --exclude src/.gitignore \
>-        --exclude src/analyze/.gitignore \
>-        --exclude src/core/.gitignore \
>-        --exclude src/gudev/.gitignore \
>-        --exclude src/hostname/.gitignore \
>-        --exclude src/journal/.gitignore \
>-        --exclude src/libsystemd-daemon/.gitignore \
>-        --exclude src/libsystemd-id128/.gitignore \
>-        --exclude src/libudev/.gitignore \
>-        --exclude src/locale/.gitignore \
>-        --exclude src/login/.gitignore \
>-        --exclude src/python-systemd/.gitignore \
>-        --exclude src/python-systemd/docs/.gitignore \
>-        --exclude src/timedate/.gitignore \
>-        --exclude src/udev/.gitignore \
>-        --exclude src/udev/scsi_id/.gitignore \
>-        --exclude sysctl.d/.gitignore \
>-        --exclude test/.gitignore \
>-        --exclude units/.gitignore \
>-        --exclude units/user/.gitignore \
>-        --exclude src/libsystemd/sd-bus/PORTING-DBUS1 \
>-        %{patches}
>-%endif
>+%setup -q %{?gitcommit_short:-n %{name}-%{gitcommit_short}}
>+%patch1000 -p1 -b .grubby
>+
> %ifarch ppc ppc64 ppc64le
> # Disable link warnings, somehow they cause the link to fail.
> sed -r -i 's/\blibsystemd-(login|journal|id128|daemon).c \\/\\/' Makefile.am
> %endif
> 
> %build
>-%if %{defined gitcommit}
>-    ./autogen.sh
>-%else
>-    %if %{num_patches}
>-        autoreconf -i
>-    %endif
>-%endif
>+./autogen.sh
> 
> # first make python3 while source directory is empty
> rm -rf build2 build3
>@@ -544,6 +483,7 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g
> %config(noreplace) %{_sysconfdir}/systemd/logind.conf
> %config(noreplace) %{_sysconfdir}/systemd/journald.conf
> %config(noreplace) %{_sysconfdir}/systemd/bootchart.conf
>+%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
> %config(noreplace) %{_sysconfdir}/udev/udev.conf
> %config(noreplace) %{_sysconfdir}/rsyslog.d/listen.conf
> %config(noreplace) %{_sysconfdir}/yum/protected.d/systemd.conf
>@@ -648,6 +588,7 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g
> %{_prefix}/lib/systemd/catalog/systemd.*.catalog
> %{_prefix}/lib/systemd/network/99-default.link
> %{_prefix}/lib/systemd/network/80-container-host0.network
>+%{_prefix}/lib/systemd/ntp-units.d/90-systemd.list
> 
> # Make sure we don't remove runlevel targets from F14 alpha installs,
> # but make sure we don't create then anew.
>@@ -718,6 +659,9 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g
> %{_datadir}/systemd/gatewayd
> 
> %changelog
>+* Sun May 11 2014 poma <poma@gmail.com> - 212-8.git2e9f08e.20140510
>+- Update to the latest git commit 2e9f08e
>+
> * Wed May 07 2014 Kay Sievers <kay@redhat.com> - 212-4
> - add netns udev workaround
> 
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1095986: 893835 | 893836 | 893837 | 894274 | 894275 | 894359 | 894360