Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4ee786dc46e90bb1dfa48876dd7737782d8bafaa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4ee786dc46e90bb1dfa48876dd7737782d8bafaa)
  • Date: Mon, 23 May 2022 17:36:20 +0000

GIT changes to master grimoire by Florian Franzmann <bwlf AT bandrate.org>:

audio-drivers/pulseaudio/BUILD | 4
audio-drivers/pulseaudio/HISTORY | 3
disk/mdadm/HISTORY | 3
disk/mdadm/INSTALL | 4
disk/mdadm/systemd/mdadm.service | 25 +++++
utils/cpuid/0001-install-to-PREFIX-instead-of-BUILDROOT.patch | 45
----------
utils/cpuid/DETAILS | 4
utils/cpuid/HISTORY | 4
utils/cpuid/PRE_BUILD | 5 -
9 files changed, 44 insertions(+), 53 deletions(-)

New commits:
commit 4ee786dc46e90bb1dfa48876dd7737782d8bafaa
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

audio-drivers/pulseaudio: explicitly select database in BUILD

commit fcbeaeee5ad8c439be32fb12212947fd1c961197
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/mdadm: add files missing from previous commit

commit 2d519732de78b2a21ff7d00d16a5fc6160e7b456
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

utils/cpuid: version 20220224

diff --git a/audio-drivers/pulseaudio/BUILD b/audio-drivers/pulseaudio/BUILD
index e8f518d..5897d06 100755
--- a/audio-drivers/pulseaudio/BUILD
+++ b/audio-drivers/pulseaudio/BUILD
@@ -1,4 +1,8 @@
OPTS="${PULSEAUDIO_OPTS} ${OPTS}" &&
LDFLAGS="${LDFLAGS/-Wl,--as-needed}" &&

+if [[ "$PULSE_DB" == 'simple' ]]; then
+ OPTS+=" database=simple"
+fi &&
+
default_build
diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index e79396d..a685889 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,6 @@
+2022-05-23 Florian Franzmann <bwlf AT bandrate.org>
+ * BUILD: explicitly select the database if the user has chosen
'simple'
+
2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
* DEPENDS: add dependency on libsndfile, depend on fftw with
single-precision floats, use MESON_DEPENDS
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index bd566f8..4fcfd28 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2022-05-23 Florian Franzmann <bwlf AT bandrate.org>
+ * INSTALL, systemd: add missing file from previous change
+
2022-05-20 Florian Franzmann <bwlf AT bandrate.org>
* DEPENDS, INSTALL: optionally install systemd services

diff --git a/disk/mdadm/INSTALL b/disk/mdadm/INSTALL
index f0f41df..d15bf0f 100755
--- a/disk/mdadm/INSTALL
+++ b/disk/mdadm/INSTALL
@@ -1,7 +1,9 @@
default_install &&

if is_depends_enabled $SPELL systemd; then
- make DESTDIR="$INSTALL_ROOT" install-systemd
+ make DESTDIR="$INSTALL_ROOT" install-systemd &&
+ install -m644 -o root -g root "$SPELL_DIRECTORY"/systemd/mdadm.service \
+ "$INSTALL_ROOT"/lib/systemd/system/
fi &&

