Page MenuHomeSolus
Files F11019663

D1638.diff
No OneTemporary
Actions

D1638.diff
View Options

diff --git a/files/rename-Ddebug-to--Ddebug-extra.patch b/files/rename-Ddebug-to--Ddebug-extra.patch
new file mode 100644
--- /dev/null
+++ b/files/rename-Ddebug-to--Ddebug-extra.patch
@@ -0,0 +1,40 @@
+From 1c04c791e85f9dd5e16ae846d0c0b0a99a47076e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sun, 19 Aug 2018 19:11:30 +0200
+Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
+
+Meson added -Doptimization and -Ddebug options, which obviously causes
+a conflict with our -Ddebug options. Let's rename it.
+
+Fixes #9883.
+---
+ meson.build | 2 +-
+ meson_options.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f79ac4b12e7..2209c935ad6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
+
+ enable_debug_hashmap = false
+ enable_debug_mmap_cache = false
+-foreach name : get_option('debug')
++foreach name : get_option('debug-extra')
+ if name == 'hashmap'
+ enable_debug_hashmap = true
+ elif name == 'mmap-cache'
+diff --git a/meson_options.txt b/meson_options.txt
+index e3140c8c110..7b1f61bf464 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
+ description : 'path to debug shell binary')
+ option('debug-tty', type : 'string', value : '/dev/tty9',
+ description : 'specify the tty device for debug shell')
+-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
+ description : 'enable extra debugging')
+ option('memory-accounting-default', type : 'boolean',
+ description : 'enable MemoryAccounting= by default')
diff --git a/files/series b/files/series
--- a/files/series
+++ b/files/series
@@ -1,3 +1,4 @@
+rename-Ddebug-to--Ddebug-extra.patch
0001-login-Ensure-display-manager-can-reboot-while-inhibi.patch
0002-systemctl-Don-t-emit-a-reload-warning-for-systemd-cr.patch
0003-gpt-boot-generator-Do-not-automount-the-ESP-on-Solus.patch
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,36 +1,34 @@
name : systemd
version : '239'
-release : 73
+release : 74
source :
- https://github.com/systemd/systemd/archive/v239.tar.gz : 8a11b1b07d620f4c06a16e95bba4dd2a97e90efdf2a5ba47ed0a935085787a14
license :
- LGPL-2.1-or-later
- GPL-2.0-or-later
-summary : System and Service Manager
component :
- system.base
- devel: system.devel
+summary : System and Service Manager
+description: |
+ systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux control groups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit.
builddeps :
- pkgconfig(libcryptsetup)
- pkgconfig(libkmod)
- pkgconfig32(blkid)
- pkgconfig32(dbus-1)
+ - pkgconfig32(glib-2.0)
- pkgconfig32(libcap)
- pkgconfig32(libcurl)
- - pkgconfig32(zlib)
- pkgconfig32(liblzma)
- pkgconfig32(mount)
- - pkgconfig32(glib-2.0)
- - libgcrypt-devel
- - attr-devel
- - acl-devel
- - attr-32bit-devel
+ - pkgconfig32(zlib)
- acl-32bit-devel
- - bzip2-devel
+ - attr-32bit-devel
- bzip2-32bit-devel
- docbook-xml
- - gperf
- gnu-efi-devel
+ - gperf
- libgcrypt-32bit-devel
- libgpg-error-32bit-devel
- pam-32bit-devel
@@ -46,8 +44,6 @@
optimize :
- size
- lto
-description: |
- systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux control groups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit.
setup : |
%apply_patches
if [[ ! -z "${EMUL32BUILD}" ]]; then
@@ -55,9 +51,8 @@
else
depends_emul32=true
fi
- %meson_configure --prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
+ %meson_configure --bindir /usr/bin \
+ --sbindir /usr/sbin \
-Drpmmacrosdir=no \
-Dpamlibdir=/lib/security \
-Dsplit-usr=true \
@@ -83,9 +78,9 @@
-Drootlibdir=%libdir% \
-Dusers-gid=100
build : |
- %meson_build
+ %ninja_build
install : |
- %meson_install
+ %ninja_install
# Solus is responsible for its own glibc + PAM configuration, *not* systemd..
rm -vrf $installdir/usr/share/factory/*
@@ -99,11 +94,11 @@
fi
# Install comapt dirs
- install -D -d -m 00755 $installdir/{sbin,bin,lib/udev}
+ install -d -m 00755 $installdir/{sbin,bin,lib/udev}
# Compat for old tools
ln -sv ../usr/bin/udevadm $installdir/sbin/udevadm
- ln -sv ../usr/lib/systemd/systemd-udevd $installdir/lib/udev/udevd
+ ln -sv /usr/lib/systemd/systemd-udevd $installdir/lib/udev/udevd
# Make sure systemd + init can be found
ln -sv ../usr/lib/systemd/systemd $installdir/bin/systemd
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>systemd</Name>
<Packager>
- <Name>Peter O&apos;Connor</Name>
- <Email>peter@solus-project.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>LGPL-2.1-or-later</License>
<License>GPL-2.0-or-later</License>
@@ -873,7 +873,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="73">systemd</Dependency>
+ <Dependency release="74">systemd</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libnss_myhostname.so.2</Path>
@@ -895,8 +895,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="73">systemd-devel</Dependency>
- <Dependency release="73">systemd-32bit</Dependency>
+ <Dependency release="74">systemd-devel</Dependency>
+ <Dependency release="74">systemd-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/lib32/pkgconfig/libsystemd.pc</Path>
@@ -910,7 +910,7 @@
</Description>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="73">systemd</Dependency>
+ <Dependency release="74">systemd</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/libudev.h</Path>
@@ -1419,12 +1419,12 @@
</Files>
</Package>
<History>
- <Update release="73">
- <Date>2018-09-21</Date>
+ <Update release="74">
+ <Date>2018-10-12</Date>
<Version>239</Version>
<Comment>Packaging update</Comment>
- <Name>Peter O&apos;Connor</Name>
- <Email>peter@solus-project.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 7, 9:51 PM (4 d, 2 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5792648
Default Alt Text
D1638.diff (7 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.