From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0559E138334 for ; Wed, 10 Jul 2019 19:18:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F519E0899; Wed, 10 Jul 2019 19:18:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9267E089A for ; Wed, 10 Jul 2019 19:18:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA536347660 for ; Wed, 10 Jul 2019 19:18:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74F7C6DC for ; Wed, 10 Jul 2019 19:18:32 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1562786300.2d3ac449e2125b58ca0d946ad21b8173054b446e.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/systemd-242-r6.ebuild sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 2d3ac449e2125b58ca0d946ad21b8173054b446e X-VCS-Branch: master Date: Wed, 10 Jul 2019 19:18:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d3e9e74-1f78-4c0a-adf7-98bb2c89cf7c X-Archives-Hash: f78df823366b316a1f18ea40ce52869c commit: 2d3ac449e2125b58ca0d946ad21b8173054b446e Author: Mike Gilbert gentoo org> AuthorDate: Wed Jul 10 19:06:03 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Jul 10 19:18:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3ac449 sys-apps/systemd: update keepdir list Closes: https://bugs.gentoo.org/678758 Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/systemd/systemd-242-r6.ebuild | 9 +++++++-- sys-apps/systemd/systemd-9999.ebuild | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild index e6f4be93ba1..15408cfe976 100644 --- a/sys-apps/systemd/systemd-242-r6.ebuild +++ b/sys-apps/systemd/systemd-242-r6.ebuild @@ -343,9 +343,14 @@ multilib_src_install_all() { # Preserve empty dirs in /etc & /var, bug #437008 keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} - keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd + keepdir /etc/kernel/install.d + keepdir /etc/systemd/{network,user} keepdir /etc/udev/{hwdb.d,rules.d} - keepdir /var/log/journal/remote + keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} + keepdir /usr/lib/{binfmt.d,modules-load.d} + keepdir /usr/lib/systemd/user-generators + keepdir /var/lib/systemd + rm -rf "${ED}"/var/log || die # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 7c9a8cf9116..7769725c2c2 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -336,9 +336,14 @@ multilib_src_install_all() { # Preserve empty dirs in /etc & /var, bug #437008 keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} - keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd + keepdir /etc/kernel/install.d + keepdir /etc/systemd/{network,user} keepdir /etc/udev/{hwdb.d,rules.d} - keepdir /var/log/journal/remote + keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} + keepdir /usr/lib/{binfmt.d,modules-load.d} + keepdir /usr/lib/systemd/user-generators + keepdir /var/lib/systemd + rm -rf "${ED}"/var/log || die # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf