Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit btrfsprogs for openSUSE:Factory
Hello community,

here is the log from the commit of package btrfsprogs for openSUSE:Factory
checked in at 2019-04-04 12:02:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old)
and /work/SRC/openSUSE:Factory/.btrfsprogs.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "btrfsprogs"

Thu Apr 4 12:02:10 2019 rev:102 rq:690386 version:4.20.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2019-02-08
12:05:34.753645441 +0100
+++ /work/SRC/openSUSE:Factory/.btrfsprogs.new.3908/btrfsprogs.changes
2019-04-04 12:02:12.501352541 +0200
@@ -1,0 +2,7 @@
+Thu Mar 28 20:25:48 UTC 2019 - Mark Fasheh <mfasheh@xxxxxxxx>
+
+- Use correct path for dracut-fsck-help.txt in module-setup.sh (bsc#1122539)
+ * Remove module-setup.sh
+ * Add module-setup.sh.in
+
+-------------------------------------------------------------------

Old:
----
module-setup.sh

New:
----
module-setup.sh.in

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ btrfsprogs.spec ++++++
--- /var/tmp/diff_new_pack.kDDR2A/_old 2019-04-04 12:02:13.457353307 +0200
+++ /var/tmp/diff_new_pack.kDDR2A/_new 2019-04-04 12:02:13.461353310 +0200
@@ -44,7 +44,7 @@
Source:
https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v%{version}.tar.gz
# support for mkinitrd in < 13.1
Source1: boot-btrfs.sh
-Source2: module-setup.sh
+Source2: module-setup.sh.in
Source3: dracut-fsck-help.txt
Source4: setup-btrfs.sh
Source5: sles11-defaults.h
@@ -248,8 +248,10 @@
install -m 0755 -d %{buildroot}/%{_datadir}/bash-completion/completions
install -m 0644 btrfs-completion
%{buildroot}/%{_datadir}/bash-completion/completions/btrfs
%if 0%{?suse_version} > 1200
-install -m 0755 -D %{SOURCE2}
%{buildroot}/%{_dracutmodulesdir}/95suse-btrfs/module-setup.sh
-cp %{SOURCE3} .
+sed -e 's,@@INSTALLDIR@@,%{_datadir}/%{name}/,;' %{SOURCE2} > module-setup.sh
+install -m 0755 -D module-setup.sh
%{buildroot}/%{_dracutmodulesdir}/95suse-btrfs/module-setup.sh
+rm -f module-setup.sh
+install -m 0644 -D %{SOURCE3}
%{buildroot}/%{_datadir}/%{name}/dracut-fsck-help.txt
%endif

%if 0%{!?for_debugging:1}
@@ -291,8 +293,9 @@
%license COPYING
%endif
%if 0%{?suse_version} > 1200
-%doc dracut-fsck-help.txt
-%{_dracutmodulesdir}/95suse-btrfs/
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/dracut-fsck-help.txt
+%dir %{_dracutmodulesdir}/95suse-btrfs/
%{_dracutmodulesdir}/95suse-btrfs/module-setup.sh
%endif
/sbin/fsck.btrfs

++++++ module-setup.sh.in ++++++
#!/bin/bash

# called by dracut
check() {
return 0
}

# called by dracut
depends() {
return 0
}

# called by dracut
install() {
inst_fsck_help "btrfs" "@@INSTALLDIR@@/dracut-fsck-help.txt"
}


< Previous Next >
This Thread
  • No further messages