From 1ba46a20328eb8df7e4c13d982114f75a8ea1013 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 6 Aug 2013 15:36:32 +0300 Subject: [PATCH 1/2] tmpfiles.d/*: clean up "age".. --- .../network/connman/tmpfiles.d/21_connman.conf | 6 +++--- packages/network/openssh/tmpfiles.d/51_sshd.conf | 2 +- .../security/polkit/tmpfiles.d/34_polkit.conf | 12 ++++++------ .../sysutils/busybox/tmpfiles.d/02_busybox.conf | 16 ++++++++-------- packages/sysutils/dbus/tmpfiles.d/14_dbus.conf | 4 ++-- .../atvclient/tmpfiles.d/63_atvclient.conf | 2 +- .../eventlircd/tmpfiles.d/62_eventlircd.conf | 2 +- .../remote/irserver/tmpfiles.d/63_irserver.conf | 2 +- .../sysutils/remote/lirc/tmpfiles.d/61_lirc.conf | 2 +- .../sysutils/udisks/tmpfiles.d/31_udisks.conf | 2 +- .../sysutils/upower/tmpfiles.d/32_upower.conf | 2 +- .../xorg-server/tmpfiles.d/xorg-server.conf | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/network/connman/tmpfiles.d/21_connman.conf b/packages/network/connman/tmpfiles.d/21_connman.conf index 7383b3da93..a5d25d97e8 100644 --- a/packages/network/connman/tmpfiles.d/21_connman.conf +++ b/packages/network/connman/tmpfiles.d/21_connman.conf @@ -18,6 +18,6 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /run/connman 0755 root root 10d - -d /storage/.cache/connman 0755 root root 10d - -d /storage/.config/vpn-config 0755 root root 10d - +d /run/connman 0755 root root - - +d /storage/.cache/connman 0755 root root - - +d /storage/.config/vpn-config 0755 root root - - diff --git a/packages/network/openssh/tmpfiles.d/51_sshd.conf b/packages/network/openssh/tmpfiles.d/51_sshd.conf index 22664d4584..2a208a7829 100644 --- a/packages/network/openssh/tmpfiles.d/51_sshd.conf +++ b/packages/network/openssh/tmpfiles.d/51_sshd.conf @@ -18,6 +18,6 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/empty 0600 root root 10d - +d /var/empty 0600 root root - - d /storage/.cache/ssh 0755 root root - - d /storage/.ssh 0700 root root - - diff --git a/packages/security/polkit/tmpfiles.d/34_polkit.conf b/packages/security/polkit/tmpfiles.d/34_polkit.conf index 127a9bcb83..c006a7ce4c 100644 --- a/packages/security/polkit/tmpfiles.d/34_polkit.conf +++ b/packages/security/polkit/tmpfiles.d/34_polkit.conf @@ -18,9 +18,9 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/lib/polkit-1 0700 root root 10d - -d /var/lib/polkit-1/localauthority/10-vendor.d 0755 root root 10d - -d /var/lib/polkit-1/localauthority/20-org.d 0755 root root 10d - -d /var/lib/polkit-1/localauthority/30-site.d 0755 root root 10d - -d /var/lib/polkit-1/localauthority/50-local.d 0755 root root 10d - -d /var/lib/polkit-1/localauthority/90-mandatory.d 0755 root root 10d - +d /var/lib/polkit-1 0700 root root - - +d /var/lib/polkit-1/localauthority/10-vendor.d 0755 root root - - +d /var/lib/polkit-1/localauthority/20-org.d 0755 root root - - +d /var/lib/polkit-1/localauthority/30-site.d 0755 root root - - +d /var/lib/polkit-1/localauthority/50-local.d 0755 root root - - +d /var/lib/polkit-1/localauthority/90-mandatory.d 0755 root root - - diff --git a/packages/sysutils/busybox/tmpfiles.d/02_busybox.conf b/packages/sysutils/busybox/tmpfiles.d/02_busybox.conf index 2d1b051c58..281eb319be 100644 --- a/packages/sysutils/busybox/tmpfiles.d/02_busybox.conf +++ b/packages/sysutils/busybox/tmpfiles.d/02_busybox.conf @@ -18,12 +18,12 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/cache 0755 root root 10d - -d /var/lib 0755 root root 10d - -d /var/lock 0755 root root 10d - -d /var/media 0755 root root 10d - -d /var/run 1777 root root 10d - -d /var/tmp 1777 root root 10d - +d /var/cache 0755 root root - - +d /var/lib 0755 root root - - +d /var/lock 0755 root root - - +d /var/media 0755 root root - - +d /var/run 1777 root root - - +d /var/tmp 1777 root root - - -f /var/run/utmp 1777 root root 10d - -f /var/log/wtmp 1777 root root 10d - +f /var/run/utmp 1777 root root - - +f /var/log/wtmp 1777 root root - - diff --git a/packages/sysutils/dbus/tmpfiles.d/14_dbus.conf b/packages/sysutils/dbus/tmpfiles.d/14_dbus.conf index 3a620aec44..1bd1272f5a 100644 --- a/packages/sysutils/dbus/tmpfiles.d/14_dbus.conf +++ b/packages/sysutils/dbus/tmpfiles.d/14_dbus.conf @@ -18,7 +18,7 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/lib/dbus 0755 root root 10d - -d /var/run/dbus 0755 root root 10d - +d /var/lib/dbus 0755 root root - - +d /var/run/dbus 0755 root root - - L /var/lib/dbus/machine-id - - - - /etc/machine-id diff --git a/packages/sysutils/remote/atvclient/tmpfiles.d/63_atvclient.conf b/packages/sysutils/remote/atvclient/tmpfiles.d/63_atvclient.conf index 66ef20dd4a..363e7605f1 100644 --- a/packages/sysutils/remote/atvclient/tmpfiles.d/63_atvclient.conf +++ b/packages/sysutils/remote/atvclient/tmpfiles.d/63_atvclient.conf @@ -18,4 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /storage/.cache 0755 root root 10d - +d /storage/.cache 0755 root root - - diff --git a/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf b/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf index f857190c06..d5cb376b07 100644 --- a/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf +++ b/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf @@ -18,4 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/run/lirc 0755 root root 10d - +d /var/run/lirc 0755 root root - - diff --git a/packages/sysutils/remote/irserver/tmpfiles.d/63_irserver.conf b/packages/sysutils/remote/irserver/tmpfiles.d/63_irserver.conf index f857190c06..d5cb376b07 100644 --- a/packages/sysutils/remote/irserver/tmpfiles.d/63_irserver.conf +++ b/packages/sysutils/remote/irserver/tmpfiles.d/63_irserver.conf @@ -18,4 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/run/lirc 0755 root root 10d - +d /var/run/lirc 0755 root root - - diff --git a/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf b/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf index f857190c06..d5cb376b07 100644 --- a/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf +++ b/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf @@ -18,4 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/run/lirc 0755 root root 10d - +d /var/run/lirc 0755 root root - - diff --git a/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf b/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf index 9178325697..fe79b7e0cd 100644 --- a/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf +++ b/packages/sysutils/udisks/tmpfiles.d/31_udisks.conf @@ -18,4 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/lib/udisks 0755 root root 10d - +d /var/lib/udisks 0755 root root - - diff --git a/packages/sysutils/upower/tmpfiles.d/32_upower.conf b/packages/sysutils/upower/tmpfiles.d/32_upower.conf index a9d84fdf9e..f38fa38838 100644 --- a/packages/sysutils/upower/tmpfiles.d/32_upower.conf +++ b/packages/sysutils/upower/tmpfiles.d/32_upower.conf @@ -18,4 +18,4 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/lib/upower 0755 root root 10d - +d /var/lib/upower 0755 root root - - diff --git a/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf b/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf index c82673c81f..ba39386809 100644 --- a/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf +++ b/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf @@ -18,5 +18,5 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -d /var/cache/xkb 0755 root root 10d - +d /var/cache/xkb 0755 root root - - d /var/lib 0755 root root - - From 1ece5d4a182eb45d44d7a8bd4a4b17ab6cf00ad3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 6 Aug 2013 15:41:32 +0300 Subject: [PATCH 2/2] fontconfig: add tmpfiles.d support --- .../x11/other/fontconfig/init.d/35_fontconfig | 1 - .../fontconfig/tmpfiles.d/35_fontconfig.conf | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/x11/other/fontconfig/tmpfiles.d/35_fontconfig.conf diff --git a/packages/x11/other/fontconfig/init.d/35_fontconfig b/packages/x11/other/fontconfig/init.d/35_fontconfig index 6b3ea3011c..8197696a8d 100644 --- a/packages/x11/other/fontconfig/init.d/35_fontconfig +++ b/packages/x11/other/fontconfig/init.d/35_fontconfig @@ -37,7 +37,6 @@ FC_CACHE_DIRS="/usr/share/fonts/ /usr/share/xbmc/media/Fonts/" ( progress "Creating fontconfig cache" if [ ! -f /storage/.cache/fontconfig/CACHEDIR.TAG ]; then - mkdir -p /storage/.cache/fontconfig fc-cache $FC_CACHE_DIRS fi )& diff --git a/packages/x11/other/fontconfig/tmpfiles.d/35_fontconfig.conf b/packages/x11/other/fontconfig/tmpfiles.d/35_fontconfig.conf new file mode 100644 index 0000000000..0baa588bbe --- /dev/null +++ b/packages/x11/other/fontconfig/tmpfiles.d/35_fontconfig.conf @@ -0,0 +1,21 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +d /storage/.cache/fontconfig 0755 root root - -