mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
klibc: refactor runtime deps for shared utils
rebased after d.expand / bb.data.expand change Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
parent
8e489120f9
commit
de40d9357d
|
|
@ -1,8 +1,7 @@
|
|||
KLIBC_UTILS_VARIANT ?= "shared"
|
||||
KLIBC_UTILS_PKGNAME ?= "klibc-utils"
|
||||
|
||||
# modprobe and losetup go to ${base_sbindir}
|
||||
# even though debian packages all in /usr/lib/klibc/bin
|
||||
# losetup goes in ${base_sbindir}
|
||||
|
||||
do_install_append() {
|
||||
|
||||
|
|
@ -56,49 +55,15 @@ do_install_append() {
|
|||
ln -s gzip ${D}${base_bindir}/zcat
|
||||
}
|
||||
|
||||
RDEPENDS_klibc-utils-cat = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-chroot = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-cpio = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-dd = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-dmesg = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-false = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-fstype = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-gzip = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-halt = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-ipconfig = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-kill = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-kinit.shared = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-ln = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-losetup = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-ls = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-minips = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-mkdir = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-mkfifo = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-mknod = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-mount = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-mv = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-nfsmount = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-nuke = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-pivot-root = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-poweroff = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-readlink = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-reboot = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-resume = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-run-init = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-sh.shared = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-sleep = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-sync = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-true = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-umount = "${THIS_LIBKLIBC}"
|
||||
RDEPENDS_klibc-utils-uname = "${THIS_LIBKLIBC}"
|
||||
EXTRA_KLIBC_DEPS = '${@base_conditional("KLIBC_UTILS_VARIANT", "shared", "${THIS_LIBKLIBC}", "", d)}'
|
||||
|
||||
PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
|
||||
base_bin_dir = d.expand('${base_bindir}')
|
||||
do_split_packages(d, base_bin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='', allow_links=True, allow_dirs=True)
|
||||
do_split_packages(d, base_bin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='${EXTRA_KLIBC_DEPS}', allow_links=True, allow_dirs=True)
|
||||
|
||||
base_sbin_dir = d.expand('${base_sbindir}')
|
||||
do_split_packages(d, base_sbin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='', allow_dirs=True)
|
||||
do_split_packages(d, base_sbin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='${EXTRA_KLIBC_DEPS}', allow_dirs=True)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8
|
|||
# debugsources.list: No such file or directory:
|
||||
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
|
||||
|
||||
INC_PR = "r0"
|
||||
INC_PR = "r1"
|
||||
|
||||
KLIBC_ARCH = '${TARGET_ARCH}'
|
||||
KLIBC_ARCH_armeb = 'arm'
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user