[oe-commits] org.oe.dev merge of '0d2fc1d280147ac623069498dbb40891375ba420'
woglinde2 commit
oe at amethyst.openembedded.net
Sat Jun 7 10:27:00 UTC 2008
merge of '0d2fc1d280147ac623069498dbb40891375ba420'
and 'b67982af950df1e834ed156c9f113061896b3d73'
Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 34075c44f79b794ed2981519e10e09536407704f
ViewMTN: http://monotone.openembedded.org/revision/info/34075c44f79b794ed2981519e10e09536407704f
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
packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315
packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859
packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb
packages/wlan-ng/wlan-ng-modules_svn.bb
packages/wlan-ng/wlan-ng-utils-0.2.8
packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859
packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils.inc
packages/wlan-ng/wlan-ng-utils_0.2.7.bb
packages/wlan-ng/wlan-ng-utils_0.2.8.bb
Diffs:
#
# mt diff -r0d2fc1d280147ac623069498dbb40891375ba420 -r34075c44f79b794ed2981519e10e09536407704f
#
#
#
# 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"
+
#
# mt diff -rb67982af950df1e834ed156c9f113061896b3d73 -r34075c44f79b794ed2981519e10e09536407704f
#
#
#
# rename "packages/wlan-ng/wlan-ng-modules-0.2.8+svn20080315"
# to "packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859"
#
# rename "packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb"
# to "packages/wlan-ng/wlan-ng-modules_svn.bb"
#
# rename "packages/wlan-ng/wlan-ng-utils-0.2.8"
# to "packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859"
#
# add_dir "packages/wlan-ng/wlan-ng-utils-0.2.8"
#
# add_file "packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch"
# content [e56c3bf90ae7d569fbfbbea1b3c299382b228fc6]
#
# add_file "packages/wlan-ng/wlan-ng-utils_svn.bb"
# content [43750c8158cacd3eea5fd30f1c2e13144160a927]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [c8e8f10faafd170541864c4cf8eda931c83727ae]
# to [7f7a392de97d0152dc9e11d7bba58e815f944ac7]
#
# patch "packages/wlan-ng/wlan-ng-modules_svn.bb"
# from [3e4dd9c232b9b3182b0cfb69536ee0fb4625cd28]
# to [214da073b32005432328903505585d05bd521bed]
#
# patch "packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch"
# from [e56c3bf90ae7d569fbfbbea1b3c299382b228fc6]
# to [dcccf1a93f3b1ac791266ed1ca5a440bce3516d7]
#
# patch "packages/wlan-ng/wlan-ng-utils.inc"
# from [27e32e1bce6e9f224d2b27b54e56fed7d87998c9]
# to [ad0d62aa6cde077f31e564df80a5ae28f73fe158]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.7.bb"
# from [2e4a991bd035cd13922dfdb82ce2d919dce1deb6]
# to [04f0321c3bb2e745fcc22b3d74f7d4e4cb58ffb7]
#
# patch "packages/wlan-ng/wlan-ng-utils_0.2.8.bb"
# from [4ce418904c8b39baad69268f821d8b0881701394]
# to [69e05dab83545dbf43c2823fc409b6bae2198fc4]
#
============================================================
--- packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch e56c3bf90ae7d569fbfbbea1b3c299382b228fc6
+++ packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch e56c3bf90ae7d569fbfbbea1b3c299382b228fc6
@@ -0,0 +1,26 @@
+Index: trunk/src/Makefile
+===================================================================
+--- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200
++++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200
+@@ -44,7 +44,7 @@
+
+ -include ../config.mk
+
+-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2
+
+ ifneq ($(wildcard *.addon),)
+ DIRS+=`cat *.addon`
+Index: trunk/src/prism2/Makefile
+===================================================================
+--- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200
++++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200
+@@ -44,7 +44,7 @@
+
+ -include ../../config.mk
+
+-DIRS=driver ridlist download
++DIRS=ridlist download
+
+ ifneq ($(wildcard *.addon),)
+ DIRS+=`cat *.addon`
============================================================
--- packages/wlan-ng/wlan-ng-utils_svn.bb 43750c8158cacd3eea5fd30f1c2e13144160a927
+++ packages/wlan-ng/wlan-ng-utils_svn.bb 43750c8158cacd3eea5fd30f1c2e13144160a927
@@ -0,0 +1,12 @@
+require wlan-ng-utils.inc
+
+PR = "r0"
+
+PV = "0.2.8+svnr${SRCREV}"
+
+SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
+ file://scripts-makefile-hostcc.patch;patch=1 \
+ file://pcmciasrc.patch;patch=1 \
+ file://hostldflags.patch;patch=1"
+
+S = "${WORKDIR}/trunk"
============================================================
--- conf/distro/include/sane-srcrevs.inc c8e8f10faafd170541864c4cf8eda931c83727ae
+++ conf/distro/include/sane-srcrevs.inc 7f7a392de97d0152dc9e11d7bba58e815f944ac7
@@ -185,6 +185,8 @@ SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-webkit-qt ?= "28656"
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
+SRCREV_pn-wlan-ng-modules ?= "1859"
+SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b"
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb 3e4dd9c232b9b3182b0cfb69536ee0fb4625cd28
+++ packages/wlan-ng/wlan-ng-modules_svn.bb 214da073b32005432328903505585d05bd521bed
@@ -1,9 +1,8 @@ require wlan-ng-modules.inc
require wlan-ng-modules.inc
-PR = "r1"
+PR = "r0"
-SRCDATE = "20080315"
-PV = "0.2.8+svn${SRCDATE}"
+PV = "0.2.8+svnr${SRCREV}"
SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
============================================================
--- packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch e56c3bf90ae7d569fbfbbea1b3c299382b228fc6
+++ packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch dcccf1a93f3b1ac791266ed1ca5a440bce3516d7
@@ -1,7 +1,5 @@
-Index: trunk/src/Makefile
-===================================================================
---- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200
-+++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200
+--- trunk/src/Makefile.old 2008-06-05 14:52:31.000000000 -0500
++++ trunk/src/Makefile 2008-06-05 14:53:02.000000000 -0500
@@ -44,7 +44,7 @@
-include ../config.mk
@@ -11,10 +9,8 @@ Index: trunk/src/Makefile
ifneq ($(wildcard *.addon),)
DIRS+=`cat *.addon`
-Index: trunk/src/prism2/Makefile
-===================================================================
---- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200
-+++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200
+--- trunk/src/prism2/Makefile.old 2008-06-05 14:52:47.000000000 -0500
++++ trunk/src/prism2/Makefile 2008-06-05 14:53:10.000000000 -0500
@@ -44,7 +44,7 @@
-include ../../config.mk
============================================================
--- packages/wlan-ng/wlan-ng-utils.inc 27e32e1bce6e9f224d2b27b54e56fed7d87998c9
+++ packages/wlan-ng/wlan-ng-utils.inc ad0d62aa6cde077f31e564df80a5ae28f73fe158
@@ -3,10 +3,8 @@ DEPENDS = "virtual/kernel"
SECTION = "kernel/userland"
LICENSE = "GPL"
DEPENDS = "virtual/kernel"
-S = "${WORKDIR}/linux-wlan-ng-${PV}"
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
- file://only-the-utils.patch;patch=1 \
+SRC_URI = "file://only-the-utils.patch;patch=1 \
file://wlan-ng.modutils \
file://wlan.agent \
file://usbctl \
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.7.bb 2e4a991bd035cd13922dfdb82ce2d919dce1deb6
+++ packages/wlan-ng/wlan-ng-utils_0.2.7.bb 04f0321c3bb2e745fcc22b3d74f7d4e4cb58ffb7
@@ -1,7 +1,10 @@ require wlan-ng-utils.inc
require wlan-ng-utils.inc
-SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
+SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+ file://scripts-makefile-hostcc.patch;patch=1 \
file://pcmciasrc.patch;patch=1 \
file://hostldflags.patch;patch=1"
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
+PR = "r3"
-PR = "r2"
============================================================
--- packages/wlan-ng/wlan-ng-utils_0.2.8.bb 4ce418904c8b39baad69268f821d8b0881701394
+++ packages/wlan-ng/wlan-ng-utils_0.2.8.bb 69e05dab83545dbf43c2823fc409b6bae2198fc4
@@ -1,7 +1,10 @@ require wlan-ng-utils.inc
require wlan-ng-utils.inc
-SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \
+SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+ file://scripts-makefile-hostcc.patch;patch=1 \
file://pcmciasrc.patch;patch=1 \
file://hostldflags.patch;patch=1"
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
+PR = "r2"
-PR = "r1"
More information about the Openembedded-commits
mailing list