summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2012-11-01 18:50:11 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-11-16 11:25:36 +0100
commitde40d9357d793cba0fd17cd46106ffd6b7fdc85f (patch)
tree861005bf44aff9ff50d4631732f1e8b11c79ff7a
parent8e489120f9c4ae91e121ae9d33fecc1aacdf3257 (diff)
downloadmeta-openembedded-de40d9357d793cba0fd17cd46106ffd6b7fdc85f.tar.gz
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>
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-utils.inc43
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc.inc2
2 files changed, 5 insertions, 40 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc
index 16cba8909..cdcaafa55 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc
+++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc
@@ -1,8 +1,7 @@
1KLIBC_UTILS_VARIANT ?= "shared" 1KLIBC_UTILS_VARIANT ?= "shared"
2KLIBC_UTILS_PKGNAME ?= "klibc-utils" 2KLIBC_UTILS_PKGNAME ?= "klibc-utils"
3 3
4# modprobe and losetup go to ${base_sbindir} 4# losetup goes in ${base_sbindir}
5# even though debian packages all in /usr/lib/klibc/bin
6 5
7do_install_append() { 6do_install_append() {
8 7
@@ -56,49 +55,15 @@ do_install_append() {
56 ln -s gzip ${D}${base_bindir}/zcat 55 ln -s gzip ${D}${base_bindir}/zcat
57} 56}
58 57
59RDEPENDS_klibc-utils-cat = "${THIS_LIBKLIBC}" 58EXTRA_KLIBC_DEPS = '${@base_conditional("KLIBC_UTILS_VARIANT", "shared", "${THIS_LIBKLIBC}", "", d)}'
60RDEPENDS_klibc-utils-chroot = "${THIS_LIBKLIBC}"
61RDEPENDS_klibc-utils-cpio = "${THIS_LIBKLIBC}"
62RDEPENDS_klibc-utils-dd = "${THIS_LIBKLIBC}"
63RDEPENDS_klibc-utils-dmesg = "${THIS_LIBKLIBC}"
64RDEPENDS_klibc-utils-false = "${THIS_LIBKLIBC}"
65RDEPENDS_klibc-utils-fstype = "${THIS_LIBKLIBC}"
66RDEPENDS_klibc-utils-gzip = "${THIS_LIBKLIBC}"
67RDEPENDS_klibc-utils-halt = "${THIS_LIBKLIBC}"
68RDEPENDS_klibc-utils-ipconfig = "${THIS_LIBKLIBC}"
69RDEPENDS_klibc-utils-kill = "${THIS_LIBKLIBC}"
70RDEPENDS_klibc-utils-kinit.shared = "${THIS_LIBKLIBC}"
71RDEPENDS_klibc-utils-ln = "${THIS_LIBKLIBC}"
72RDEPENDS_klibc-utils-losetup = "${THIS_LIBKLIBC}"
73RDEPENDS_klibc-utils-ls = "${THIS_LIBKLIBC}"
74RDEPENDS_klibc-utils-minips = "${THIS_LIBKLIBC}"
75RDEPENDS_klibc-utils-mkdir = "${THIS_LIBKLIBC}"
76RDEPENDS_klibc-utils-mkfifo = "${THIS_LIBKLIBC}"
77RDEPENDS_klibc-utils-mknod = "${THIS_LIBKLIBC}"
78RDEPENDS_klibc-utils-mount = "${THIS_LIBKLIBC}"
79RDEPENDS_klibc-utils-mv = "${THIS_LIBKLIBC}"
80RDEPENDS_klibc-utils-nfsmount = "${THIS_LIBKLIBC}"
81RDEPENDS_klibc-utils-nuke = "${THIS_LIBKLIBC}"
82RDEPENDS_klibc-utils-pivot-root = "${THIS_LIBKLIBC}"
83RDEPENDS_klibc-utils-poweroff = "${THIS_LIBKLIBC}"
84RDEPENDS_klibc-utils-readlink = "${THIS_LIBKLIBC}"
85RDEPENDS_klibc-utils-reboot = "${THIS_LIBKLIBC}"
86RDEPENDS_klibc-utils-resume = "${THIS_LIBKLIBC}"
87RDEPENDS_klibc-utils-run-init = "${THIS_LIBKLIBC}"
88RDEPENDS_klibc-utils-sh.shared = "${THIS_LIBKLIBC}"
89RDEPENDS_klibc-utils-sleep = "${THIS_LIBKLIBC}"
90RDEPENDS_klibc-utils-sync = "${THIS_LIBKLIBC}"
91RDEPENDS_klibc-utils-true = "${THIS_LIBKLIBC}"
92RDEPENDS_klibc-utils-umount = "${THIS_LIBKLIBC}"
93RDEPENDS_klibc-utils-uname = "${THIS_LIBKLIBC}"
94 59
95PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*" 60PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*"
96 61
97python populate_packages_prepend () { 62python populate_packages_prepend () {
98 63
99 base_bin_dir = d.expand('${base_bindir}') 64 base_bin_dir = d.expand('${base_bindir}')
100 do_split_packages(d, base_bin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='', allow_links=True, allow_dirs=True) 65 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)
101 66
102 base_sbin_dir = d.expand('${base_sbindir}') 67 base_sbin_dir = d.expand('${base_sbindir}')
103 do_split_packages(d, base_sbin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='', allow_dirs=True) 68 do_split_packages(d, base_sbin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='${EXTRA_KLIBC_DEPS}', allow_dirs=True)
104} 69}
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc
index b1f531a9b..07b8e1ad4 100644
--- a/meta-initramfs/recipes-devtools/klibc/klibc.inc
+++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8
10# debugsources.list: No such file or directory: 10# debugsources.list: No such file or directory:
11INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 11INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
12 12
13INC_PR = "r0" 13INC_PR = "r1"
14 14
15KLIBC_ARCH = '${TARGET_ARCH}' 15KLIBC_ARCH = '${TARGET_ARCH}'
16KLIBC_ARCH_armeb = 'arm' 16KLIBC_ARCH_armeb = 'arm'