From 0b49729af46f98a1bd155fc798d39d5d12c674cd Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 20 Jan 2014 18:55:27 -0800 Subject: libcgroup: Update to 0.41 Signed-off-by: Saul Wold --- meta/recipes-core/libcgroup/libcgroup_0.38.bb | 43 --------------------------- meta/recipes-core/libcgroup/libcgroup_0.41.bb | 41 +++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-core/libcgroup/libcgroup_0.38.bb create mode 100644 meta/recipes-core/libcgroup/libcgroup_0.41.bb (limited to 'meta/recipes-core/libcgroup') diff --git a/meta/recipes-core/libcgroup/libcgroup_0.38.bb b/meta/recipes-core/libcgroup/libcgroup_0.38.bb deleted file mode 100644 index 8bd0ead48b..0000000000 --- a/meta/recipes-core/libcgroup/libcgroup_0.38.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Linux control group abstraction library" -DESCRIPTION = "libcgroup is a library that abstracts the control group file system \ -in Linux. Control groups allow you to limit, account and isolate resource usage \ -(CPU, memory, disk I/O, etc.) of groups of processes." -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -PR = "r1" - -inherit autotools pkgconfig - -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v.038/${BPN}-${PV}.tar.bz2" - -SRC_URI[md5sum] = "f0f7d4060bf36ccc19d75dbf4f1695db" -SRC_URI[sha256sum] = "5d36d1a48b95f62fe9fcdf74a5a4089512e5e43e6011aa1504fd6f2a0909867f" - -EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}" - -# http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg21444.html -PARALLEL_MAKE = "" - -PACKAGES =+ "cgroups-pam-plugin" -FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" -FILES_${PN}-dev += "${base_libdir}/security/*.la" - -do_install_append() { - # Moving libcgroup to base_libdir - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mkdir -p ${D}/${base_libdir}/ - mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/ - rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'` - ln -sf ${rel_lib_prefix}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so - fi - # pam modules in ${base_libdir}/security/ should be binary .so files, not symlinks. - if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then - mv -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ${D}${base_libdir}/security/pam_cgroup.so - rm -f ${D}${base_libdir}/security/pam_cgroup.so.* - fi -} diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb new file mode 100644 index 0000000000..5db1079349 --- /dev/null +++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb @@ -0,0 +1,41 @@ +SUMMARY = "Linux control group abstraction library" +DESCRIPTION = "libcgroup is a library that abstracts the control group file system \ +in Linux. Control groups allow you to limit, account and isolate resource usage \ +(CPU, memory, disk I/O, etc.) of groups of processes." +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +inherit autotools pkgconfig + +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "3dea9d50b8a5b73ff0bf1cdcb210f63f" +SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51" + +EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}" + +# http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg21444.html +PARALLEL_MAKE = "" + +PACKAGES =+ "cgroups-pam-plugin" +FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" +FILES_${PN}-dbg += "${base_libdir}/security/.debug" +FILES_${PN}-dev += "${base_libdir}/security/*.la" + +do_install_append() { + # Moving libcgroup to base_libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mkdir -p ${D}/${base_libdir}/ + mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/ + rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'` + ln -sf ${rel_lib_prefix}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so + fi + # pam modules in ${base_libdir}/security/ should be binary .so files, not symlinks. + if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then + mv -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ${D}${base_libdir}/security/pam_cgroup.so + rm -f ${D}${base_libdir}/security/pam_cgroup.so.* + fi +} -- cgit 1.2.3-korg