summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-02-05 02:32:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-12 14:04:31 +0000
commitf6923fcc9c816ae4238bffe9a12641c26e1685ac (patch)
treef03acde098dfbc10b4fa5efe946da94fd9d1577b /meta
parentb10556c69436a14e704f64e493f115c724bf8ea3 (diff)
downloadpoky-f6923fcc9c816ae4238bffe9a12641c26e1685ac.tar.gz
util-linux: move /etc/default/mountall into -mount subpackage
This should probably be there and now the main package is a real meta-package only. [YOCTO #13058] (From OE-Core rev: e38c06db5be8c15c0764e3450d3ef9e43911bf8c) Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 5e40698644..bbb28c3da0 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -46,7 +46,7 @@ python util_linux_binpackages () {
46 do_split_packages(d, root=dir, 46 do_split_packages(d, root=dir,
47 file_regex=r'(.*)', output_pattern='${PN}-%s', 47 file_regex=r'(.*)', output_pattern='${PN}-%s',
48 description='${PN} %s', 48 description='${PN} %s',
49 hook=pkg_hook, extra_depends='', prepend=True) 49 hook=pkg_hook, extra_depends='')
50 50
51 # There are some symlinks for some binaries which we have ignored 51 # There are some symlinks for some binaries which we have ignored
52 # above. Add them to the package owning the binary they are 52 # above. Add them to the package owning the binary they are
@@ -110,10 +110,13 @@ PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-pytho
110# Readline support 110# Readline support
111PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" 111PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
112 112
113ALLOW_EMPTY_${PN} = "1"
114FILES_${PN} = ""
113FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" 115FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
114 116
115FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" 117FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la"
116 118
119FILES_${PN}-mount = "${sysconfdir}/default/mountall"
117FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" 120FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*"
118FILES_util-linux-su = "${sysconfdir}/pam.d/su-l" 121FILES_util-linux-su = "${sysconfdir}/pam.d/su-l"
119CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" 122CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l"