diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2012-08-12 21:19:44 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-08-16 15:17:55 +0200 |
| commit | 5b2b72da34ac529308833a83d0f2c660a7916e83 (patch) | |
| tree | c41aa5d16837091c73aed61c5395bc7d293f7032 /meta-initramfs | |
| parent | 3bb5223270249c26baa9b1882f12f22a156c8552 (diff) | |
| download | meta-openembedded-contrib-5b2b72da34ac529308833a83d0f2c660a7916e83.tar.gz | |
klibc: fix runtime dependencies for shared utils
* and remove bogus dependencies for the static utils
* introduced by do_split_packages
* bump INC_PR
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-initramfs')
| -rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-utils.inc | 42 | ||||
| -rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc.inc | 4 |
2 files changed, 43 insertions, 3 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc index 8ce3d77603..c7e36e3ba4 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc @@ -58,13 +58,51 @@ 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-modprobe = "${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}" +RDEPENDS_klibc-utils-wc = "${THIS_LIBKLIBC}" + PACKAGES_DYNAMIC = "${KLIBC_UTILS_PKGNAME}-*" python populate_packages_prepend () { base_bin_dir = bb.data.expand('${base_bindir}', d) - do_split_packages(d, base_bin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', allow_links=True, allow_dirs=True) + do_split_packages(d, base_bin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='', allow_links=True, allow_dirs=True) base_sbin_dir = bb.data.expand('${base_sbindir}', d) - do_split_packages(d, base_sbin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', allow_dirs=True) + do_split_packages(d, base_sbin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='', allow_dirs=True) } diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index 7741a585e7..4963a294ca 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 # 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' @@ -47,3 +47,5 @@ do_configure () { ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux } + +THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})" |