From 6d75e23d2360e653560720def23d3b6a3c37c20c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 17 Oct 2009 03:12:48 +0200 Subject: [PATCH] Mark some packages with "keep_empty_dirs". --HG-- extra : convert_revision : c2a57aa96032764a4a06892d0358c747e36367df --- templates/OpenRC/template | 1 + templates/PolicyKit/devel.template | 1 - templates/PolicyKit/template | 1 + templates/anacron/template | 1 + templates/cronie/template | 1 + templates/dbus/template | 1 + templates/hal/template | 1 + templates/initramfs-tools/template | 1 + templates/lvm2/template | 1 + templates/openssh/server.template | 3 ++- templates/openssh/template | 1 - templates/util-linux-ng/template | 3 +++ templates/xbps-base-files/template | 1 + templates/xbps-casper/template | 1 + 14 files changed, 15 insertions(+), 3 deletions(-) diff --git a/templates/OpenRC/template b/templates/OpenRC/template index 7b194c1a42..e2a682614d 100644 --- a/templates/OpenRC/template +++ b/templates/OpenRC/template @@ -16,6 +16,7 @@ long_desc=" Gentoo Portage Tree. OpenRC also provides an init script that runs BSD rc.d style scripts too, making it easy to port your BSD system to OpenRC." +keep_empty_dirs=yes conf_files="/etc/rc.conf /etc/conf.d/bootmisc /etc/conf.d/consolefont /etc/conf.d/dmesg /etc/conf.d/fsck /etc/conf.d/hostname /etc/conf.d/hwclock /etc/conf.d/keymaps /etc/conf.d/local /etc/conf.d/locale diff --git a/templates/PolicyKit/devel.template b/templates/PolicyKit/devel.template index 058ebff538..ec38d639f7 100644 --- a/templates/PolicyKit/devel.template +++ b/templates/PolicyKit/devel.template @@ -12,6 +12,5 @@ do_install() mkdir -p ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib } diff --git a/templates/PolicyKit/template b/templates/PolicyKit/template index 8c89a7c816..5d94496df0 100644 --- a/templates/PolicyKit/template +++ b/templates/PolicyKit/template @@ -15,6 +15,7 @@ long_desc=" conf_files="/etc/PolicyKit/PolicyKit.conf /etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf" +keep_empty_dirs=yes subpackages="devel" Add_dependency full glibc Add_dependency full dbus diff --git a/templates/anacron/template b/templates/anacron/template index 6da87aa307..83f215cdec 100644 --- a/templates/anacron/template +++ b/templates/anacron/template @@ -17,6 +17,7 @@ long_desc=" properly, Anacron will make sure that the commands are run at the specified intervals as closely as machine-uptime permits." +keep_empty_dirs=yes openrc_services="anacrond default" Add_dependency full glibc diff --git a/templates/cronie/template b/templates/cronie/template index c56b71dfc9..2ef3f33bfa 100644 --- a/templates/cronie/template +++ b/templates/cronie/template @@ -15,6 +15,7 @@ long_desc=" has security and configuration enhancements like the ability to use PAM and SELinux." +keep_empty_dirs=yes conf_files="/etc/crontab" openrc_services="crond default" diff --git a/templates/dbus/template b/templates/dbus/template index f1734c2e08..6864a157d7 100644 --- a/templates/dbus/template +++ b/templates/dbus/template @@ -21,6 +21,7 @@ long_desc=" supports a method call mapping for its messages, but it is not required; this makes using the system quite simple." +keep_empty_dirs=yes conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" subpackages="devel libs" openrc_services="dbus default" diff --git a/templates/hal/template b/templates/hal/template index d267e25299..6b208ee2e5 100644 --- a/templates/hal/template +++ b/templates/hal/template @@ -14,6 +14,7 @@ long_desc=" HAL is daemon for collecting and maintaining information from several sources about the hardware on the system." +keep_empty_dirs=yes conf_files="/etc/dbus-1/system.d/hal.conf /etc/hal/fdi/policy/10-keymap.fdi" openrc_services="hal default" diff --git a/templates/initramfs-tools/template b/templates/initramfs-tools/template index ee04dd3866..1c89ec958c 100644 --- a/templates/initramfs-tools/template +++ b/templates/initramfs-tools/template @@ -17,6 +17,7 @@ long_desc=" no_extract=yes noarch=yes +keep_empty_dirs=yes triggers="initramfs-tools" conf_files="/etc/$pkgname/initramfs.conf /etc/$pkgname/update-initramfs.conf /etc/$pkgname/modules" diff --git a/templates/lvm2/template b/templates/lvm2/template index dce22d67ce..8bcbb6d8c2 100644 --- a/templates/lvm2/template +++ b/templates/lvm2/template @@ -23,6 +23,7 @@ long_desc=" (kind of logical partitions) in volume groups." disable_parallel_build=yes +keep_empty_dirs=yes subpackages="device-mapper" conf_files="/etc/lvm/lvm.conf" triggers="initramfs-tools" diff --git a/templates/openssh/server.template b/templates/openssh/server.template index 12eca68c24..c81ff66a5b 100644 --- a/templates/openssh/server.template +++ b/templates/openssh/server.template @@ -5,6 +5,7 @@ long_desc="${long_desc} This package contains the ${pkgname} server files." +keep_empty_dirs=yes conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd" openrc_services="sshd default" @@ -33,5 +34,5 @@ do_install() done mv ${SRCPKGDESTDIR}/etc/pam.d ${DESTDIR}/etc mv ${SRCPKGDESTDIR}/etc/init.d ${DESTDIR}/etc - mv ${SRCPKGDESTDIR}/var ${DESTDIR} + mkdir -p ${DESTDIR}/var/chroot/ssh } diff --git a/templates/openssh/template b/templates/openssh/template index fa4792c376..d4f6515d47 100644 --- a/templates/openssh/template +++ b/templates/openssh/template @@ -28,7 +28,6 @@ long_desc=" install openssh-client, openssh-server, or both." conf_files="/etc/ssh/moduli" - subpackages="client server" Add_dependency full glibc diff --git a/templates/util-linux-ng/template b/templates/util-linux-ng/template index 622432a9ee..0e911c281f 100644 --- a/templates/util-linux-ng/template +++ b/templates/util-linux-ng/template @@ -13,6 +13,9 @@ long_desc=" them are utilities for handling file systems, consoles, partitions, and messages." +# Required by /var/lib/hwclock +keep_empty_dirs=yes + Add_dependency full glibc Add_dependency full coreutils Add_dependency full zlib diff --git a/templates/xbps-base-files/template b/templates/xbps-base-files/template index b5f2d7417a..b1da6c9c4a 100644 --- a/templates/xbps-base-files/template +++ b/templates/xbps-base-files/template @@ -9,6 +9,7 @@ long_desc=" aren't installed by any other package and are required on any GNU/Linux system." +keep_empty_dirs=yes base_chroot=yes noarch=yes diff --git a/templates/xbps-casper/template b/templates/xbps-casper/template index ac17d9fb42..e5b43df7a3 100644 --- a/templates/xbps-casper/template +++ b/templates/xbps-casper/template @@ -11,6 +11,7 @@ long_desc=" noextract=yes noarch=yes +keep_empty_dirs=yes conf_files="/etc/casper.conf" Add_dependency full initramfs-tools