From bf09a639ef3f9b3b92dfbe81efdbc7255172a514 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sun, 3 Aug 2008 16:09:40 +0000 Subject: nfs-utils : Fix support for util-linux-ng. See bug #4459. * Move mount.nfs to /sbin and create symlink for mount.nfs4 * Package mount.nfs* in nfs-utils-client for nfs client only devices. * Bumps PR for new packaging. --- packages/nfs-utils/nfs-utils_1.1.2.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/nfs-utils/nfs-utils_1.1.2.bb b/packages/nfs-utils/nfs-utils_1.1.2.bb index 67adf6e964..bcdabd59e5 100644 --- a/packages/nfs-utils/nfs-utils_1.1.2.bb +++ b/packages/nfs-utils/nfs-utils_1.1.2.bb @@ -3,6 +3,8 @@ PRIORITY = "optional" 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" -- cgit v1.2.3 From 1c5ddc22e0b0c32976d5ae757eaaad24b02cb6b0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 4 Aug 2008 12:10:54 +0000 Subject: fontconfig: added 2.6.0 from Poky - should close #2951 --- .../fontconfig/fontconfig-2.6.0/.mtn2git_empty | 0 .../fontconfig-2.6.0/fix-pkgconfig.patch | 15 +++++ packages/fontconfig/fontconfig-native_2.6.0.bb | 15 +++++ packages/fontconfig/fontconfig_2.6.0.bb | 76 ++++++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty create mode 100644 packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch create mode 100644 packages/fontconfig/fontconfig-native_2.6.0.bb create mode 100644 packages/fontconfig/fontconfig_2.6.0.bb diff --git a/packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty b/packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch new file mode 100644 index 0000000000..17b85f758d --- /dev/null +++ b/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch @@ -0,0 +1,15 @@ +--- + fontconfig.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- fontconfig-2.6.0.orig/fontconfig.pc.in ++++ fontconfig-2.6.0/fontconfig.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: Fontconfig + Description: Font configuration and customization library + Version: @VERSION@ + Libs: -L${libdir} -lfontconfig +-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ ++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype + Cflags: -I${includedir} diff --git a/packages/fontconfig/fontconfig-native_2.6.0.bb b/packages/fontconfig/fontconfig-native_2.6.0.bb new file mode 100644 index 0000000000..541b74634c --- /dev/null +++ b/packages/fontconfig/fontconfig-native_2.6.0.bb @@ -0,0 +1,15 @@ +SECTION = "base" +LICENSE = "BSD" +require fontconfig_${PV}.bb +inherit native +DEPENDS = "freetype-native expat-native zlib-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" + +EXTRA_OEMAKE = "" +EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" + +do_stage () { + oe_runmake install + install fc-lang/fc-lang ${STAGING_BINDIR} + install fc-glyphname/fc-glyphname ${STAGING_BINDIR} +} diff --git a/packages/fontconfig/fontconfig_2.6.0.bb b/packages/fontconfig/fontconfig_2.6.0.bb new file mode 100644 index 0000000000..3f7eca4b4e --- /dev/null +++ b/packages/fontconfig/fontconfig_2.6.0.bb @@ -0,0 +1,76 @@ +SECTION = "libs" +LICENSE = "BSD" +DESCRIPTION = "A library for configuring and customizing font access." +DEPENDS = "expat freetype zlib" + +SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ + file://fix-pkgconfig.patch;patch=1" + +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" +FILES_fontconfig-utils = "${bindir}/*" + +# Work around past breakage in debian.bbclass +RPROVIDES_fontconfig-utils = "libfontconfig-utils" +RREPLACES_fontconfig-utils = "libfontconfig-utils" +RCONFLICTS_fontconfig-utils = "libfontconfig-utils" +DEBIAN_NOAUTONAME_fontconfig-utils = "1" + +S = "${WORKDIR}/fontconfig-${PV}" + +PARALLEL_MAKE = "" + +inherit autotools pkgconfig + +export HASDOCBOOK="no" + +EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}" +EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname" + +# The tarball has some of the patched files as read only, which +# patch doesn't like at all + +fontconfig_do_unpack() { + chmod -R u+rw ${S} +} + +python do_unpack () { + bb.build.exec_func('base_do_unpack', d) + bb.build.exec_func('fontconfig_do_unpack', d) +} + +do_stage () { + oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/fontconfig + for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done +} + +BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2" + +do_configure_append () { + sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile + sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile + sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile + sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile + + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile + + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile + + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile + +} + +do_install () { + autotools_do_install +} + -- cgit v1.2.3 From 89db1179c644dde2377addf6d0c44ec330e151f6 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 4 Aug 2008 12:54:22 +0000 Subject: libopensync: added missing patches for 0.36 --- packages/opensync/libopensync-0.36/build-in-src.patch | 18 ++++++++++++++++++ packages/opensync/libopensync-0.36/cmake.patch | 18 ++++++++++++++++++ .../opensync/libopensync-0.36/no-python-check.patch | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 packages/opensync/libopensync-0.36/build-in-src.patch create mode 100644 packages/opensync/libopensync-0.36/cmake.patch create mode 100644 packages/opensync/libopensync-0.36/no-python-check.patch diff --git a/packages/opensync/libopensync-0.36/build-in-src.patch b/packages/opensync/libopensync-0.36/build-in-src.patch new file mode 100644 index 0000000000..1810b339a6 --- /dev/null +++ b/packages/opensync/libopensync-0.36/build-in-src.patch @@ -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@" ) diff --git a/packages/opensync/libopensync-0.36/cmake.patch b/packages/opensync/libopensync-0.36/cmake.patch new file mode 100644 index 0000000000..0884e4cb79 --- /dev/null +++ b/packages/opensync/libopensync-0.36/cmake.patch @@ -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 ) diff --git a/packages/opensync/libopensync-0.36/no-python-check.patch b/packages/opensync/libopensync-0.36/no-python-check.patch new file mode 100644 index 0000000000..08a53cb9eb --- /dev/null +++ b/packages/opensync/libopensync-0.36/no-python-check.patch @@ -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 ) -- cgit v1.2.3