[oe-commits] org.oe.dev merge of '3d8fcb3e38b76cf853ceee12d6cd8f1d518b546b'

[koen commit]

merge of '3d8fcb3e38b76cf853ceee12d6cd8f1d518b546b'
     and '7d3ee6f9dd094cfa51709c24c15492d19ad64af7'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 5f904f7a12f760543efbb50eed318ac4e50f6558
ViewMTN: http://monotone.openembedded.org/revision/info/5f904f7a12f760543efbb50eed318ac4e50f6558
Files:
1
packages/nfs-utils/nfs-utils_1.1.2.bb
packages/opensync/libopensync-0.36/build-in-src.patch
packages/opensync/libopensync-0.36/cmake.patch
packages/opensync/libopensync-0.36/no-python-check.patch
Diffs:

#
# mt diff -r3d8fcb3e38b76cf853ceee12d6cd8f1d518b546b -r5f904f7a12f760543efbb50eed318ac4e50f6558
#
#
#
# patch "packages/nfs-utils/nfs-utils_1.1.2.bb"
#  from [c8fc676bb8563f810f362e205ae46c3b75388b51]
#    to [1815e0ef2aa6e30bdea10f6313e236b9f67ac58f]
#
============================================================
--- packages/nfs-utils/nfs-utils_1.1.2.bb	c8fc676bb8563f810f362e205ae46c3b75388b51
+++ packages/nfs-utils/nfs-utils_1.1.2.bb	1815e0ef2aa6e30bdea10f6313e236b9f67ac58f
@@ -3,6 +3,8 @@ LICENSE = "GPL"
 SECTION = "console/network"
 LICENSE = "GPL"
 
+PR = "2"
+
 DEPENDS = "tcp-wrappers libevent"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
@@ -45,14 +47,17 @@ do_install() {
 	install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
 
 	install -d ${D}${sbindir}
+	install -d ${D}${base_sbindir}
 	install -m 0755 ${S}/utils/exportfs/exportfs ${D}${sbindir}/exportfs
 	install -m 0755 ${S}/utils/mountd/mountd ${D}${sbindir}/mountd
-	install -m 0755 ${S}/utils/mount/mount.nfs ${D}${sbindir}/mount.nfs
+	install -m 0755 ${S}/utils/mount/mount.nfs ${D}${base_sbindir}/mount.nfs
 	install -m 0755 ${S}/utils/nfsd/nfsd ${D}${sbindir}/nfsd
 	install -m 0755 ${S}/utils/nfsstat/nfsstat ${D}${sbindir}/nfsstat
 	install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount
 	install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd
 
+	ln -s ${D}/${base_sbindir}/mount.nfs ${D}/${base_sbindir}/mount.nfs4
+
 	install -d ${D}${mandir}/man8
 	install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8
 	install -m 0644 ${S}/utils/mountd/mountd.man ${D}${mandir}/man8/mountd.8
@@ -61,3 +66,6 @@ do_install() {
 	install -m 0644 ${S}/utils/showmount/showmount.man ${D}${mandir}/man8/showmount.8
 	install -m 0644 ${S}/utils/statd/statd.man ${D}${mandir}/man8/statd.8
 }
+
+PACKAGES =+ "nfs-utils-client"
+FILES_nfs-utils-client = "${base_sbindir}/mount.nfs ${base_sbindir}/mount.nfs4"


#
# mt diff -r7d3ee6f9dd094cfa51709c24c15492d19ad64af7 -r5f904f7a12f760543efbb50eed318ac4e50f6558
#
#
#
# add_file "packages/opensync/libopensync-0.36/build-in-src.patch"
#  content [f33e99322f9822e3719b7a4a138c733baf5c8409]
# 
# add_file "packages/opensync/libopensync-0.36/cmake.patch"
#  content [b50f3637f4dd635c1de2fed11af7b8bcb85f29a4]
# 
# add_file "packages/opensync/libopensync-0.36/no-python-check.patch"
#  content [f04d85e907104ca7e6f381658daf76fb31888385]
#
============================================================
--- packages/opensync/libopensync-0.36/build-in-src.patch	f33e99322f9822e3719b7a4a138c733baf5c8409
+++ packages/opensync/libopensync-0.36/build-in-src.patch	f33e99322f9822e3719b7a4a138c733baf5c8409
@@ -0,0 +1,18 @@
+---
+ cmake/OpenSyncInternal.cmake.in |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/cmake/OpenSyncInternal.cmake.in
++++ libopensync-0.36/cmake/OpenSyncInternal.cmake.in
+@@ -5,11 +5,10 @@ INCLUDE( OpenSyncTesting )
+ INCLUDE( OpenSyncPackaging )
+ INCLUDE( OpenSyncPlugin )
+ INCLUDE( OpenSyncPlatforms )
+ INCLUDE( MacroEnsureOutOfSourceBuild )
+ 
+-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
+ 
+ 
+ SET( OPENSYNC_PLUGINDIR "@OPENSYNC_PLUGINDIR@" )
+ SET( OPENSYNC_FORMATSDIR "@OPENSYNC_FORMATSDIR@" )
+ SET( OPENSYNC_PYTHON_PLUGINDIR "@OPENSYNC_PYTHON_PLUGINDIR@" )
============================================================
--- packages/opensync/libopensync-0.36/cmake.patch	b50f3637f4dd635c1de2fed11af7b8bcb85f29a4
+++ packages/opensync/libopensync-0.36/cmake.patch	b50f3637f4dd635c1de2fed11af7b8bcb85f29a4
@@ -0,0 +1,18 @@
+---
+ opensync/CMakeLists.txt |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/opensync/CMakeLists.txt
++++ libopensync-0.36/opensync/CMakeLists.txt
+@@ -55,11 +55,10 @@ SET( libopensync_LIB_SRCS
+ ADD_LIBRARY( opensync SHARED ${libopensync_LIB_SRCS} )
+ 
+ TARGET_LINK_LIBRARIES( opensync ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${SQLITE3_LIBRARIES} )
+ 
+ SET_TARGET_PROPERTIES( opensync PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+-SET_TARGET_PROPERTIES( opensync PROPERTIES LINK_FLAGS ${SYMBOLS_VISIBILITY} )
+ 
+ IF ( OPENSYNC_UNITTESTS )
+ 	ADD_LIBRARY( opensync-testing SHARED ${libopensync_LIB_SRCS} )
+ 	TARGET_LINK_LIBRARIES( opensync-testing ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${SQLITE3_LIBRARIES} )
+ ENDIF ( OPENSYNC_UNITTESTS )
============================================================
--- packages/opensync/libopensync-0.36/no-python-check.patch	f04d85e907104ca7e6f381658daf76fb31888385
+++ packages/opensync/libopensync-0.36/no-python-check.patch	f04d85e907104ca7e6f381658daf76fb31888385
@@ -0,0 +1,18 @@
+---
+ CMakeLists.txt |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/CMakeLists.txt
++++ libopensync-0.36/CMakeLists.txt
+@@ -26,11 +26,10 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BIN
+ 
+ FIND_PACKAGE( GLIB2 REQUIRED )
+ FIND_PACKAGE( Sqlite3 REQUIRED )
+ FIND_PACKAGE( LibXml2 REQUIRED )
+ FIND_PACKAGE( SWIG )	
+-FIND_PACKAGE( PythonLibs )
+ FIND_PACKAGE( Check )
+ 
+ ADD_SUBDIRECTORY( opensync )
+ ADD_SUBDIRECTORY( formats )
+ ADD_SUBDIRECTORY( tools )