install -m 755 mdadm.static "${INSTALL_ROOT}/sbin/mdadm.static"
diff --git a/disk/mdadm/systemd/mdadm.service
b/disk/mdadm/systemd/mdadm.service
new file mode 100644
index 0000000..b4c5f7b
--- /dev/null
+++ b/disk/mdadm/systemd/mdadm.service
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Assemble Software-RAID Devices
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=local-fs.target shutdown.target
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
+
+[Install]
+WantedBy=local-fs.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/sbin/mdadm.static --assemble --scan
+TimeoutSec=0
diff --git a/utils/cpuid/0001-install-to-PREFIX-instead-of-BUILDROOT.patch
b/utils/cpuid/0001-install-to-PREFIX-instead-of-BUILDROOT.patch
deleted file mode 100644
index 997ce6f..0000000
--- a/utils/cpuid/0001-install-to-PREFIX-instead-of-BUILDROOT.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d11d0307aa14f601487e588cba218b777ad22bcb Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <Florian.Franzmann AT fau.de>
-Date: Wed, 4 Apr 2018 16:28:21 +0200
-Subject: [PATCH] install to PREFIX instead of BUILDROOT
-
----
- Makefile | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 933899b..7c402af 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,3 @@
--CFLAGS+=-g
- CPPFLAGS?=
- LDFLAGS?=
- ifneq (,$(findstring arch=i386,$(CFLAGS)))
-@@ -34,8 +33,6 @@ OTHER_BINS=$(PROG).man cpuinfo2cpuid.man
- REL_DIR=../$(shell date +%Y-%m-%d)
- WEB_DIR=/toad2/apps.mine/www/www/$(PROG)
-
--BUILDROOT=
--
- default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
-
- $(PROG): cpuid.c Makefile
-@@ -51,10 +48,10 @@ cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man
- gzip < $< > $@
-
- install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
-- install -D -s -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
-- install -D -m 444 $(PROG).man.gz
$(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-- install -D -m 755 cpuinfo2cpuid
$(BUILDROOT)/usr/bin/cpuinfo2cpuid
-- install -D -m 444 cpuinfo2cpuid.man.gz
$(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-+ install -D -s -m 755 $(PROG) $(PREFIX)/usr/bin/$(PROG)
-+ install -D -m 444 $(PROG).man.gz
$(PREFIX)/usr/share/man/man1/$(PROG).1.gz
-+ install -D -m 755 cpuinfo2cpuid
$(PREFIX)/usr/bin/cpuinfo2cpuid
-+ install -D -m 444 cpuinfo2cpuid.man.gz
$(PREFIX)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-
- clean:
- rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
---
-2.17.0
-
diff --git a/utils/cpuid/DETAILS b/utils/cpuid/DETAILS
index ed3f2c7..076fd0e 100755
--- a/utils/cpuid/DETAILS
+++ b/utils/cpuid/DETAILS
@@ -1,8 +1,8 @@
SPELL=cpuid
- VERSION=20170122
+ VERSION=20220224
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://www.etallen.com/${SPELL}/${SPELL}-${VERSION}.src.tar.gz
-
SOURCE_HASH=sha512:0e057980c71a0e078254e6b7535747bdf368278932c39943cf7dfafe08443af07297a2b41518499937a710fe6950ba89377cabaada5f6332932650d4d17c1430
+
SOURCE_HASH=sha512:7cf41d2429d442b4dfd5d369e394c11916352e16fc56852ea4af71945192903482bc45c38367ff5ae3f8d386ffc65cc61a9b0bec4594589a057557daf54d8562
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.etallen.com/cpuid.html";
LICENSE[0]=GPL
diff --git a/utils/cpuid/HISTORY b/utils/cpuid/HISTORY
index a1c64d1..8c2e95f 100644
--- a/utils/cpuid/HISTORY
+++ b/utils/cpuid/HISTORY
@@ -1,3 +1,7 @@
+2022-05-23 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 20220224
+ * PRE_BUILD, 0001-install-to-PREFIX-instead-of-BUILDROOT.patch:
removed
+
2018-04-04 Florian Franzmann <bwlf AT bandrate.org>
* 0001-install-to-PREFIX-instead-of-BUILDROOT.patch, BUILD, DETAILS,
INSTALL, PRE_BUILD: spell created
diff --git a/utils/cpuid/PRE_BUILD b/utils/cpuid/PRE_BUILD
deleted file mode 100755
index 44526e7..0000000
--- a/utils/cpuid/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 <
"$SPELL_DIRECTORY/0001-install-to-PREFIX-instead-of-BUILDROOT.patch"
-



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4ee786dc46e90bb1dfa48876dd7737782d8bafaa), Florian Franzmann, 05/23/2022

Archive powered by MHonArc 2.6.24.

Top of Page