From 7f2c3321e5eb78d70d9ab0a38caccb4fb3911eeb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 27 Feb 2010 09:53:37 +0100 Subject: klibc: cleanup all version * reuse as much .inc as possible * use INC_PR * added klibc-utils.inc with common do_install_append for installing all utils added PACKAGES + FILES variables for them (union for all klibc versions) * added klibc-utils-static.inc with common part of all klibc-utils-static recipes and including klibc-utils.inc in the end with prepared variables to install static versions * modprobe was installed in base_bindir for shared and base_sbindir for static, unified to base_sbindir * next task will be to convert all to new staging (don't know how to install to cross with native install). * 1.5.15 tested with slugos/nslu2le linux-ixp4xx-2.6.27.8+svnr1089-r2 * >= 1.5.15+1.5.16 tested with angstrom/spitz linux-2.6.34-rc6+git% * all version: with newer kernel version where is no include/asm, which is replaced with include/asm-generic + ie arch/arm/include/asm/ we can stage asm -> ../arch/arm/include/asm/ link, or fix klibc autotools to use arch inludes correctly * >= 1.5.15+1.5.16: expects newer kernel and also built (staged) after http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b2f6d8d0200974b8b98f1bb9b10d46fb06e14b15 Signed-off-by: Martin Jansa Acked-by: Andrea Adami --- recipes/klibc/klibc_1.5.inc | 146 ++------------------------------------------ 1 file changed, 5 insertions(+), 141 deletions(-) (limited to 'recipes/klibc/klibc_1.5.inc') diff --git a/recipes/klibc/klibc_1.5.inc b/recipes/klibc/klibc_1.5.inc index 5c10df76f4..7847009efb 100644 --- a/recipes/klibc/klibc_1.5.inc +++ b/recipes/klibc/klibc_1.5.inc @@ -9,147 +9,11 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \ file://klibc_kexecsyscall.patch;patch=1 \ " -# we want only the shared programms and the lib so we chose them manually -do_install() { - install -d ${D}${base_bindir} - install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh - install -m 755 usr/gzip/gzip ${D}${base_bindir} - install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit - install -m 755 usr/kinit/fstype/shared/fstype ${D}${base_bindir} - install -m 755 usr/kinit/ipconfig/shared/ipconfig ${D}${base_bindir} - install -m 755 usr/kinit/nfsmount/shared/nfsmount ${D}${base_bindir} - install -m 755 usr/kinit/resume/shared/resume ${D}${base_bindir} - install -m 755 usr/kinit/run-init/shared/run-init ${D}${base_bindir} - install -m 755 usr/utils/shared/cat ${D}${base_bindir} - install -m 755 usr/utils/shared/chroot ${D}${base_bindir} - install -m 755 usr/utils/shared/cpio ${D}${base_bindir} - install -m 755 usr/utils/shared/dd ${D}${base_bindir} - install -m 755 usr/utils/shared/false ${D}${base_bindir} - install -m 755 usr/utils/shared/halt ${D}${base_bindir} - install -m 755 usr/utils/shared/insmod ${D}${base_bindir} - install -m 755 usr/utils/shared/kill ${D}${base_bindir} - install -m 755 usr/utils/shared/ln ${D}${base_bindir} - install -m 755 usr/utils/shared/minips ${D}${base_bindir} - install -m 755 usr/utils/shared/mkdir ${D}${base_bindir} - install -m 755 usr/utils/shared/mkfifo ${D}${base_bindir} - install -m 755 usr/utils/shared/mknod ${D}${base_bindir} - install -m 755 usr/utils/shared/mount ${D}${base_bindir} - install -m 755 usr/utils/shared/nuke ${D}${base_bindir} - install -m 755 usr/utils/shared/pivot_root ${D}${base_bindir} - install -m 755 usr/utils/shared/poweroff ${D}${base_bindir} - install -m 755 usr/utils/shared/readlink ${D}${base_bindir} - install -m 755 usr/utils/shared/reboot ${D}${base_bindir} - install -m 755 usr/utils/shared/sleep ${D}${base_bindir} - install -m 755 usr/utils/shared/true ${D}${base_bindir} - install -m 755 usr/utils/shared/umount ${D}${base_bindir} - install -m 755 usr/utils/shared/uname ${D}${base_bindir} - install -m 755 usr/utils/shared/modprobe ${D}${base_bindir} - install -m 755 usr/utils/shared/losetup ${D}${base_bindir} - install -m 755 usr/utils/shared/wc ${D}${base_bindir} +KLIBC_FETCHDIR = "1.5" - install -d ${D}${base_libdir} - install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} - cd ${D}${base_libdir} - ln -s klibc-*.so klibc.so - cd - - cd ${D}${base_bindir} - ln -s gzip gunzip - ln -s gzip zcat - cd - -} +SRC_URI[md5sum] = "481dfdef7273f2cc776c2637f481f017" +SRC_URI[sha256sum] = "27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7" -export INST=${STAGING_DIR_TARGET} -do_stage() { - oe_runmake install - cp '${STAGING_DIR_TARGET}/bin/klcc' '${CROSS_DIR}/bin/${TARGET_PREFIX}klcc' +do_install_append() { + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir} } - -PACKAGES = "${PN} ${PN}-dev klibc-utils-sh klibc-utils-kinit \ - klibc-utils-fstype klibc-utils-ipconfig \ - klibc-utils-nfsmount klibc-utils-resume \ - klibc-utils-run-init klibc-utils-cat \ - klibc-utils-chroot klibc-utils-cpio \ - klibc-utils-dd klibc-utils-false \ - klibc-utils-halt klibc-utils-insmod \ - klibc-utils-kill klibc-utils-ln \ - klibc-utils-minips klibc-utils-mkdir \ - klibc-utils-mkfifo klibc-utils-mknod \ - klibc-utils-mount klibc-utils-nuke \ - klibc-utils-pivot-root klibc-utils-poweroff \ - klibc-utils-readlink klibc-utils-reboot \ - klibc-utils-sleep klibc-utils-true \ - klibc-utils-umount klibc-utils-uname \ - klibc-utils-gzip klibc-utils-modprobe \ - klibc-utils-losetup klibc-utils-wc" - -FILES_${PN} = "${base_libdir}/klibc-*.so" -FILES_${PN}-dev = "${base_libdir}/klibc.so" -FILES_klibc-utils-sh = "${base_bindir}/sh" -FILES_klibc-utils-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat" -FILES_klibc-utils-kinit = "${base_bindir}/kinit" -FILES_klibc-utils-fstype = "${base_bindir}/fstype" -FILES_klibc-utils-ipconfig = "${base_bindir}/ipconfig" -FILES_klibc-utils-nfsmount = "${base_bindir}/nfsmount" -FILES_klibc-utils-resume = "${base_bindir}/resume" -FILES_klibc-utils-run-init = "${base_bindir}/run-init" -FILES_klibc-utils-cat = "${base_bindir}/cat" -FILES_klibc-utils-chroot = "${base_bindir}/chroot" -FILES_klibc-utils-cpio = "${base_bindir}/cpio" -FILES_klibc-utils-dd = "${base_bindir}/dd" -FILES_klibc-utils-false = "${base_bindir}/false" -FILES_klibc-utils-halt = "${base_bindir}/halt" -FILES_klibc-utils-insmod = "${base_bindir}/insmod" -FILES_klibc-utils-kill = "${base_bindir}/kill" -FILES_klibc-utils-ln = "${base_bindir}/ln" -FILES_klibc-utils-minips = "${base_bindir}/minips" -FILES_klibc-utils-mkdir = "${base_bindir}/mkdir" -FILES_klibc-utils-mkfifo = "${base_bindir}/mkfifo" -FILES_klibc-utils-mknod = "${base_bindir}/mknod" -FILES_klibc-utils-mount = "${base_bindir}/mount" -FILES_klibc-utils-nuke = "${base_bindir}/nuke" -FILES_klibc-utils-pivot-root = "${base_bindir}/pivot_root" -FILES_klibc-utils-poweroff = "${base_bindir}/poweroff" -FILES_klibc-utils-readlink = "${base_bindir}/readlink" -FILES_klibc-utils-reboot = "${base_bindir}/reboot" -FILES_klibc-utils-sleep = "${base_bindir}/sleep" -FILES_klibc-utils-true = "${base_bindir}/true" -FILES_klibc-utils-umount = "${base_bindir}/umount" -FILES_klibc-utils-uname = "${base_bindir}/uname" -FILES_klibc-utils-modprobe = "${base_bindir}/modprobe" -FILES_klibc-utils-losetup = "${base_bindir}/losetup" -FILES_klibc-utils-wc = "${base_bindir}/wc" - -# Yes we want exactly the klibc that was compiled with the utils -RDEPENDS_klibc-utils-sh = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-kinit = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-fstype = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-ipconfig = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-nfsmount = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-resume = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-run-init = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-cat = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-chroot = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-cpio = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-dd = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-false = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-halt = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-insmod = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-kill = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-ln = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-minips = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-mkdir = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-mkfifo = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-mknod = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-mount = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-nuke = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-pivot-root = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-poweroff = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-readlink = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-reboot = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-sleep = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-true = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-umount = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-uname = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-modprobe = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-losetup = "${PN} (=${PV}-${PR})" -RDEPENDS_klibc-utils-wc = "${PN} (=${PV}-${PR})" -- cgit 1.2.3-korg