[oe-commits] org.oe.dev sysfsutils: update to latest version 2.1.0

[woglinde2 commit]

sysfsutils: update to latest version 2.1.0
* add mnt patch from debian
* reorganize packages

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: b67982af950df1e834ed156c9f113061896b3d73
ViewMTN: http://monotone.openembedded.org/revision/info/b67982af950df1e834ed156c9f113061896b3d73
Files:
1
packages/sysfsutils/sysfsutils_2.0.0.bb
packages/sysfsutils/sysfsutils_2.1.0.bb
packages/sysfsutils/sysfsutils-2.1.0
packages/sysfsutils/sysfsutils-2.1.0/get_mnt_path_check.patch
Diffs:

#
# mt diff -r2be842406475db4b8f86fb10b85f46908a430421 -rb67982af950df1e834ed156c9f113061896b3d73
#
#
#
# rename "packages/sysfsutils/sysfsutils_2.0.0.bb"
#     to "packages/sysfsutils/sysfsutils_2.1.0.bb"
# 
# add_dir "packages/sysfsutils/sysfsutils-2.1.0"
# 
# add_file "packages/sysfsutils/sysfsutils-2.1.0/get_mnt_path_check.patch"
#  content [8f7f703561d6251832a37cc235f8ea401b562bed]
# 
# add_file "packages/sysfsutils/sysfsutils_2.0.0.bb"
#  content [1b9570857a0ce65cb47191b58cca5ab582ac1fa5]
# 
# patch "packages/sysfsutils/sysfsutils_2.1.0.bb"
#  from [1b9570857a0ce65cb47191b58cca5ab582ac1fa5]
#    to [700d2162d28469101eeb235c3e01023ecb3c894b]
#
============================================================
--- packages/sysfsutils/sysfsutils-2.1.0/get_mnt_path_check.patch	8f7f703561d6251832a37cc235f8ea401b562bed
+++ packages/sysfsutils/sysfsutils-2.1.0/get_mnt_path_check.patch	8f7f703561d6251832a37cc235f8ea401b562bed
@@ -0,0 +1,56 @@
+diff -ruN sysfsutils-2.0.0-old/lib/sysfs_utils.c sysfsutils-2.0.0/lib/sysfs_utils.c
+--- sysfsutils-2.0.0-old/lib/sysfs_utils.c	2005-12-07 12:28:18.000000000 +0100
++++ sysfsutils-2.0.0/lib/sysfs_utils.c	2006-03-06 19:06:11.000000000 +0100
+@@ -22,6 +22,7 @@
+  */
+ #include "libsysfs.h"
+ #include "sysfs.h"
++#include <mntent.h>
+ 
+ /**
+  * sysfs_remove_trailing_slash: Removes any trailing '/' in the given path
+@@ -53,6 +54,9 @@
+ {
+ 	static char sysfs_path[SYSFS_PATH_MAX] = "";
+ 	const char *sysfs_path_env;
++	FILE *mnt;
++	struct mntent *mntent;
++	int ret;
+ 
+ 	if (len == 0 || mnt_path == NULL)
+ 		return -1;
+@@ -64,12 +68,31 @@
+ 		if (sysfs_path_env != NULL) {
+ 			safestrcpymax(mnt_path, sysfs_path_env, len);
+ 			sysfs_remove_trailing_slash(mnt_path);
+-			return 0;
++		} else {
++			safestrcpymax(mnt_path, SYSFS_MNT_PATH, len);
+ 		}
+-		safestrcpymax(mnt_path, SYSFS_MNT_PATH, len);
+ 	}
+ 
+-	return 0;
++	/* check that mount point is indeed mounted */
++	ret = -1;
++	if ((mnt = setmntent(SYSFS_PROC_MNTS, "r")) == NULL) {
++		dprintf("Error getting mount information\n");
++		return -1;
++	}
++	while ((mntent = getmntent(mnt)) != NULL) {
++		if (strcmp(mntent->mnt_type, SYSFS_FSTYPE_NAME) == 0 &&
++			strcmp(mntent->mnt_dir, mnt_path) == 0) {
++			ret = 0;
++			break;
++		}
++	}
++	
++	endmntent(mnt);
++
++	if (ret < 0)
++		errno = ENOENT;
++
++	return ret;
+ }
+ 
+ /**
============================================================
--- packages/sysfsutils/sysfsutils_2.0.0.bb	1b9570857a0ce65cb47191b58cca5ab582ac1fa5
+++ packages/sysfsutils/sysfsutils_2.0.0.bb	1b9570857a0ce65cb47191b58cca5ab582ac1fa5
@@ -0,0 +1,24 @@
+DESCRIPTION = "System Utilities Based on Sysfs"
+HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
+LICENSE = "GPLv2"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
+S = "${WORKDIR}/sysfsutils-${PV}"
+
+inherit autotools
+
+includedir += "/sysfs"
+
+do_stage () {
+	oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/sysfs
+	install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs
+	install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs
+}
+
+PACKAGES_prepend = "libsysfs libsysfs-dbg libsysfs-dev "
+FILES_libsysfs = "${libdir}/*.so.*"
+FILES_libsysfs-dev = "${libdir}/* ${includedir}"
+FILES_libsysfs-dbg += "${libdir}/.debug"
+FILES_${PN}-dbg += "${bindir}/.debug"
============================================================
--- packages/sysfsutils/sysfsutils_2.0.0.bb	1b9570857a0ce65cb47191b58cca5ab582ac1fa5
+++ packages/sysfsutils/sysfsutils_2.1.0.bb	700d2162d28469101eeb235c3e01023ecb3c894b
@@ -1,9 +1,11 @@ LICENSE = "GPLv2"
 DESCRIPTION = "System Utilities Based on Sysfs"
 HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
 LICENSE = "GPLv2"
-PR = "r2"
+PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
+	   file://get_mnt_path_check.patch;patch=1"
+
 S = "${WORKDIR}/sysfsutils-${PV}"
 
 inherit autotools
@@ -17,8 +19,12 @@ do_stage () {
 	install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs
 }
 
-PACKAGES_prepend = "libsysfs libsysfs-dbg libsysfs-dev "
+PACKAGES = "libsysfs libsysfs-dbg libsysfs-dev \
+	    ${PN} ${PN}-dbg ${PN}-doc ${PN}-locale"
+
 FILES_libsysfs = "${libdir}/*.so.*"
-FILES_libsysfs-dev = "${libdir}/* ${includedir}"
+FILES_libsysfs-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+		     ${libdir}/*.a ${libdir}/*.o "
 FILES_libsysfs-dbg += "${libdir}/.debug"
 FILES_${PN}-dbg += "${bindir}/.debug"
+