Hello community, here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2014-04-26 17:01:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lvm2 (Old) and /work/SRC/openSUSE:Factory/.lvm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lvm2" Changes: -------- --- /work/SRC/openSUSE:Factory/lvm2/lvm2.changes 2014-04-11 14:40:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lvm2.new/lvm2.changes 2014-04-26 17:01:51.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Apr 16 09:11:32 UTC 2014 - tr...@suse.de + +- Switch from mkinitrd to dracut + - Dracut already has a lvm module and takes care that the right stuff is + include into initrd, therefore remove: + - mkinitrd-lvm2-boot.sh + - mkinitrd-lvm2-setup.sh + mkinitrd scripts from sources + - Add dracut macros in %post and %posttrans to ensure initrd recreation +- Remove unneeded comments in .spec file +- Do not compile in DATE and TIME to avoid build unneeded retriggering in obs + Add: cmirrord_remove_date_time_from_compilation.patch + +------------------------------------------------------------------- Old: ---- mkinitrd-lvm2-boot.sh mkinitrd-lvm2-setup.sh New: ---- cmirrord_remove_date_time_from_compilation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.hvy8dL/_old 2014-04-26 17:01:52.000000000 +0200 +++ /var/tmp/diff_new_pack.hvy8dL/_new 2014-04-26 17:01:52.000000000 +0200 @@ -25,11 +25,11 @@ BuildRequires: libselinux-devel BuildRequires: libudev-devel BuildRequires: readline-devel +BuildRequires: suse-module-tools BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(udev) Requires: device-mapper >= 1.02.25 Provides: lvm -PreReq: /sbin/mkinitrd Version: 2.02.98 Release: 0.<RELEASE11> Summary: Logical Volume Manager Tools @@ -38,8 +38,6 @@ Source: ftp://sources.redhat.com/pub/%{name}/LVM2.%{version}.tgz Source42: ftp://sources.redhat.com/pub/%{name}/LVM2.%{version}.tgz.asc Source1: lvm.conf -Source4: mkinitrd-lvm2-setup.sh -Source5: mkinitrd-lvm2-boot.sh Source8: clvmd.ocf Source10: cmirrord.ocf Source14: baselibs.conf @@ -100,6 +98,8 @@ Patch88: clvmd-Avoid-a-3-way-deadlock-in-dead-client-cleanup.patch Patch89: 0001-clvmd-avoid-logging-in-signal-handler.patch +# Never upstream +Patch90: cmirrord_remove_date_time_from_compilation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Not a real replacement but we drop evms Provides: evms = 2.5.5 @@ -153,6 +153,7 @@ %patch87 -p1 %patch88 -p1 %patch89 -p1 +%patch90 -p1 %build #set path so that thin_check can be found @@ -193,10 +194,6 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/metadata install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/lvm mkdir -p $RPM_BUILD_ROOT/etc/init.d -#install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d -install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-lvm2.sh -install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-lvm2.sh install -m755 -D %{S:8} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/clvmd install -m755 -D %{S:10} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/cmirrord @@ -227,11 +224,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/share rm $RPM_BUILD_ROOT/etc/lvm/cache/.cache -# these files are put into their own devel package -##remove lvm-devel parts -#rm -f $RPM_BUILD_ROOT/usr/include/lvm2cmd.h -#rm -f $RPM_BUILD_ROOT/usr/include/lvm2app.h -#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/lvm2app.pc #remove device-mapper man page rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/dm* #remove device-mapper systemd events @@ -249,16 +241,18 @@ %post /sbin/ldconfig -[ -x /sbin/mkinitrd ] && /sbin/mkinitrd +%{?regenerate_initrd_post} %service_add_post blk-availability.service lvm2-monitor.service %service_add_post lvm2-lvmetad.socket +%posttrans +%{?regenerate_initrd_posttrans} + %preun %service_del_preun blk-availability.service lvm2-monitor.service lvm2-lvmetad.service lvm2-lvmetad.socket %postun /sbin/ldconfig -[ -x /sbin/mkinitrd ] && /sbin/mkinitrd %service_del_postun lvm2-lvmetad.service %files @@ -268,8 +262,6 @@ %dir /etc/lvm/backup %dir /etc/lvm/archive %dir /etc/lvm/metadata -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts %{_udevdir}/rules.d/11-dm-lvm.rules %{_udevdir}/rules.d/69-dm-lvm-metad.rules %{_unitdir}/blk-availability.service @@ -278,8 +270,6 @@ %{_unitdir}/lvm2-lvmetad.service %{_tmpfilesdir}/lvm2.conf %config /etc/lvm/lvm.conf -/lib/mkinitrd/scripts/setup-lvm2.sh -/lib/mkinitrd/scripts/boot-lvm2.sh /usr/lib/systemd/system-generators/lvm2-activation-generator /sbin/blkdeactivate /sbin/fsadm ++++++ cmirrord_remove_date_time_from_compilation.patch ++++++ cmirrord: Do not compile in Data and Time to avoid build retriggering in obs Signed-off-by: Thomas Renninger <tr...@suse.de> Index: LVM2.2.02.98/daemons/cmirrord/clogd.c =================================================================== --- LVM2.2.02.98.orig/daemons/cmirrord/clogd.c +++ LVM2.2.02.98/daemons/cmirrord/clogd.c @@ -42,7 +42,6 @@ int main(int argc __attribute__((unused) kill(getppid(), SIGTERM); LOG_PRINT("Starting cmirrord:"); - LOG_PRINT(" Built: "__DATE__" "__TIME__"\n"); LOG_DBG(" Compiled with debugging."); while (!exit_now) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
