fix typo in posttrans script [release 055-3mamba;Tue Aug 10 2021]

dracut-055-bluetooth-lib64-fix.patch

@@ -0,0 +1,22 @@
+--- dracut-055/modules.d/62bluetooth/module-setup.sh.orig	2021-08-10 11:21:17.707996124 +0200
++++ dracut-055/modules.d/62bluetooth/module-setup.sh	2021-08-10 11:21:41.875402132 +0200
+@@ -5,7 +5,7 @@
+ # Prerequisite check(s) for module.
+ check() {
+     # If the binary(s) requirements are not fulfilled the module can't be installed
+-    require_any_binary /usr/lib/bluetooth/bluetoothd /usr/libexec/bluetooth/bluetoothd || return 1
++    require_any_binary /usr/lib64/bluetooth/bluetoothd /usr/libexec64/bluetooth/bluetoothd || return 1
+ 
+     if [[ $hostonly ]]; then
+         # Include by default if a Peripheral (0x500) is found of minor class:
+@@ -61,8 +61,8 @@
+         bluetoothctl
+ 
+     inst_multiple -o \
+-        /usr/libexec/bluetooth/bluetoothd \
+-        /usr/lib/bluetooth/bluetoothd
++        /usr/libexec64/bluetooth/bluetoothd \
++        /usr/lib64/bluetooth/bluetoothd
+ 
+     if [[ $hostonly ]]; then
+         var_lib_files=("$dracutsysrootdir"/var/lib/bluetooth/**)

dracut.spec

@@ -1,12 +1,12 @@
 Name:          dracut
-Version:       053
+Version:       055
-Release:       2mamba
+Release:       3mamba
 Summary:       Generic, modular initramfs generation tool that can be used across various distributions
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           https://sourceforge.net/apps/trac/dracut/
+URL:           https://sourceforge.net/projects/dracut/
 #Source:        http://ftp.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
 Source:        https://github.com/dracutdevs/dracut.git/%{version}/dracut-%{version}.tar.bz2
 Source1:       dracut-openmamba.conf
@@ -26,10 +26,10 @@ Patch21:       dracut-040-dmsetup_fix_path.patch
 Patch22:       dracut-040-add_systemd_journald_socket.patch
 Patch23:       dracut-044-bash-4.4.patch
 Patch24:       dracut-049-squash-live-systemd-240.patch
+Patch25:       dracut-055-bluetooth-lib64-fix.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: ldconfig
 BuildRequires: libkmod-devel
 ## AUTOBUILDREQ-END
 BuildRequires: %{_bindir}/xsltproc
@@ -83,11 +83,12 @@ Requires:      pkg-config
 Requires:      ntfs-3g
 Requires:      rng-tools
 Provides:      mkinitramfs
-Obsoletes:     mkinitramfs
+Obsoletes:     mkinitramfs < 054
 Requires:      dmraid
 Requires:      nvme-cli
 Requires:      memstrack
 Requires:      multipath-tools
+Requires:      squashfs
 
 %description
 Dracut is a generic, modular initramfs generation tool that can be used across various distributions.
@@ -108,11 +109,14 @@ This package conatins extra optional modules for dracut.
 
 %prep
 %setup -q
-%patch6 -p1
+#%patch6 -p1
-%patch8 -p1
+#%patch8 -p1
-%patch10 -p1
+#%patch10 -p1
-#%patch16 -p1
 %patch21 -p1
+%ifarch x86_64 aarch64
+%patch25 -p1
+%endif
+
 #chmod +x modules.d/99squash-live/*
 
 # remove *.orig files created by patched to prevent from being installed
@@ -140,7 +144,7 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/openmamba-logo.png
 # compatibility symlinks
 install -d -m0755 %{buildroot}%{_sbindir}
 ln -s ../bin/dracut %{buildroot}%{_sbindir}/dracut
-ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd
+ln -s ../bin/dracut %{buildroot}%{_sbindir}/mkinitrd
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -150,8 +154,8 @@ if [ $1 -ge 1 ]; then
    KVER=`uname -r`
    INITRAMFS=/boot/initramfs-$KVER.img
    if [ -e /boot/vmlinuz-$KVER ]; then
-      [ -e $INITRAMFS -a ${_sysconfdir}/dracut.conf -nt $INITRAMFS ] || continue
+      [ -e $INITRAMFS -a %{_sysconfdir}/dracut.conf -nt $INITRAMFS ] || continue
-      mkinitrd $INITRAMFS $KVER -f -q
+      dracut $INITRAMFS $KVER -H -f -q
    fi
 fi
 :
@@ -162,7 +166,7 @@ fi
 %{_sysconfdir}/dracut.conf.d/openmamba.conf
 %{_bindir}/dracut
 %{_bindir}/lsinitrd
-%{_bindir}/mkinitrd
+%{_sbindir}/mkinitrd
 %{_bindir}/dracut-catimages
 #%{_bindir}/dracut-install
 %{_sbindir}/dracut
@@ -174,6 +178,7 @@ fi
 %{_prefix}/lib/dracut/dracut-init.sh
 %{_prefix}/lib/dracut/dracut-install
 %{_prefix}/lib/dracut/dracut-logger.sh
+%{_prefix}/lib/dracut/dracut-util
 %{_prefix}/lib/dracut/dracut-version.sh
 %{_prefix}/lib/dracut/skipcpio
 %dir %{_prefix}/lib/dracut/modules.d
@@ -183,28 +188,14 @@ fi
 %{_prefix}/lib/dracut/modules.d/00dash/*
 %dir %{_prefix}/lib/dracut/modules.d/00systemd
 %{_prefix}/lib/dracut/modules.d/00systemd/*
+%dir %{_prefix}/lib/dracut/modules.d/00systemd-network-management
+%{_prefix}/lib/dracut/modules.d/00systemd-network-management/*
 %dir %{_prefix}/lib/dracut/modules.d/00warpclock
 %{_prefix}/lib/dracut/modules.d/00warpclock/*
-%dir %{_prefix}/lib/dracut/modules.d/01systemd-ask-password
+%dir %{_prefix}/lib/dracut/modules.d/01systemd-*
-%{_prefix}/lib/dracut/modules.d/01systemd-ask-password/*
+%{_prefix}/lib/dracut/modules.d/01systemd-*/*
-%dir %{_prefix}/lib/dracut/modules.d/01systemd-coredump
-%{_prefix}/lib/dracut/modules.d/01systemd-coredump/*
-%dir %{_prefix}/lib/dracut/modules.d/01systemd-modules-load
-%{_prefix}/lib/dracut/modules.d/01systemd-modules-load/*
-%dir %{_prefix}/lib/dracut/modules.d/01systemd-repart
-%{_prefix}/lib/dracut/modules.d/01systemd-repart/*
-%dir %{_prefix}/lib/dracut/modules.d/01systemd-sysctl
-%{_prefix}/lib/dracut/modules.d/01systemd-sysctl/*
-%dir %{_prefix}/lib/dracut/modules.d/01systemd-sysusers
-%{_prefix}/lib/dracut/modules.d/01systemd-sysusers/*
-%dir %{_prefix}/lib/dracut/modules.d/01systemd-initrd
-%{_prefix}/lib/dracut/modules.d/01systemd-initrd/*
-%dir %{_prefix}/lib/dracut/modules.d/02systemd-networkd
-%{_prefix}/lib/dracut/modules.d/02systemd-networkd/*
 %dir %{_prefix}/lib/dracut/modules.d/01fips
 %{_prefix}/lib/dracut/modules.d/01fips/*
-#%dir %{_prefix}/lib/dracut/modules.d/02fips-aesni
-#%{_prefix}/lib/dracut/modules.d/02fips-aesni/*
 %dir %{_prefix}/lib/dracut/modules.d/03rescue
 %dir %{_prefix}/lib/dracut/modules.d/03modsign
 %{_prefix}/lib/dracut/modules.d/03modsign/*
@@ -235,6 +226,8 @@ fi
 %{_prefix}/lib/dracut/modules.d/50drm/*
 %dir %{_prefix}/lib/dracut/modules.d/50plymouth
 %{_prefix}/lib/dracut/modules.d/50plymouth/*
+%dir %{_prefix}/lib/dracut/modules.d/62bluetooth
+%{_prefix}/lib/dracut/modules.d/62bluetooth/*
 %dir %{_prefix}/lib/dracut/modules.d/80cms
 %{_prefix}/lib/dracut/modules.d/80cms/*
 %dir %{_prefix}/lib/dracut/modules.d/80lvmmerge
@@ -280,9 +273,9 @@ fi
 %dir %{_prefix}/lib/dracut/modules.d/91crypt-gpg
 %{_prefix}/lib/dracut/modules.d/91crypt-gpg/*
 %dir %{_prefix}/lib/dracut/modules.d/91crypt-loop
+%{_prefix}/lib/dracut/modules.d/91crypt-loop/*
 %dir %{_prefix}/lib/dracut/modules.d/91zipl
 %{_prefix}/lib/dracut/modules.d/91zipl/*
-%{_prefix}/lib/dracut/modules.d/91crypt-loop/*
 %dir %{_prefix}/lib/dracut/modules.d/95cifs
 %{_prefix}/lib/dracut/modules.d/95cifs/*
 %dir %{_prefix}/lib/dracut/modules.d/95dasd
@@ -391,8 +384,8 @@ fi
 %{_mandir}/man8/dracut-pre-trigger.service.8*
 %{_mandir}/man8/dracut-pre-udev.service.8*
 %{_mandir}/man8/dracut-shutdown.service.8*
-%{_mandir}/man8/mkinitrd.8*
+#%{_mandir}/man8/mkinitrd.8*
-%{_mandir}/man8/mkinitrd-suse.8*
+#%{_mandir}/man8/mkinitrd-suse.8*
 %{_mandir}/man8/dracut.8*
 %doc AUTHORS COPYING
 
@@ -420,11 +413,28 @@ fi
 %{_prefix}/lib/dracut/modules.d/50gensplash/*
 #%dir %{_prefix}/lib/dracut/modules.d/90stratis
 #%{_prefix}/lib/dracut/modules.d/90stratis/*
+%dir %{_prefix}/lib/dracut/modules.d/91tpm2-tss
+%{_prefix}/lib/dracut/modules.d/91tpm2-tss/*
 %dir %{_prefix}/lib/dracut/modules.d/97biosdevname
 %{_prefix}/lib/dracut/modules.d/97biosdevname/*
 #%doc NEWS README README.generic README.kernel README.modules TODO
 
 %changelog
+* Tue Aug 10 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 055-3mamba
+- fix typo in posttrans script
+
+* Tue Aug 10 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 055-2mamba
+- bluetooth: fix libdir search for 64 bit platforms; tpm: move to modules-extras
+
+* Fri May 28 2021 Automatic Build System <autodist@mambasoft.it> 055-1mamba
+- automatic version update by autodist
+
+* Tue May 25 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 054-2mamba
+- provide mkinitrd as symlink to dracut since mkinitrd has been removed
+
+* Mon May 24 2021 Automatic Build System <autodist@mambasoft.it> 054-1mamba
+- automatic version update by autodist
+
 * Sat Mar 06 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 053-2mamba
 - move dbus-broker module to extras subpackage